From 3d09d579c1bf128cabe79d18a97c879163ceb85a Mon Sep 17 00:00:00 2001
From: uid65632 <uid65632>
Date: Sat, 27 Dec 2003 06:41:48 +0000
Subject: [PATCH] Synchronize with Gettext 0.13.1, Automake 1.8, Autoconf 2.59,
 and translation website.

---
 ChangeLog     | 26 ++++++++++++++++++++++++++
 bootstrap     | 12 ++----------
 m4/.cvsignore |  8 ++++++++
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b103a2a..48bf6a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2003-12-26  Paul Eggert  <eggert@twinsun.com>
+
+	Synchronize with Gettext 0.13.1, Automake 1.8, Autoconf 2.59,
+	and translation website.
+	
+	* bootstrap: Don't bother skipping codeset.m4, glibc21.m4,
+	intdiv0.m4, inttypes_h.m4, inttypes.m4, inttypes-pri.m4,
+	isc-posix.m4, and lcmessage.m4 from gnulib.  This list of files is
+	a bit obsolete anyway, now that gettext 0.13.1 is out.  Also, the
+	files are replaced by autoreconf.  Also, there seems to be a bug
+	in gettext/autoconf/automake if we try to omit these files after
+	autoreconf has replaced them, even though the gettext manual says
+	they're optional.  So give up and just include them for now, even
+	though they make 'configure' longer and slower.
+
+	Change translation URL from
+	<http://www.iro.umontreal.ca/contrib/po/maint/tar/> to
+	<http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/> to
+	accommodate translator website revamp.
+
+	Fail if autoreconf fails.
+
+	* m4/.cvsignore: Add intmax.m4, longdouble.m4, printf-posix.m4,
+	signed.m4, size_max.m4, wchar_t.m4, wint_t.m4, xsize.m4, to
+	ignore files now supplied by gettext 0.13.1.
+
 2003-12-25  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	Synchronized with the backup repository on Mirddin
diff --git a/bootstrap b/bootstrap
index 3245670..dadb030 100755
--- a/bootstrap
+++ b/bootstrap
@@ -145,14 +145,6 @@ for gnulib_file in $gnulib_files; do
   dest=$gnulib_file
 
   case $gnulib_file in
-  m4/codeset.m4) continue;;
-  m4/glibc21.m4) continue;;
-  m4/intdiv0.m4) continue;;
-  m4/inttypes_h.m4) continue;;
-  m4/inttypes.m4) continue;;
-  m4/inttypes-pri.m4) continue;;
-  m4/isc-posix.m4) continue;;
-  m4/lcmessage.m4) continue;;
   m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
   esac
 
@@ -168,7 +160,7 @@ echo "$0: getting translations into po..."
 (cd po &&
  rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
  wget -nv -nd -r -l 1 -A .po -C off \
-   http://www.iro.umontreal.ca/contrib/po/maint/tar/ &&
+   http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/ &&
  ls *.po | sed 's/\.po$//' >LINGUAS
 ) || exit
 
@@ -176,7 +168,7 @@ echo "$0: getting translations into po..."
 # Reconfigure, getting other files.
 
 echo "$0: autoreconf --verbose --install --force ..."
-autoreconf --verbose --install --force
+autoreconf --verbose --install --force || exit
 
 
 echo "$0: done.  Now you can run './configure'."
diff --git a/m4/.cvsignore b/m4/.cvsignore
index f6c2ac4..322d927 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -26,6 +26,7 @@ hash.m4
 human.m4
 iconv.m4
 intdiv0.m4
+intmax.m4
 intmax_t.m4
 inttypes-pri.m4
 inttypes.m4
@@ -36,6 +37,7 @@ lcmessage.m4
 lib-ld.m4
 lib-link.m4
 lib-prefix.m4
+longdouble.m4
 longlong.m4
 malloc.m4
 mbrtowc.m4
@@ -48,6 +50,7 @@ obstack.m4
 onceonly.m4
 pathmax.m4
 po.m4
+printf-posix.m4
 progtest.m4
 quote.m4
 quotearg.m4
@@ -58,6 +61,8 @@ safe-read.m4
 safe-write.m4
 save-cwd.m4
 savedir.m4
+signed.m4
+size_max.m4
 ssize_t.m4
 stdbool.m4
 stdint_h.m4
@@ -78,7 +83,10 @@ utimbuf.m4
 utime.m4
 utimes-null.m4
 utimes.m4
+wchar_t.m4
+wint_t.m4
 xalloc.m4
 xgetcwd.m4
+xsize.m4
 xstrtol.m4
 xstrtoumax.m4
-- 
2.45.2