Prepare for autoconf-2.60.

diff --git a/gettext-runtime/m4/longdouble.m4 b/gettext-runtime/m4/longdouble.m4
index 40cd7ce02df6d355145e3eea5c70e6ee9fc3096a..25590f4704d6a1905e47deef9bda479349d8b625 100644 (file)
--- a/gettext-runtime/m4/longdouble.m4
+++ b/gettext-runtime/m4/longdouble.m4
@@ -1,5 +1,5 @@
-# longdouble.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# longdouble.m4 serial 2 (gettext-0.15)
+dnl Copyright (C) 2002-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.
@@ -8,6 +8,9 @@ dnl From Bruno Haible.
 dnl Test whether the compiler supports the 'long double' type.
 dnl Prerequisite: AC_PROG_CC
 
+dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
+dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics.
+
 AC_DEFUN([gt_TYPE_LONGDOUBLE],
 [
   AC_CACHE_CHECK([for long double], gt_cv_c_long_double,

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 418068ec2457071844c1f686f7e4fc84fb1a9d6e..fba28b24fa20b4a930f772a14d3eeeef405dbeb2 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,18 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Prepare for autoconf-2.60.
+       * hello-clisp/configure.ac: Set datarootdir before evaluating
+       ${datadir}.
+       * hello-gawk/configure.ac: Likewise.
+       * hello-guile/configure.ac: Likewise.
+       * hello-librep/configure.ac: Likewise.
+       * hello-pascal/configure.ac: Likewise.
+       * hello-perl/configure.ac: Likewise.
+       * hello-php/configure.ac: Likewise.
+       * hello-python/configure.ac: Likewise.
+       * hello-sh/configure.ac: Likewise.
+       * hello-smalltalk/configure.ac: Likewise.
+
 2006-04-07  Bruno Haible  <bruno@clisp.org>
 
        * po/hu.po: New file, from Kiss Tamás <atomi@inf.elte.hu>.

diff --git a/gettext-tools/examples/hello-clisp/configure.ac b/gettext-tools/examples/hello-clisp/configure.ac
index 56828c6f2746152ccb7a623529364b82d4f8ac4d..04def4553fbbc1acb6ab0addbf12ef024f73e0ab 100644 (file)
--- a/gettext-tools/examples/hello-clisp/configure.ac
+++ b/gettext-tools/examples/hello-clisp/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-gawk/configure.ac b/gettext-tools/examples/hello-gawk/configure.ac
index 602a7d0de39a4d30728e356879c65b28fb1f8e43..a2484f9d7f1608f83b3b3c2ccb093857ae1bdd82 100644 (file)
--- a/gettext-tools/examples/hello-gawk/configure.ac
+++ b/gettext-tools/examples/hello-gawk/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-guile/configure.ac b/gettext-tools/examples/hello-guile/configure.ac
index 42b95ee2ce934120f93c77c8400acbe6e399da61..f3276ca201b059557f2a5417c032f9bec985883a 100644 (file)
--- a/gettext-tools/examples/hello-guile/configure.ac
+++ b/gettext-tools/examples/hello-guile/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-librep/configure.ac b/gettext-tools/examples/hello-librep/configure.ac
index 0ac1e9aa458f30a2037cf498c12618a881837ad5..1cb87fdc2dd528cbe3a9eaa9003c66453bd64180 100644 (file)
--- a/gettext-tools/examples/hello-librep/configure.ac
+++ b/gettext-tools/examples/hello-librep/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-pascal/configure.ac b/gettext-tools/examples/hello-pascal/configure.ac
index 2f0bb04a5e258100cf8292fd3d504fc6b04637a6..c6dad69317bb0cd4219dcd2ee277bef2c070a50f 100644 (file)
--- a/gettext-tools/examples/hello-pascal/configure.ac
+++ b/gettext-tools/examples/hello-pascal/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-perl/configure.ac b/gettext-tools/examples/hello-perl/configure.ac
index d2986e1d837c7c55960487fea240e19f9701f8fe..4fd7a77b44773a090ce5ee100a1ef124b311cc2e 100644 (file)
--- a/gettext-tools/examples/hello-perl/configure.ac
+++ b/gettext-tools/examples/hello-perl/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-php/configure.ac b/gettext-tools/examples/hello-php/configure.ac
index 6a9a975aa63c938260402cb43029558e188f4c45..4be26011f2fceffff150e72119d14e2c66fb1985 100644 (file)
--- a/gettext-tools/examples/hello-php/configure.ac
+++ b/gettext-tools/examples/hello-php/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-python/configure.ac b/gettext-tools/examples/hello-python/configure.ac
index a6d65a955becb14e726e4e9652be81b05caa3460..175788ff95620293932a48d0a11d2a99a002e017 100644 (file)
--- a/gettext-tools/examples/hello-python/configure.ac
+++ b/gettext-tools/examples/hello-python/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -24,6 +24,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-sh/configure.ac b/gettext-tools/examples/hello-sh/configure.ac
index 2a1de3045e6589cfe74c01a2c89e0185e166ad6f..5d3198e28012f36ecd834b84b726677d8ed89931 100644 (file)
--- a/gettext-tools/examples/hello-sh/configure.ac
+++ b/gettext-tools/examples/hello-sh/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -17,6 +17,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/examples/hello-smalltalk/configure.ac b/gettext-tools/examples/hello-smalltalk/configure.ac
index bc0e415ef6f8af4845ef19eb823c3b35a5d62bbb..52fe8b19183a2425d2dda3caf4b65b29a4d9144e 100644 (file)
--- a/gettext-tools/examples/hello-smalltalk/configure.ac
+++ b/gettext-tools/examples/hello-smalltalk/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -25,6 +25,7 @@ else
 fi
 save_prefix="$prefix"
 prefix="$final_prefix"
+eval "datarootdir=\"${datarootdir}\""
 eval "localedir=\"${datadir}/locale\""
 prefix="$save_prefix"
 AC_SUBST(localedir)

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index c351bd7c8d4865b116356595ad777af22db0e943..bdc827719bc958b49754a850b7a53bde5de6f3d4 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Prepare for autoconf-2.60.
+       * regex.m4 (gl_INCLUDED_REGEX): Include <stdlib.h>, for exit()
+       declaration.
+
 2006-03-12  Bruno Haible  <bruno@clisp.org>
 
        * javaexec.m4 (gt_JAVAEXEC): Make the result of the test available as

diff --git a/gettext-tools/m4/extensions.m4 b/gettext-tools/m4/extensions.m4
index d6e9fd978bb24e64b6df7c7a0b09a8ae375d70b2..5acc7d9151a364a3669e1c9109549840218a376a 100644 (file)
--- a/gettext-tools/m4/extensions.m4
+++ b/gettext-tools/m4/extensions.m4
@@ -1,10 +1,13 @@
 # Enable extensions on systems that normally disable them.
 
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+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.
 
+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.
+
 # gl_USE_SYSTEM_EXTENSIONS
 # ------------------------
 # Enable extensions on systems that normally disable them,

diff --git a/gettext-tools/m4/onceonly.m4 b/gettext-tools/m4/onceonly.m4
index a8a992af4b84f058ac442a8dfa80ef8250a132b0..6d913fafd73f772a9cd756a93a2ad051936a8c3d 100644 (file)
--- a/gettext-tools/m4/onceonly.m4
+++ b/gettext-tools/m4/onceonly.m4
@@ -1,5 +1,5 @@
-# onceonly.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# onceonly.m4 serial 4 (gettext-0.15)
+dnl Copyright (C) 2002-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.
@@ -19,6 +19,11 @@ dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
 dnl empty, and the check will be inserted before the body of the AC_DEFUNed
 dnl function.
 
+dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
+dnl have this macro built-in.  But about AC_CHECK_DECLS_ONCE: note that in
+dnl autoconf >= 2.60 the symbol separator is a comma, whereas here it is
+dnl whitespace.
+
 dnl Autoconf version 2.57 or newer is recommended.
 AC_PREREQ(2.54)
 

diff --git a/gettext-tools/m4/regex.m4 b/gettext-tools/m4/regex.m4
index ac26a20ac703e194d709e2d6bb0211b2ef7af992..b26cca3d5c395db65e1882be075ef3646172b758 100644 (file)
--- a/gettext-tools/m4/regex.m4
+++ b/gettext-tools/m4/regex.m4
@@ -1,6 +1,6 @@
-#serial 22
+#serial 23
 
-dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 Free
+dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 Free
 dnl Software Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
@@ -34,6 +34,7 @@ AC_DEFUN([gl_INCLUDED_REGEX],
                   jm_cv_func_working_re_compile_pattern,
       AC_TRY_RUN(
 [#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <regex.h>
          int