[Bug-gnulib] getting m4 files from gettext into gnulib

[Paul Eggert]

I noticed that gnulib's lib-ld.m4 was out of date with respect to
gettext 0.12.1, and tracked this down to a problem in my change last
month to get source files from gettext into gnulib.  I installed the
following patch to fix this.  This also upgrades lib-link.m4 and
lib-prefix.m4 to the gettext 0.12.1 versions.

Index: config/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/ChangeLog,v
retrieving revision 1.36
diff -p -u -r1.36 ChangeLog
--- config/ChangeLog    12 Aug 2003 14:33:10 -0000      1.36
+++ config/ChangeLog    12 Aug 2003 21:10:14 -0000
@@ -1,3 +1,11 @@
+2003-08-12  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * srclist.txt: can't sync vasnprintf.c any more, changes have been
Index: config/srclist.txt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist.txt,v
retrieving revision 1.20
diff -p -u -r1.20 srclist.txt
--- config/srclist.txt  12 Aug 2003 14:33:10 -0000      1.20
+++ config/srclist.txt  12 Aug 2003 21:10:14 -0000
@@ -42,6 +42,25 @@ $GETTEXT/gettext-tools/lib/gettext.h                 l
 $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
Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/ChangeLog,v
retrieving revision 1.473
diff -p -u -r1.473 ChangeLog
--- m4/ChangeLog        11 Aug 2003 13:02:26 -0000      1.473
+++ m4/ChangeLog        12 Aug 2003 21:10:17 -0000
@@ -1,3 +1,9 @@
+2003-08-12  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vasnprintf.m4 (gl_PREREQ_VASNPRINTF): Also check for wcslen.
Index: m4/lib-ld.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/lib-ld.m4,v
retrieving revision 1.3
diff -p -u -r1.3 lib-ld.m4
--- m4/lib-ld.m4        31 Dec 2002 13:42:07 -0000      1.3
+++ m4/lib-ld.m4        12 Aug 2003 21:10:19 -0000
@@ -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 @@ AC_DEFUN([AC_LIB_PROG_LD],
 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.
Index: m4/lib-link.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/lib-link.m4,v
retrieving revision 1.4
diff -p -u -r1.4 lib-link.m4
--- m4/lib-link.m4      31 Dec 2002 13:42:07 -0000      1.4
+++ m4/lib-link.m4      12 Aug 2003 21:10:20 -0000
@@ -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 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 
 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 @@ AC_DEFUN([AC_LIB_RPATH],
   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 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     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],
 [
Index: m4/lib-prefix.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/lib-prefix.m4,v
retrieving revision 1.3
diff -p -u -r1.3 lib-prefix.m4
--- m4/lib-prefix.m4    31 Dec 2002 13:42:07 -0000      1.3
+++ m4/lib-prefix.m4    12 Aug 2003 21:10:20 -0000
@@ -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 the same distribution terms as the r
 
 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 @@ AC_DEFUN([AC_LIB_PREFIX],
     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],
 [