Patchwork buildfix: check for old pod2man versions

login
register
mail settings
Submitter Gerd Hoffmann
Date March 29, 2012, 8:55 a.m.
Message ID <1333011318-18715-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/149377/
State New
Headers show

Comments

Gerd Hoffmann - March 29, 2012, 8:55 a.m.
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 <kraxel@redhat.com>
---
 Makefile  |    1 -
 configure |    8 ++++++++
 2 files changed, 8 insertions(+), 1 deletions(-)
Blue Swirl - March 31, 2012, 1:02 p.m.
Thanks, applied.

On Thu, Mar 29, 2012 at 08:55, Gerd Hoffmann <kraxel@redhat.com> wrote:
> 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 <kraxel@redhat.com>
> ---
>  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
>
> --
> 1.7.1
>
>

Patch

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