# HG changeset patch # User Paul Eggert # Date 1060723012 0 # Node ID ae85e65ee361eefac39d5a48415f2f7b219feb64 # Parent 1763ae429862d9e020e83661a01dc32c26409da4 Get m4 files from the gettext distribution. diff --git a/config/ChangeLog b/config/ChangeLog --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,11 @@ +2003-08-12 Paul Eggert + + * srclist.txt: Get the following m4 files from gettext: + codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, + inttypes-pri.m4, lcmessage.m4, lib-ld.m4, lib-link.m4, lib-prefix.m4, + longdouble.m4, nls.m4, po.m4, progtest.m4, signed.m4, wchar_t.m4, + wint_t.m4. + 2003-08-12 Karl Berry * srclist.txt: can't sync vasnprintf.c any more, changes have been diff --git a/config/srclist.txt b/config/srclist.txt --- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.20 2003-08-12 14:33:10 karl Exp $ +# $Id: srclist.txt,v 1.21 2003-08-12 21:16:52 eggert Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -42,6 +42,25 @@ $GETTEXT/gettext-tools/lib/mkdtemp.c lib gpl $GETTEXT/gettext-tools/lib/setenv.c lib gpl $GETTEXT/gettext-tools/lib/unsetenv.c lib gpl + +$GETTEXT/autoconf-lib-link/m4/lib-ld.m4 m4 +$GETTEXT/autoconf-lib-link/m4/lib-link.m4 m4 +$GETTEXT/autoconf-lib-link/m4/lib-prefix.m4 m4 + +$GETTEXT/gettext-runtime/m4/codeset.m4 m4 +$GETTEXT/gettext-runtime/m4/gettext.m4 m4 +$GETTEXT/gettext-runtime/m4/glibc21.m4 m4 +$GETTEXT/gettext-runtime/m4/iconv.m4 m4 +$GETTEXT/gettext-runtime/m4/intdiv0.m4 m4 +$GETTEXT/gettext-runtime/m4/inttypes-pri.m4 m4 +$GETTEXT/gettext-runtime/m4/lcmessage.m4 m4 +$GETTEXT/gettext-runtime/m4/longdouble.m4 m4 +$GETTEXT/gettext-runtime/m4/nls.m4 m4 +$GETTEXT/gettext-runtime/m4/po.m4 m4 +$GETTEXT/gettext-runtime/m4/progtest.m4 m4 +$GETTEXT/gettext-runtime/m4/signed.m4 m4 +$GETTEXT/gettext-runtime/m4/wchar_t.m4 m4 +$GETTEXT/gettext-runtime/m4/wint_t.m4 m4 # $LIBCSRC/argp/argp-ba.c lib gpl $LIBCSRC/argp/argp-eexst.c lib gpl diff --git a/m4/ChangeLog b/m4/ChangeLog --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2003-08-12 Paul Eggert + + * lib-ld.m4, lib-link.m4, lib-prefix.m4: Regenerate from gettext + 0.12.1. These files are now being upgraded automatically by + ../config/srclist-update. + 2003-08-11 Bruno Haible * vasnprintf.m4 (gl_PREREQ_VASNPRINTF): Also check for wcslen. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. +# lib-ld.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -29,6 +29,19 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 3 (gettext-0.11.3) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# lib-link.m4 serial 4 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -92,8 +92,7 @@ dnl Determine the platform dependent parameters needed to use rpath: dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L, -dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. +dnl hardcode_direct, hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS @@ -114,8 +113,6 @@ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" hardcode_direct="$acl_cv_hardcode_direct" hardcode_minus_L="$acl_cv_hardcode_minus_L" - sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" - sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" dnl Determine whether the user wants rpath handling at all. AC_ARG_ENABLE(rpath, [ --disable-rpath do not hardcode runtime library paths], @@ -135,7 +132,7 @@ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib$1-prefix], + AC_LIB_ARG_WITH([lib$1-prefix], [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib --without-lib$1-prefix don't search for lib$1 in includedir and libdir], [ diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +# lib-prefix.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -8,6 +8,13 @@ dnl From Bruno Haible. +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed dnl to access previously installed libraries. The basic assumption is that dnl a user will want packages to use other packages he previously installed @@ -26,7 +33,7 @@ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_ARG_WITH([lib-prefix], + AC_LIB_ARG_WITH([lib-prefix], [ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib --without-lib-prefix don't search for libraries in includedir and libdir], [