Respect some ordering constraints.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 6521f0df831e5ec55f0c22641da14121c42696ad..61ab4d5f2c6d6d0326975f690843e3c9730c2237 100644 (file)
--- 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 f8797e804e265020bf0544abf65000f0604c6883..2492eeece26949470f0baf08c05d407af13ba28f 100644 (file)
--- 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 b14a65bdf50d743b7b561ca057531170d5c07581..449ebcd34b8251b094af37d56dc8f9c55a8c3b30 100644 (file)
--- 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 c8637a031072cd37b0c7bc245449d0a5587365bc..daa6c68b8f1431441b72a29d05a36f7eeb824939 100644 (file)
--- 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 0f78c8825c16fdf054616ab8c1a0215adf4341e2..605292b8825e01d4552c9515ace2538c1d2b7e3b 100644 (file)
--- 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 1a6e8e3d3305be407cca9f0d53fa3b84487cad07..4faaee36dea314b37c577cc2f0fe5c280a3a9194 100644 (file)
--- 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