diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-08-23 12:04:46 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2006-08-23 12:04:46 +0000 |
| commit | 8e85589bab727fedc08be06d9c3eec5a04abce99 (patch) | |
| tree | 5284ade20b0b36331dacff891e07c7716a7d9de8 | |
| parent | 0af1a00c97ad7804d9d69d1d875a775b8182f067 (diff) | |
| download | gnulib-8e85589bab727fedc08be06d9c3eec5a04abce99.tar.gz | |
Separate the "early" and the "normal" part of the macro.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | gnulib-tool | 8 | ||||
| -rw-r--r-- | m4/ChangeLog | 6 | ||||
| -rw-r--r-- | m4/lock.m4 | 13 |
4 files changed, 24 insertions, 8 deletions
@@ -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 998860cf56..3208fd1d6f 100755 --- 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 a3e2cc25e5..3ab48b1f4a 100644 --- 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 d1ea1ca83f..2e8b1ffcc6 100644 --- 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 ]) |