From: Bruno Haible Date: Tue, 18 Apr 2006 10:33:28 +0000 (+0000) Subject: Prepare for autoconf-2.60. X-Git-Tag: v0.15~227 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49e58197176c9136f064ad5c7db71cb2fccd616;p=thirdparty%2Fgettext.git Prepare for autoconf-2.60. --- diff --git a/gettext-runtime/m4/longdouble.m4 b/gettext-runtime/m4/longdouble.m4 index 40cd7ce02..25590f470 100644 --- 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 418068ec2..fba28b24f 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,18 @@ +2006-04-14 Bruno Haible + + 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 * po/hu.po: New file, from Kiss Tamás . diff --git a/gettext-tools/examples/hello-clisp/configure.ac b/gettext-tools/examples/hello-clisp/configure.ac index 56828c6f2..04def4553 100644 --- 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 602a7d0de..a2484f9d7 100644 --- 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 42b95ee2c..f3276ca20 100644 --- 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 0ac1e9aa4..1cb87fdc2 100644 --- 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 2f0bb04a5..c6dad6931 100644 --- 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 d2986e1d8..4fd7a77b4 100644 --- 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 6a9a975aa..4be26011f 100644 --- 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 a6d65a955..175788ff9 100644 --- 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 2a1de3045..5d3198e28 100644 --- 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 bc0e415ef..52fe8b191 100644 --- 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 c351bd7c8..bdc827719 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,9 @@ +2006-04-14 Bruno Haible + + Prepare for autoconf-2.60. + * regex.m4 (gl_INCLUDED_REGEX): Include , for exit() + declaration. + 2006-03-12 Bruno Haible * 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 d6e9fd978..5acc7d915 100644 --- 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 a8a992af4..6d913fafd 100644 --- 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 ac26a20ac..b26cca3d5 100644 --- 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 +#include #include #include int