Separate the "early" and the "normal" part of the macro.

diff --git a/ChangeLog b/ChangeLog
index 9796f9b43e291ca73f31adac45a2f1db7e5d0130..5eaf416dce9b4c4fda374a6223ea2786a1c75ece 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-23  Bruno Haible <bruno@clisp.org>
+
+       * gnulib-tool (func_import, func_create_testdir): Emit an invocation
+       of gl_LOCK_EARLY instead of gl_LOCK.
+
 2006-08-22  Eric Blake  <ebb9@byu.net>
 
        * modules/regexprops-generic: New file.

diff --git a/gnulib-tool b/gnulib-tool
index 998860cf568fcd411d0e5e8bcc24e731300e4897..3208fd1d6fcd75fc6efc907714c41a4f7a92f3ef 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-08-22 18:57:52 $'
+cvsdatestamp='$Date: 2006-08-23 12:04:46 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1563,7 +1563,7 @@ func_import ()
       echo "  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])"
     fi
     if grep gl_LOCK "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then
-      echo "  AC_REQUIRE([gl_LOCK])"
+      echo "  AC_REQUIRE([gl_LOCK_EARLY])"
     fi
     echo "])"
     echo
@@ -1821,7 +1821,7 @@ func_create_testdir ()
        echo
      fi
      if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
-       echo "gl_LOCK"
+       echo "gl_LOCK_EARLY"
        echo
      fi
      if test "$libtool" = true; then
@@ -1916,7 +1916,7 @@ func_create_testdir ()
      echo
    fi
    if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then
-     echo "gl_LOCK"
+     echo "gl_LOCK_EARLY"
      echo
    fi
    if test "$libtool" = true; then

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a3e2cc25e530fba601217f357500add5fcffb190..3ab48b1f4a9b3ecd50a0423b16bb3dec2136c2d7 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-23  Bruno Haible  <bruno@clisp.org>
+
+       * lock.m4 (gl_LOCK_EARLY): Renamed from gl_LOCK.
+       (gl_LOCK_BODY): Remove gl_PREREQ_LOCK invocation.
+       (gl_LOCK): New macro.
+
 2006-08-22  Eric Blake  <ebb9@byu.net>
 
        * stdint_h.m4 (gl_AC_HEADER_STDINT_H): Avoid compiler warning.

diff --git a/m4/lock.m4 b/m4/lock.m4
index d1ea1ca83f5e8c50aa51dccdd4640a1037c02603..2e8b1ffcc6a96f56c4f1241708867c164013546a 100644 (file)
--- a/m4/lock.m4
+++ b/m4/lock.m4
@@ -1,5 +1,5 @@
-# lock.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# lock.m4 serial 3 (gettext-0.15.1)
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,12 +19,12 @@ dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
 dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
 dnl multithread-safe programs.
 
-AC_DEFUN([gl_LOCK],
+AC_DEFUN([gl_LOCK_EARLY],
 [
   AC_REQUIRE([gl_LOCK_BODY])
 ])
 
-dnl The guts of gl_LOCK. Needs to be expanded only once.
+dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
 
 AC_DEFUN([gl_LOCK_BODY],
 [
@@ -227,6 +227,11 @@ int x = (int)PTHREAD_MUTEX_RECURSIVE;
   AC_SUBST(LTLIBTHREAD)
   AC_SUBST(LIBMULTITHREAD)
   AC_SUBST(LTLIBMULTITHREAD)
+])
+
+AC_DEFUN([gl_LOCK],
+[
+  AC_REQUIRE([gl_LOCK_EARLY])
   gl_PREREQ_LOCK
 ])