From patchwork Thu Mar 29 08:55:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 149377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 23FB4B6FAA for ; Thu, 29 Mar 2012 19:55:38 +1100 (EST) Received: from localhost ([::1]:46083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDB8p-0006LA-TJ for incoming@patchwork.ozlabs.org; Thu, 29 Mar 2012 04:55:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDB8e-0006KG-Iy for qemu-devel@nongnu.org; Thu, 29 Mar 2012 04:55:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDB8c-0002KE-SL for qemu-devel@nongnu.org; Thu, 29 Mar 2012 04:55:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDB8c-0002K3-Kx for qemu-devel@nongnu.org; Thu, 29 Mar 2012 04:55:22 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2T8tKh4024564 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 29 Mar 2012 04:55:20 -0400 Received: from rincewind.home.kraxel.org (vpn1-7-47.ams2.redhat.com [10.36.7.47]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2T8tJ3a019472; Thu, 29 Mar 2012 04:55:20 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id CB3EC4045C; Thu, 29 Mar 2012 10:55:18 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 29 Mar 2012 10:55:18 +0200 Message-Id: <1333011318-18715-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] buildfix: check for old pod2man versions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Older pod2man don't have a --utf8 switch, check for this in conffigure and use it only when present. Fixes build on RHEL-5. Signed-off-by: Gerd Hoffmann --- Makefile | 1 - configure | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index d8e1f36..35c7a2a 100644 --- a/Makefile +++ b/Makefile @@ -348,7 +348,6 @@ QMP/qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GEN $@") -POD2MAN = pod2man --utf8 qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi $(call quiet-command, \ perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \ diff --git a/configure b/configure index 14ef738..6e870ad 100755 --- a/configure +++ b/configure @@ -2821,6 +2821,13 @@ if test "$solaris" = "no" ; then fi fi +# test if pod2man has --utf8 option +if pod2man --help | grep -q utf8; then + POD2MAN="pod2man --utf8" +else + POD2MAN="pod2man" +fi + # Use ASLR, no-SEH and DEP if available if test "$mingw32" = "yes" ; then for flag in --dynamicbase --no-seh --nxcompat; do @@ -3358,6 +3365,7 @@ echo "LIBS+=$LIBS" >> $config_host_mak echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak echo "LIBS_QGA+=$libs_qga" >> $config_host_mak +echo "POD2MAN=$POD2MAN" >> $config_host_mak # generate list of library paths for linker script