FYI: Various test suite issues plus one fix

[Akim Demaille]

Here is what I intend to apply once the test suite completed.

The most significant part of this multipurpose patch (yeah, I know,
but I'm tired, and got plenty to do...) is the AC_OUTPUT_MAKE_DEFS
one.

There is some more text to read at the bottom.

        Akim

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        The recent addition of `exit's prototype in confdefs.h causes
        AC_OUTPUT_MAKE_DEFS to include junky -D switches.
        Reported by Wolfgang Mueller.

        * tests/torture.at (#define header templates): Include trash in
        confdefs.h.
        * tests/atgeneral.at (AT_INIT): Don't expect `find' to support
        -maxdepth, so don't use -follow either.
        Reported by Nicolas Joly.
        * acgeneral.m4 (AC_OUTPUT_MAKE_DEFS) <confdef2opt.sed>: In the
        `quote' section, print the result.
        In neither `#define' pattern match, just call `d' to start a new
        cycle.
        Call this sed program with -n.

Index: THANKS
===================================================================
RCS file: /cvs/autoconf/THANKS,v
retrieving revision 1.52
diff -u -u -r1.52 THANKS
--- THANKS 2001/01/18 13:16:02 1.52
+++ THANKS 2001/01/30 19:13:13
@@ -146,6 +146,7 @@
 Viktor Dukhovni                address@hidden
 Volker Borchert                address@hidden
 Wilfredo Sanchez       address@hidden
+Wolfgang Mueller       address@hidden
 
 Many people are not named here because we lost track of them.  We
 thank them!  Please, help us keeping this list up to date.
Index: acgeneral.m4
===================================================================
RCS file: /cvs/autoconf/acgeneral.m4,v
retrieving revision 1.684
diff -u -u -r1.684 acgeneral.m4
--- acgeneral.m4 2001/01/29 22:36:09 1.684
+++ acgeneral.m4 2001/01/30 19:13:17
@@ -3787,11 +3787,14 @@
 s,^[   ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   
]*\(.*\),-D\1=\2,g
 t quote
 s,^[   ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   
]*\(.*\),-D\1=\2,g
+t quote
+d
 : quote
 s,[    `~#$^&*(){}\\|;'"<>?],\\&,g
 s,\[,\\&,g
 s,\],\\&,g
 s,\$,$$,g
+p
 EOF
 # We use echo to avoid assuming a particular line-breaking character.
 # The extra dot is to prevent the shell from consuming trailing
@@ -3800,7 +3803,7 @@
 # platform that uses two characters for line-breaks (e.g., DOS), tr
 # would break.
 ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
 rm -f confdef2opt.sed
 ]])# AC_OUTPUT_MAKE_DEFS
 
Index: doc/autoconf.texi
===================================================================
RCS file: /cvs/autoconf/doc/autoconf.texi,v
retrieving revision 1.426
diff -u -u -r1.426 autoconf.texi
--- doc/autoconf.texi 2001/01/29 22:36:10 1.426
+++ doc/autoconf.texi 2001/01/30 19:14:11
@@ -6274,6 +6274,12 @@
 set to @command{expr} or to @command{false} according to the result.
 
 
address@hidden @command{find}
address@hidden -----------------
+The option @option{-maxdepth} seems to be GNU specific. Tru64 v5.1,
+NetBSD 1.5 and Solaris 2.5 @command{find} commands do not understand it.
+
+
 @item @command{grep}
 @c -----------------
 @cindex @command{grep}
Index: tests/atgeneral.m4
===================================================================
RCS file: /cvs/autoconf/tests/atgeneral.m4,v
retrieving revision 1.56
diff -u -u -r1.56 atgeneral.m4
--- tests/atgeneral.m4 2001/01/30 18:45:58 1.56
+++ tests/atgeneral.m4 2001/01/30 19:14:11
@@ -290,7 +290,7 @@
 
     # Try to find a few ChangeLogs in case it might help determining the
     # exact version.
-    find "$at_top_srcdir" -follow -maxdepth 3 -name ChangeLog \
+    find "$at_top_srcdir" -name ChangeLog \
       -exec echo {} : ';' \
       -exec sed 's/^/| /;10q' {} ';' \
       -exec echo ';'
Index: tests/torture.at
===================================================================
RCS file: /cvs/autoconf/tests/torture.at,v
retrieving revision 1.13
diff -u -u -r1.13 torture.at
--- tests/torture.at 2001/01/24 13:19:11 1.13
+++ tests/torture.at 2001/01/30 19:14:12
@@ -133,16 +133,28 @@
 AT_DATA([configure.ac],
 [[AC_INIT
 AC_CONFIG_HEADERS(config.h:config.hin)
+
 # I18n of dummy variables: their French translations.
 AC_DEFINE(foo, toto)
 AC_DEFINE(bar, tata)
 AC_DEFINE(baz, titi)
 AC_DEFINE(fubar, tutu)
+
 # Symbols which are prefixes of another.
 AC_DEFINE(a, A)
 AC_DEFINE(aaa, AAA)
 AC_DEFINE(aa, AA)
 AC_CONFIG_FILES(defs)
+
+# Things included in confdefs.h, but which make no sense in
+# config.h, nor in $DEFS.
+cat <<\EOF >>confdefs.h
+/* Hi Mum! Look, I'm doing C++! */
+#ifdef __cplusplus
+void exit (int status);
+#endif
+EOF
+
 # In addition of config.h output a full DEFS
 AC_OUTPUT_MAKE_DEFS
 DEFS_SAVED=$DEFS
@@ -187,7 +199,7 @@
 
 # Check the value of DEFS.  Note the leading space.
 AT_DATA([expout],
-[[ -Dfoo=toto -Dbar=tata -Dbaz=titi -Dfubar=tutu -Da=A -Daaa=AAA -Daa=AA]
+[[-Dfoo=toto -Dbar=tata -Dbaz=titi -Dfubar=tutu -Da=A -Daaa=AAA -Daa=AA]
 ])
 
 # Because we strip trailing spaces in `testsuite' we can't leave one in




[[Yeah, at the same time we got rid of the leading space which was an
unwanted result of the ``processing'' of the leading empty line in
confdefs.h due to the way it's created:

# AIX cpp loses on an empty file, so make sure it contains at least a newline.
echo >confdefs.h



Oh, BTW, Alexandre, I think you referred several times to the
possibility that some FS can't cope with empty files.  I believe you
must have been abused by this.]]