Ensure automatic ordering between gl_LOCK and gl_ARGP.

diff --git a/ChangeLog b/ChangeLog
index aa43583..1ec9704 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-01-08  Bruno Haible  <bruno@clisp.org>
 
+       Ensure automatic ordering between gl_LOCK and gl_ARGP.
+       * gnulib-tool (func_import, func_create_testdir): Put gl_LOCK into
+       the "early" section as well.
+
+2006-01-08  Bruno Haible  <bruno@clisp.org>
+
        * gnulib-tool (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am):
        Initialize also noinst_HEADERS to empty.
 

diff --git a/gnulib-tool b/gnulib-tool
index 72d2371..0a15152 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -13,8 +13,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 
 # This program is meant for authors or maintainers which want to import
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-01-11 12:59:02 $'
+cvsdatestamp='$Date: 2006-01-11 13:01:13 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1261,6 +1261,9 @@ func_import ()
     if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then
       echo "  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])"
     fi
+    if grep gl_LOCK "$destdir"/$m4base/*.m4 > /dev/null; then
+      echo "  AC_REQUIRE([gl_LOCK])"
+    fi
     echo "])"
     echo
     echo "# This macro should be invoked from $configure_ac, in the section"
@@ -1482,6 +1485,10 @@ func_create_testdir ()
        echo "gl_USE_SYSTEM_EXTENSIONS"
        echo
      fi
+     if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
+       echo "gl_LOCK"
+       echo
+     fi
      if test -z "$libtool"; then
        echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
      else
@@ -1555,6 +1562,10 @@ func_create_testdir ()
      echo "gl_USE_SYSTEM_EXTENSIONS"
      echo
    fi
+   if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
+     echo "gl_LOCK"
+     echo
+   fi
    if test -z "$libtool"; then
      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])"
    else

diff --git a/m4/ChangeLog b/m4/ChangeLog
index aba416d..8840d60 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-08  Bruno Haible  <bruno@clisp.org>
+
+       Ensure automatic ordering between gl_LOCK and gl_ARGP.
+       * lock.m4 (gl_LOCK_BODY): Renamed from gl_LOCK.
+       (gl_LOCK): New macro, requiring gl_LOCK_BODY.
+
 2006-01-10  Jim Meyering  <jim@meyering.net>
 
        * fpending.m4: Also include <stdio.h>, for Dragonfly.

diff --git a/m4/lock.m4 b/m4/lock.m4
index 0aff3fa..d1ea1ca 100644 (file)
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -1,4 +1,4 @@
-# lock.m4 serial 1 (gettext-0.15)
+# lock.m4 serial 2 (gettext-0.15)
 dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -21,6 +21,13 @@ dnl multithread-safe programs.
 
 AC_DEFUN([gl_LOCK],
 [
+  AC_REQUIRE([gl_LOCK_BODY])
+])
+
+dnl The guts of gl_LOCK. Needs to be expanded only once.
+
+AC_DEFUN([gl_LOCK_BODY],
+[
   dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
   dnl influences the result of the autoconf tests that test for *_unlocked
   dnl declarations, on AIX 5 at least. Therefore it must come early.