From: Bruno Haible <bruno@clisp.org>
Date: Tue, 26 Jul 2005 12:01:52 +0000 (+0000)
Subject: Respect some ordering constraints.
X-Git-Tag: v0.15~461
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a740f02c627b60c5506a881b8e83080b9f34454b;p=thirdparty%2Fgettext.git

Respect some ordering constraints.
---

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 6521f0df8..61ab4d5f2 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: Move the AM_GNU_GETTEXT invocation early, since it
+	modifies CPPFLAGS.
+
 2005-07-16  Bruno Haible  <bruno@clisp.org>
 
 	* tests: New directory.
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index f8797e804..2492eeece 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -74,6 +74,10 @@ AC_RELOCATABLE
 
 dnl Checks for libraries.
 
+dnl These are the only lines required to internationalize the package.
+dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
+AM_GNU_GETTEXT(use-libtool, need-ngettext)
+
 dnl Checks for header files.
 AC_CHECK_HEADERS(string.h)
 AM_STDBOOL_H
@@ -97,10 +101,6 @@ gl_FUNC_READLINK
 gl_XREADLINK
 gl_CANONICALIZE
 
-dnl These are the only lines required to internationalize the package.
-dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
-AM_GNU_GETTEXT(use-libtool, need-ngettext)
-
 dnl Put some default definitions into config.h.
 AH_BOTTOM([
 /* On Windows, variables that may be in a DLL must be marked specially.  */
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index b14a65bdf..449ebcd34 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* lock.m4 (gl_LOCK): Add some ordering constraints.
+
 2005-07-25  Bruno Haible  <bruno@clisp.org>
 
 	* lock.m4 (gl_LOCK): On Solaris and HP-UX, define
diff --git a/gettext-runtime/m4/lock.m4 b/gettext-runtime/m4/lock.m4
index c8637a031..daa6c68b8 100644
--- a/gettext-runtime/m4/lock.m4
+++ b/gettext-runtime/m4/lock.m4
@@ -16,9 +16,17 @@ dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
 dnl programs that really need multithread functionality. The difference
 dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
 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],
 [
+  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.
+  AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
+  AC_BEFORE([$0], [gl_ARGP])dnl
+
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems
   dnl Check for multithreading.
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 0f78c8825..605292b88 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: Move the AM_GNU_GETTEXT invocation early, since it
+	modifies CPPFLAGS.
+
 2005-07-05  Bruno Haible  <bruno@clisp.org>
 
 	* mingw: New directory.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 1a6e8e3d3..4faaee36d 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -104,6 +104,10 @@ AC_RELOCATABLE
 
 dnl Checks for libraries.
 
+dnl These are the only lines required to internationalize the package.
+dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
+AM_GNU_GETTEXT(use-libtool, need-ngettext)
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(limits.h malloc.h pwd.h string.h unistd.h utime.h values.h)
@@ -167,10 +171,6 @@ gt_LIBGREP
 
 gt_PREREQ_HOSTNAME
 
-dnl These are the only lines required to internationalize the package.
-dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
-AM_GNU_GETTEXT(use-libtool, need-ngettext)
-
 dnl Compilation on mingw needs special Makefile rules, because of variables
 dnl being exported from or imported into shared libraries.
 case "$host_os" in