From: Bruno Haible <bruno@clisp.org>
Date: Wed, 31 Aug 2005 20:52:14 +0000 (+0000)
Subject: Avoid multiple copies of AC_GNU_SOURCE in the configure file.
X-Git-Tag: cvs-readonly~3007
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=996a94384dbeb7b2a7773dd60fe726a29ae32179;p=gnulib.git

Avoid multiple copies of AC_GNU_SOURCE in the configure file.
---

diff --git a/ChangeLog b/ChangeLog
index 56676dc48..ba20769b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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_*.
 	Also use new variables cached_lgpl, cached_libtool.
 
diff --git a/gnulib-tool b/gnulib-tool
index 8bfcf3ddb..0124a1ac0 100755
--- 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