* tests/torture.m4: Also check the value of @DEFS@ when no

CONFIG_HEADER is used.

diff --git a/ChangeLog b/ChangeLog
index 3beb1540fd6a500bea188853199e709b1d99d989..8733e8eef0cb71fd8b053e1a7da5f82ee593734b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-10  Akim Demaille  <akim@epita.fr>
+
+       * tests/torture.m4: Also check the value of @DEFS@ when no
+       CONFIG_HEADER is used.
+
 2000-02-10  Akim Demaille  <akim@epita.fr>
 
        Changequote-busters!

diff --git a/tests/torture.m4 b/tests/torture.m4
index 9a6b88ffbc85a7235c742509689e7ac2e1924b84..141ec0a61d51cf0945696cab96b78376e8cfd2fe 100644 (file)
--- a/tests/torture.m4
+++ b/tests/torture.m4
@@ -141,9 +141,18 @@ AC_DEFINE(fubar, tutu)
 AC_DEFINE(a, A)
 AC_DEFINE(aaa, AAA)
 AC_DEFINE(aa, AA)
+AC_CONFIG_FILES(defs)
+# In addition of config.h output a full DEFS
+AC_OUTPUT_MAKE_DEFS
+DEFS_SAVED=$DEFS
+AC_SUBST(DEFS_SAVED)
 AC_OUTPUT
 ]])
 
+AT_DATA(defs.in,
+[[@DEFS_SAVED@
+]])
+
 AT_DATA(config.hin,
 [[#define foo   0
 #  define bar bar
@@ -157,6 +166,9 @@ AT_DATA(config.hin,
 #undef aaa
 ]])
 
+AT_CHECK([../autoconf -m .. -l $at_srcdir], 0)
+AT_CHECK([./configure], 0, ignore)
+
 AT_DATA(expout,
 [[/* config.h.  Generated automatically by configure.  */
 #define foo toto
@@ -170,9 +182,13 @@ AT_DATA(expout,
 #define aa AA
 #define aaa AAA
 ]])
-
-AT_CHECK([../autoconf -m .. -l $at_srcdir], 0)
-AT_CHECK([./configure], 0, ignore)
 AT_CHECK([cat config.h], 0, expout)
 
-AT_CLEANUP(configure config.status config.log config.cache config.h)
+# Check the value of DEFS.  Note the leading and trailing spaces.
+AT_DATA(expout,
+[[ -Dfoo=toto -Dbar=tata -Dbaz=titi -Dfubar=tutu -Da=A -Daaa=AAA -Daa=AA ]
+])
+
+AT_CHECK([cat defs], 0, expout)
+
+AT_CLEANUP(configure config.status config.log config.cache config.h defs)