Avoid multiple copies of AC_GNU_SOURCE in the configure file.

diff --git a/ChangeLog b/ChangeLog
index 56676dc483bea54e983a06b07b44fd04f3d06aab..ba20769b88c3971e560556d92762c1f097088b26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-28  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Require AC_GNU_SOURCE etc. instead of
+       always instantiating them.
+
 2005-08-28  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (import): Rename most ac_* variables to cached_*.

diff --git a/gnulib-tool b/gnulib-tool
index 8bfcf3ddbd5dfb6c2c44194364dbf46b4f64a790..0124a1ac07cf0ff3dfa598857464504efaa17077 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-08-31 20:51:41 $'
+cvsdatestamp='$Date: 2005-08-31 20:52:14 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -855,10 +855,10 @@ func_import ()
     echo "AC_DEFUN([${macro_prefix}_EARLY],"
     echo "["
     if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then
-      echo "  AC_GNU_SOURCE"
+      echo "  AC_REQUIRE([AC_GNU_SOURCE])"
     fi
     if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then
-      echo "  gl_USE_SYSTEM_EXTENSIONS"
+      echo "  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])"
     fi
     echo "])"
     echo