Update lock.m4 from gnulib.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 807d303277d58310b4a5a6246c9dace06d697b8b..cad6b74e5fb3a45c32aac56c2e9f3f7be0cf1910 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,16 @@
+2007-09-12  Bruno Haible  <bruno@clisp.org>
+
+       * lock.m4: Don't provide an AC_USE_SYSTEM_EXTENSIONS definition.
+       (gl_LOCK_EARLY_BODY): Use AC_GNU_SOURCE when AC_USE_SYSTEM_EXTENSIONS
+       is not defined.
+
+2007-09-12  Eric Blake  <ebb9@byu.net>
+
+       * lock.m4 (gl_LOCK_EARLY_BODY): AC_GNU_SOURCE will be obsolete in
+       Autoconf 2.62; use AC_USE_SYSTEM_EXTENSIONS instead, but provide
+       fallback, so that lock.m4 can be used in gettext without extensions
+       module.
+
 2007-09-08  Bruno Haible  <bruno@clisp.org>
 
        * po.m4 (AM_PO_SUBDIRS): Define GETTEXT_MACRO_VERSION.

diff --git a/gettext-runtime/m4/lock.m4 b/gettext-runtime/m4/lock.m4
index 0224f2ff870a1dc6650a2ab8d327b6a5c6cc7f38..4cc585ea2e7776c06afd41761afaacaad040cc93 100644 (file)
--- a/gettext-runtime/m4/lock.m4
+++ b/gettext-runtime/m4/lock.m4
@@ -1,5 +1,5 @@
-# lock.m4 serial 6 (gettext-0.16)
-dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
+# lock.m4 serial 7 (gettext-0.16.2)
+dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -35,7 +35,12 @@ AC_DEFUN([gl_LOCK_EARLY_BODY],
   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 _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
+  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
+  dnl AC_GNU_SOURCE.
+  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+    [AC_REQUIRE([AC_GNU_SOURCE])])
   dnl Check for multithreading.
   AC_ARG_ENABLE(threads,
 AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])