* tests/subproject.at (_LTDL_SETUP): Use pushdef/popdef to

simulate file-local scope.  Empty source file compilation is not
portable, so add minimal code to generated foo.c file.

diff --git a/ChangeLog b/ChangeLog
index 3adf635e0d383934b96ed00383447f714defa84a..e30e4c5ac80286a8c5d51146eb98f1a3648db5dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-14  Gary V. Vaughan  <gary@gnu.org>
+
+       * tests/subproject.at (_LTDL_SETUP): Use pushdef/popdef to
+       simulate file-local scope.  Empty source file compilation is not
+       portable, so add minimal code to generated foo.c file.
+
 2005-10-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libltdl/m4/libtool.m4 (LT_PATH_NM): End test source with

diff --git a/tests/subproject.at b/tests/subproject.at
index 28578abbde221de7bc3cdf49246d7fb7a9b4ac62..f135f9808167ad9218523243401e896fed2d44f3 100644 (file)
--- a/tests/subproject.at
+++ b/tests/subproject.at
@@ -21,7 +21,7 @@ AT_BANNER([Subproject Libltdl.])
 
 # _LTDL_SETUP
 # -----------
-m4_define([_LTDL_SETUP],
+m4_pushdef([_LTDL_SETUP],
 [AT_DATA([configure.ac],
 [[AC_INIT([subproject-demo], ]AT_PACKAGE_VERSION[, ]AT_PACKAGE_BUGREPORT[)
 LT_CONFIG_LTDL_DIR([sub/ltdl])
@@ -41,7 +41,7 @@ lib_LTLIBRARIES = foo.la
 foo_la_LDFLAGS = -module -avoid-version
 ]])
 
-touch foo.c
+echo 'static int dummy = 0;' > foo.c
 ])# _LTDL_SETUP
 
 ## ------------------------ ##
@@ -205,3 +205,6 @@ LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS"  \
 LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])
 
 AT_CLEANUP
+
+dnl Be careful not to let the definition leak into other tests
+m4_popdef([_LTDL_SETUP])