Mercurial > hg > octave-lyh > gnulib-hg

changeset 7187:89a978aa0b12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Separate the "early" and the "normal" part of the macro.
author Bruno Haible <bruno@clisp.org>
date Wed, 23 Aug 2006 12:04:46 +0000
parents d4c048efbd28
children aa15ff3f4514
files ChangeLog gnulib-tool m4/ChangeLog m4/lock.m4
diffstat 4 files changed, 24 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 @@
       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 @@
        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 @@
      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
--- 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.
--- 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 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 @@
   AC_SUBST(LTLIBTHREAD)
   AC_SUBST(LIBMULTITHREAD)
   AC_SUBST(LTLIBMULTITHREAD)
+])
+
+AC_DEFUN([gl_LOCK],
+[
+  AC_REQUIRE([gl_LOCK_EARLY])
   gl_PREREQ_LOCK
 ])