diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-03-11 10:47:05 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-03-11 10:47:05 +0000 |
| commit | eb304e9689ca474834207605ed52c369bcdec6ea (patch) | |
| tree | f9bada578548e6818b353ac599bd015bd1f33b5a | |
| parent | 97eab125fa8e3dc481c1f1ba1a847cf43d537585 (diff) | |
| download | libguestfs-eb304e9689ca474834207605ed52c369bcdec6ea.tar.gz libguestfs-eb304e9689ca474834207605ed52c369bcdec6ea.tar.xz libguestfs-eb304e9689ca474834207605ed52c369bcdec6ea.zip | |
RHEL5: Old pod2man didn't have --stderr or -u options.
| -rw-r--r-- | configure.ac | 21 | ||||
| -rwxr-xr-x | podwrapper.sh.in | 8 |
2 files changed, 26 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6690a2c4..cd78875f 100644 --- a/configure.ac +++ b/configure.ac @@ -249,6 +249,27 @@ AC_CHECK_PROG([POD2HTML],[pod2html],[pod2html],[no]) test "x$POD2HTML" = "xno" && AC_MSG_ERROR([pod2html must be installed]) +dnl Check if pod2man, pod2text take --stderr and -u options (not in RHEL 5). +AC_MSG_CHECKING([if pod2man takes --stderr option]) +if "$POD2MAN" --stderr >/dev/null 2>&1; then + AC_MSG_RESULT([yes]) + POD2_STDERR_OPTION="--stderr" +else + AC_MSG_RESULT([no]) + POD2_STDERR_OPTION="" +fi +AC_SUBST([POD2_STDERR_OPTION]) + +AC_MSG_CHECKING([if pod2man takes -u option]) +if "$POD2MAN" -u >/dev/null 2>&1; then + AC_MSG_RESULT([yes]) + POD2_UTF8_OPTION="-u" +else + AC_MSG_RESULT([no]) + POD2_UTF8_OPTION="" +fi +AC_SUBST([POD2_UTF8_OPTION]) + dnl Check for mkisofs. AC_PATH_PROGS([MKISOFS],[mkisofs],[no], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) diff --git a/podwrapper.sh.in b/podwrapper.sh.in index c7660547..c883c6a8 100755 --- a/podwrapper.sh.in +++ b/podwrapper.sh.in @@ -1,6 +1,6 @@ #!/bin/bash - # podwrapper.sh -# Copyright (C) 2010 Red Hat Inc. +# Copyright (C) 2010-2011 Red Hat Inc. # @configure_input@ # # This program is free software; you can redistribute it and/or modify @@ -30,6 +30,8 @@ PACKAGE_VERSION="@PACKAGE_VERSION@" POD2MAN="@POD2MAN@" POD2TEXT="@POD2TEXT@" POD2HTML="@POD2HTML@" +POD2_STDERR_OPTION="@POD2_STDERR_OPTION@" +POD2_UTF8_OPTION="@POD2_UTF8_OPTION@" # This script could be run with any current directory, so if a source # or build path is required it must be relative to the following @@ -164,7 +166,7 @@ fi # Now generate the final output format(s). if [ -n "$man_output" ]; then - "$POD2MAN" --stderr -u \ + "$POD2MAN" "$POD2_STDERR_OPTION" "$POD2_UTF8_OPTION" \ --section "$section" -c "Virtualization Support" --name "$name" \ --release "$PACKAGE_NAME-$PACKAGE_VERSION" \ < $tmpdir/full.pod > "$man_output".tmp @@ -172,7 +174,7 @@ if [ -n "$man_output" ]; then fi if [ -n "$text_output" ]; then - "$POD2TEXT" --stderr -u \ + "$POD2TEXT" "$POD2_STDERR_OPTION" "$POD2_UTF8_OPTION" \ < $tmpdir/full.pod > "$text_output".tmp mv "$text_output".tmp "$text_output" fi |