From: Bruno Haible <bruno@clisp.org>
Date: Sat, 22 Jul 2006 14:45:38 +0000 (+0000)
Subject: Update from gnulib.
X-Git-Tag: 0.16.x-branchpoint~351
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6823676fbc3979f6710b46664dbd7c79cccabe4;p=thirdparty%2Fgettext.git

Update from gnulib.
---

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index b653d993c..7271cb2a2 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,6 +1,7 @@
 2006-07-22  Bruno Haible  <bruno@clisp.org>
 
 	* fatal-signal.c: Include <config.h>, not "config.h".
+	* findprog.c: Likewise.
 
 	* c-strcasecmp.c: Update from gnulib. Don't assume that
 	UCHAR_MAX <= INT_MAX.
diff --git a/gettext-tools/lib/findprog.c b/gettext-tools/lib/findprog.c
index 5e9141ecd..f1f7ef196 100644
--- a/gettext-tools/lib/findprog.c
+++ b/gettext-tools/lib/findprog.c
@@ -18,7 +18,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Specification.  */
diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index cff44d40f..08b4cf42c 100644
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-22  Bruno Haible  <bruno@clisp.org>
+
+	* error.m4: Update from gnulib.
+	* extensions.m4: Update from gnulib.
+
 2006-07-21  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.15 released.
diff --git a/gettext-tools/m4/error.m4 b/gettext-tools/m4/error.m4
index ed1e6d5e5..7c7746e2c 100644
--- a/gettext-tools/m4/error.m4
+++ b/gettext-tools/m4/error.m4
@@ -1,8 +1,11 @@
-# error.m4 serial 10 (gettext-0.14.2)
-dnl Copyright (C) 2002-2005 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.
+#serial 11
+
+# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_ERROR],
 [
diff --git a/gettext-tools/m4/extensions.m4 b/gettext-tools/m4/extensions.m4
index 5acc7d915..497607918 100644
--- a/gettext-tools/m4/extensions.m4
+++ b/gettext-tools/m4/extensions.m4
@@ -1,12 +1,12 @@
 # Enable extensions on systems that normally disable them.
 
-dnl Copyright (C) 2003, 2006 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.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
-dnl have a macro AC_USE_SYSTEM_EXTENSIONS with identical semantics.
+# This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
+# have a macro AC_USE_SYSTEM_EXTENSIONS with identical semantics.
 
 # gl_USE_SYSTEM_EXTENSIONS
 # ------------------------
@@ -24,6 +24,19 @@ AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
 [/* Enable extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
 #endif])
-  AC_DEFINE([__EXTENSIONS__])
+  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])
 ])