gl_LOCK vs. gl_ARGP ordering

[Bruno Haible]

$ ./gnulib-tool --create-testdir --dir=testdir argp lock
...
configure.ac:36: warning: gl_ARGP was called before gl_LOCK
m4/lock.m4:224: gl_LOCK is expanded from...

I'm committing this fix.

2006-01-08  Bruno Haible  <address@hidden>

        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.
        * lock.m4 (gl_LOCK_BODY): Renamed from gl_LOCK.
        (gl_LOCK): New macro, requiring gl_LOCK_BODY.

*** gnulib-tool.bak     2006-01-08 16:23:19.000000000 +0100
--- gnulib-tool 2006-01-08 16:43:14.000000000 +0100
***************
*** 13,20 ****
  # 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.
  #
  
  # This program is meant for authors or maintainers which want to import
--- 13,20 ----
  # 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.
  #
  
  # This program is meant for authors or maintainers which want to import
***************
*** 1261,1266 ****
--- 1261,1269 ----
      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"
***************
*** 1472,1477 ****
--- 1475,1484 ----
         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
***************
*** 1536,1541 ****
--- 1543,1552 ----
       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
*** m4/lock.m4.bak      2005-07-26 14:43:35.000000000 +0200
--- m4/lock.m4  2006-01-08 16:47:37.000000000 +0100
***************
*** 1,4 ****
! # lock.m4 serial 1 (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,
--- 1,4 ----
! # 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,26 ****
--- 21,33 ----
  
  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.