From patchwork Tue Jul 17 10:12:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Bokovoy X-Patchwork-Id: 10528805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 73956603ED for ; Tue, 17 Jul 2018 10:12:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 732D328BAD for ; Tue, 17 Jul 2018 10:12:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 660E128BB5; Tue, 17 Jul 2018 10:12:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8F6328BAD for ; Tue, 17 Jul 2018 10:12:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729711AbeGQKok (ORCPT ); Tue, 17 Jul 2018 06:44:40 -0400 Received: from hr2.samba.org ([144.76.82.148]:28644 "EHLO hr2.samba.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729703AbeGQKok (ORCPT ); Tue, 17 Jul 2018 06:44:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org; s=42627210; h=Message-ID:Cc:To:From:Date; bh=/srQiRTEL7+hKFeBkegIUTw0MwCNMvISnmmx2Mcy5io=; b=Jw8AncCSwm3EPx7x2pvQWznAXo goWShUMLqClztyPDBEyFApKRhZk1wfF6COumwMg0cdKLYltrFnCFY90klhsRauYTz1v2M6tAYSCYg qMnNxzzts2V9Sa7A0YprTb5OsppxhkuEEylnWUKDQKavci8gaiBzctErwO4+muwo8KfM=; Received: from [127.0.0.2] (localhost [127.0.0.1]) by hr2.samba.org with esmtpsa (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim) id 1ffMyN-0004dp-7d; Tue, 17 Jul 2018 10:12:47 +0000 Date: Tue, 17 Jul 2018 13:12:44 +0300 From: Alexander Bokovoy To: =?iso-8859-1?Q?Aur=E9lien?= Aptel Cc: linux-cifs@vger.kernel.org Subject: Re: [PATCH] cifs-utils: support rst2man-3 Message-ID: <20180717101244.GC11106@onega.vda.li> References: <20180717052550.GA11106@onega.vda.li> <877elunv5u.fsf@suse.com> <20180717082729.GB11106@onega.vda.li> <874lgynpnf.fsf@suse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <874lgynpnf.fsf@suse.com> User-Agent: Mutt/1.10.0 (2018-05-17) Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On ti, 17 heinä 2018, Aurélien Aptel wrote: > > # if docs are not disabled, check if rst2man is available > > if test $enable_man != "no"; then > > - AC_CHECK_PROG(have_rst2man, rst2man, yes, no) > > + AC_CHECK_PROGS(have_rst2man, rst2man-3.6 rst2man-3.4 rst2man-3 rst2man, no) > > You need to use the variable in the Makefile to actually use the prog > found. It should just be a matter of replacing "rst2man" by > "$(have_rst2man)" since autoconf already calls AC_SUBST on the var > according to AC_CHECK_PROGS documentation. Right. I replaced rst2man in RST2MAN definition in Makefile.am by $(have_rst2man) and given that we only call for that when CONFIG_MAN is set, that should complete the change. New patch is attached. Reviewed-by: Aurelien Aptel diff --git a/Makefile.am b/Makefile.am index 30658e3..f37c9ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ man_MANS= SUFFIXES = .rst .1 .8 -RST2MAN = rst2man --syntax-highlight=none $< $@ +RST2MAN = $(have_rst2man) --syntax-highlight=none $< $@ .rst.1: $(RST2MAN) diff --git a/configure.ac b/configure.ac index b0bc2b9..8e3d6ce 100644 --- a/configure.ac +++ b/configure.ac @@ -252,12 +252,12 @@ fi # if docs are not disabled, check if rst2man is available if test $enable_man != "no"; then - AC_CHECK_PROG(have_rst2man, rst2man, yes, no) + AC_CHECK_PROGS(have_rst2man, rst2man-3.6 rst2man-3.4 rst2man-3 rst2man, no) if test $have_rst2man = "no"; then if test $enable_man = "yes"; then - AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing perl.]) + AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils.]) else - AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation.]) + AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation.]) enable_man="no" fi else