Persuade also Solaris <stdio.h> to declare the *_unlocked() functions.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 51c3f9963b99ec7a1c3494a78b3131854c6d810b..41ee008a174c08b2c2a7907f5519162cd8bbb436 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-23  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (EXTRA_DIST): Add extensions.m4.
+
+2003-08-08  Paul Eggert  <eggert@twinsun.com>
+
+       * extensions.m4: New file.
+       * unlocked-io.m4 (jm_FUNC_GLIBC_UNLOCKED_IO):
+       Require gl_USE_SYSTEM_EXTENSIONS rather than AC_GNU_SOURCE.
+
 2003-07-01  Paul Eggert  <eggert@twinsun.com>
 
        * xreadlink.m4 (gl_XREADLINK): Don't check for sys/types.h, since

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index 32e11c303ce56d133771af363ba224c68ae37d2f..42e77e02cb45c95718484263a46768baa930bc82 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -39,6 +39,7 @@ backupfile.m4 \
 canonicalize.m4 \
 eaccess.m4 \
 error.m4 \
+extensions.m4 \
 flex.m4 \
 fnmatch.m4 \
 gcj.m4 \

diff --git a/gettext-tools/m4/extensions.m4 b/gettext-tools/m4/extensions.m4
new file mode 100644 (file)
index 0000000..7faaa83
--- /dev/null
+++ b/gettext-tools/m4/extensions.m4
@@ -0,0 +1,15 @@
+# gl_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
+  AC_REQUIRE([AC_GNU_SOURCE])
+  AH_VERBATIM([__EXTENSIONS__],
+[/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif])
+  AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+  AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+  AC_DEFINE([__EXTENSIONS__])
+])

diff --git a/gettext-tools/m4/unlocked-io.m4 b/gettext-tools/m4/unlocked-io.m4
index f0c15d990c97363750c32d6da8462c7586730e7c..f8e98f1d12b3fa8ffbde4a1b2d29ec42097dda42 100644 (file)
--- a/gettext-tools/m4/unlocked-io.m4
+++ b/gettext-tools/m4/unlocked-io.m4
@@ -1,4 +1,4 @@
-#serial 7 -*- autoconf -*-
+#serial 8 -*- autoconf -*-
 
 dnl From Jim Meyering.
 dnl
@@ -10,9 +10,9 @@ dnl on Solaris 2.6).
 
 AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
 [
-  dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked()
-  dnl etc.
-  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl Persuade glibc and Solaris <stdio.h> to declare
+  dnl fgets_unlocked(), fputs_unlocked() etc.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_DECLS_ONCE(
      [clearerr_unlocked feof_unlocked ferror_unlocked