* extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Use autoconf's

definition in 2.60+.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 51d4a54..2cac1ac 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Eric Blake  <ebb9@byu.net>
+
+       * extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Use autoconf's
+       definition in 2.60+.
+
 2006-09-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * openat.m4 (gl_FUNC_OPENAT): Add AC_LIBOBJ(openat-proc).

diff --git a/m4/extensions.m4 b/m4/extensions.m4
index 4976079..5ea2b05 100644 (file)
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,3 +1,4 @@
+# serial 2  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
@@ -12,15 +13,18 @@
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
-AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
-  AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-  AC_BEFORE([$0], [AC_RUN_IFELSE])
+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+  [AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])],
+  [AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
+    AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+    AC_BEFORE([$0], [AC_RUN_IFELSE])
 
-  AC_REQUIRE([AC_GNU_SOURCE])
-  AC_REQUIRE([AC_AIX])
-  AC_REQUIRE([AC_MINIX])
+    AC_REQUIRE([AC_GNU_SOURCE])
+    AC_REQUIRE([AC_AIX])
+    AC_REQUIRE([AC_MINIX])
 
-  AH_VERBATIM([__EXTENSIONS__],
+    AH_VERBATIM([__EXTENSIONS__],
 [/* Enable extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
@@ -28,15 +32,15 @@ AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif])
-  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-    [ac_cv_safe_to_define___extensions__],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([
-         #define __EXTENSIONS__ 1
-         AC_INCLUDES_DEFAULT])],
-       [ac_cv_safe_to_define___extensions__=yes],
-       [ac_cv_safe_to_define___extensions__=no])])
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    AC_DEFINE([__EXTENSIONS__])
-  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-])
+    AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+      [ac_cv_safe_to_define___extensions__],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([
+           #define __EXTENSIONS__ 1
+           AC_INCLUDES_DEFAULT])],
+         [ac_cv_safe_to_define___extensions__=yes],
+         [ac_cv_safe_to_define___extensions__=no])])
+    test $ac_cv_safe_to_define___extensions__ = yes &&
+      AC_DEFINE([__EXTENSIONS__])
+    AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+])])