From 74f8d5870e0fd68701ff379775a5f0a439bfb5b3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 12 Sep 2007 23:24:15 +0000 Subject: [PATCH] Avoid defining AC_USE_SYSTEM_EXTENSIONS here. --- ChangeLog | 6 ++++++ m4/lock.m4 | 17 +++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f662535de..b93f42462 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-12 Bruno Haible + + * m4/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 Track CVS Autoconf on AC_USE_SYSTEM_EXTENSIONS. diff --git a/m4/lock.m4 b/m4/lock.m4 index 1bf3abb00..4cc585ea2 100644 --- a/m4/lock.m4 +++ b/m4/lock.m4 @@ -1,4 +1,4 @@ -# lock.m4 serial 7 (gettext-0.16) +# 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, @@ -35,7 +35,12 @@ AC_DEFUN([gl_LOCK_EARLY_BODY], AC_BEFORE([$0], [gl_ARGP])dnl AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) 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]) @@ -257,14 +262,6 @@ AC_DEFUN([gl_PREREQ_LOCK], [ AC_REQUIRE([AC_C_INLINE]) ]) -# AC_USE_SYSTEM_EXTENSIONS was only added in autoconf 2.60, but lock.m4 -# wants to work with autoconf 2.54. Add a fallback until such time as -# a newer autoconf is standard, if one is not already provided by gnulib -# extensions.m4. -m4_if(m4_version_compare(m4_PACKAGE_VERSION, [2.60]), [-1], - [m4_ifndef([AC_USE_SYSTEM_EXTENSIONS], - [AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])])]) - dnl Survey of platforms: dnl dnl Platform Available Compiler Supports test-lock -- 2.11.0