[Bug-gnulib] GNU tar bootstrap fix to work around gnulib/gettext/autopoint confusion

[Paul Eggert]

I installed this into GNU tar.  The problem is that after tar's
bootstrap script sets up tar's source files by copying many of them
from gnulib, the autopoint command then overwrites some of the gnulib
.m4 files (from gettext I think).  This is a bit of a pain to
maintain.  Does anybody have an idea for fixing this more
systematically?

2004-08-12  Paul Eggert  <address@hidden>

        Set LC_ALL=C so that file names sort consistently.
        Prefer the gnulib copies of gettext.m4, glibc21.m4,
        lib-ld.m4, lib-prefix.m4, po.m4 too.

Index: bootstrap
===================================================================
RCS file: /cvsroot/tar/tar/bootstrap,v
retrieving revision 1.19
retrieving revision 1.20
diff -p -u -r1.19 -r1.20
--- bootstrap   12 Aug 2004 18:32:54 -0000      1.19
+++ bootstrap   12 Aug 2004 20:24:13 -0000      1.20
@@ -24,6 +24,11 @@
 # URL of our text domain page in Translation Project
 TP_URL="http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/";
 
+# Ensure file names are sorted consistently across platforms;
+# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
+LC_ALL=C
+export LC_ALL
+
 usage() {
  cat <<EOF
  usage: $0 
[--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po]
@@ -225,10 +230,10 @@ for gnulib_file in $gnulib_files; do
   m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
   # These will be overwritten by autopoint, which still uses
   # old jm_.* macro names, so we have to keep both copies.
-  m4/ulonglong.m4) dest=m4/ulonglong_gl.m4;;
-  m4/inttypes_h.m4) dest=m4/inttypes_h_gl.m4;;
-  m4/stdint_h.m4) dest=m4/stdint_h_gl.m4;;
-  m4/uintmax_t.m4) dest=m4/uintmax_t_gl.m4;;
+  m4/gettext.m4 | m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \
+  m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \
+  m4/ulonglong.m4)
+    dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;;
   esac
 
   rm -f $dest &&