From patchwork Tue Jul 17 08:27:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Bokovoy X-Patchwork-Id: 10528353 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 AF81C600D0 for ; Tue, 17 Jul 2018 08:27:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A73BD2885E for ; Tue, 17 Jul 2018 08:27:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B39428AA2; Tue, 17 Jul 2018 08:27:37 +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 5F9C52885E for ; Tue, 17 Jul 2018 08:27:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729721AbeGQI7A (ORCPT ); Tue, 17 Jul 2018 04:59:00 -0400 Received: from hr2.samba.org ([144.76.82.148]:55500 "EHLO hr2.samba.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729610AbeGQI7A (ORCPT ); Tue, 17 Jul 2018 04:59:00 -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=AutJ7YKaC5DFjNegQ7x2ZZl8jhoC7xTP5hwESsqK0YE=; b=WVvNA+FXynY4zfJV+gg9oraz/n dMMs4biqdB1zTjk0SAD/YZ8MJQDR6at9DhI9q3P0+0tFPSnQREiorrvxzPvvY8zck9TNddNtPYFCG 19kcz8iJuyqez50hViyF23X0ymU5U+MsnWawaQz8DTtkF0J2DAVPQmERaJTe5dnY8JIU=; 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 1ffLKV-00042C-K1; Tue, 17 Jul 2018 08:27:31 +0000 Date: Tue, 17 Jul 2018 11:27:29 +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: <20180717082729.GB11106@onega.vda.li> References: <20180717052550.GA11106@onega.vda.li> <877elunv5u.fsf@suse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <877elunv5u.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: > Alexander Bokovoy writes: > > > Hi, > > > > Python 3 version of rst2man utility is called rst2man-3. On systems > > without python 2 bits rst2man is not found. This patch adds support for > > rst2man-3 so that man pages can still be created. > > It's called rst2man-3.4 here, you probably want to check for that too. Ok. Added rst2man-{3,3.4,3.6} for completeness. > > # 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 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.]) > ^^^^^^^^^^^^^^^^^^^^^^^ > > Should be "python" and/or even python(3)-docutils, which doesn't look > like a base package. Changed this to python{2,3}-docutils as both py2 and py3 version should be working. 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