[Groff] [PATCH] Remove AC_OUTPUT_MAKE_DEFS hack

[Colin Watson]

Hi,

The hack in aclocal.m4 to fix autoconf 2.13's AC_OUTPUT_MAKE_DEFS for
certain operating systems doesn't work when running autoconf 2.50, and
has quite a confusing failure mode (things like '#ifdef __cplusplus' get
copied onto compiler command lines).

If the groff developers are running autoconf 2.50 or close, could I
suggest moving to it? If not, I guess there's no particular urgency.

--- groff-1.17.orig/configure.in
+++ groff-1.17/configure.in
@@ -1,5 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/roff/groff/groff.cc)
+AC_PREREQ(2.49d)
 dnl checks for programs
 GROFF_SRCDIR
 GROFF_BUILDDIR
--- groff-1.17.orig/aclocal.m4
+++ groff-1.17/aclocal.m4
@@ -449,34 +449,6 @@
                AC_MSG_RESULT(no) ;;
        esac
 fi])dnl
-dnl
-dnl
-dnl Finally, we must modify a base function of autoconf to replace the
-dnl ASCII char `012' with its generic equivalent `\n' if we run under
-dnl OS/390 Unix -- unfortunately, not all `tr' variants understand `\n',
-dnl so this hack is necessary.
-dnl
-define([AC_OUTPUT_MAKE_DEFS],
-[# Transform confdefs.h into DEFS.
-dnl Using a here document instead of a string reduces the quoting nightmare.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-changequote(<<, >>)dnl
-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[    `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-changequote([, ])dnl
-EOF
-if test "$groff_cv_os390" = "yes"; then
-       DEFS=`sed -f conftest.defs confdefs.h | tr '\n' ' '`
-else
-       DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-fi
-rm -f conftest.defs
-])dnl
 dnl
 dnl
 dnl Check whether we need a declaration for a function.

By the way, this is from the current Debian diff for groff, not yet
uploaded. Regrettably, Fabrizio Polacco died two months ago; I recently
volunteered to take over the groff packaging.

Thanks,

-- 
Colin Watson                                     address@hidden