Ensure automatic ordering between gl_LOCK and gl_ARGP.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 58e7614071ab6ceed167b22344d489f30afe0f01..70034079e4637d1c6866bb87ed04d6f76400e729 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-08  Bruno Haible  <bruno@clisp.org>
+
+        Ensure automatic ordering between gl_LOCK and gl_ARGP.
+        * lock.m4 (gl_LOCK_BODY): Renamed from gl_LOCK.
+        (gl_LOCK): New macro, requiring gl_LOCK_BODY.
+
 2006-06-23  Bruno Haible  <bruno@clisp.org>
 
        * gettext.m4 (gt_INTL_SUBDIR_CORE): Check for argz_* functions,

diff --git a/gettext-runtime/m4/lock.m4 b/gettext-runtime/m4/lock.m4
index 0aff3fada2bf0d759915ea331a8de273c3668656..d1ea1ca83f5e8c50aa51dccdd4640a1037c02603 100644 (file)
--- a/gettext-runtime/m4/lock.m4
+++ b/gettext-runtime/m4/lock.m4
@@ -1,4 +1,4 @@
-# lock.m4 serial 1 (gettext-0.15)
+# 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,
@@ -20,6 +20,13 @@ dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
 dnl multithread-safe programs.
 
 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