summaryrefslogtreecommitdiffstats
path: root/gettext-runtime
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2006-06-28 11:57:34 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:13:27 +0200
commitf161725feeea2bb18e943e5cf8a0dcda2b436f7f (patch)
tree196718c20910ab8712aa0d00f33a864994dbf0c5 /gettext-runtime
parent213fb99746f4ed71bc7f8692c482f083f205420d (diff)
downloadexternal_gettext-f161725feeea2bb18e943e5cf8a0dcda2b436f7f.zip
external_gettext-f161725feeea2bb18e943e5cf8a0dcda2b436f7f.tar.gz
external_gettext-f161725feeea2bb18e943e5cf8a0dcda2b436f7f.tar.bz2
Ensure automatic ordering between gl_LOCK and gl_ARGP.
Diffstat (limited to 'gettext-runtime')
-rw-r--r--gettext-runtime/m4/ChangeLog6
-rw-r--r--gettext-runtime/m4/lock.m49
2 files changed, 14 insertions, 1 deletions
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 58e7614..7003407 100644
--- 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 0aff3fa..d1ea1ca 100644
--- 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,
@@ -21,6 +21,13 @@ 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
dnl declarations, on AIX 5 at least. Therefore it must come early.