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

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index e9dd4ffb83b22baf1b6df6955f66f9d31b384bb7..58bc3da5dfb5d7ae688cd7ab6f85156b6858b6c1 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/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-18  Bruno Haible  <bruno@clisp.org>
 
        * lock.m4 (gl_LOCK_BODY): Change the default value of gl_use_threads on

diff --git a/gettext-runtime/m4/lock.m4 b/gettext-runtime/m4/lock.m4
index 8f3fd0a4af06b893c4862fe0a484d7e2e658ff5b..1ab72164f729b151a7df69661fe21c14a25a0719 100644 (file)
--- a/gettext-runtime/m4/lock.m4
+++ b/gettext-runtime/m4/lock.m4
@@ -1,4 +1,4 @@
-# lock.m4 serial 3 (gettext-0.15.1)
+# lock.m4 serial 4 (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,
@@ -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],
 [
@@ -235,6 +235,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
 ])