gnulib-tool --update; includes fix for maint.mk/gzip discovered by Steven M. Schweda.

diff --git a/ChangeLog b/ChangeLog
index 5b3d9bb7e445a1e129e1023f7148eeb95a053dc8..61cefef870de693c639fbadec1146b815398a229 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2007-10-22  Micah Cowan  <micah@cowan.name>
 
        * po/*.po: Refresh from TP and update-po.
+       * lib/Makefile.am, m4/gnulib-cache.m4, m4/longlong.m4,
+       m4/ulonglong.m4, maint.mk:  gnulib-tool --update. Includes fix
+       for maint.mk with old versions of gzip.
 
 2007-10-18  Micah Cowan  <micah@cowan.name>
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 91eb71da809454739dda2ea83d25f97068dde1b1..65de72faa991e3e383b1edf55a31e2b2cbb9b452 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=gl c-ctype crypto/md5 getopt maintainer-makefile md5
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=gl c-ctype crypto/md5 getopt maintainer-makefile
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 2f9d837974da0f5758696bc2ae15e16fba336058..ff0319bc0ccecefdc548f38dd28b23ac278c3a52 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=gl c-ctype crypto/md5 getopt maintainer-makefile md5
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=gl c-ctype crypto/md5 getopt maintainer-makefile
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])

diff --git a/m4/longlong.m4 b/m4/longlong.m4
index 1f9e862ef118356817bef76ebe41466c0699000e..5799c3965aaba7f00167ba025f5f0b74643235df 100644 (file)
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,5 +1,5 @@
-# longlong.m4 serial 10
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+# longlong.m4 serial 11
+dnl Copyright (C) 1999-2007 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.
@@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Paul Eggert.
 
 # Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
 
 # Note: If the type 'long long int' exists but is only 32 bits large
 # (as on some very old compilers), HAVE_LONG_LONG_INT will not be
@@ -19,7 +19,10 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
   AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
-         [[long long int ll = 9223372036854775807ll;
+         [[#if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+             error in preprocessor;
+           #endif
+           long long int ll = 9223372036854775807ll;
            long long int nll = -9223372036854775807LL;
            typedef int a[((-9223372036854775807LL < 0
                            && 0 < 9223372036854775807ll)

diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index 9fae98e3a6c839221c28ee7e206e225828ec8b64..34f06e4c9564a9f68abd11643696e5603d87816e 100644 (file)
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,5 +1,5 @@
-# ulonglong.m4 serial 6
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+# ulonglong.m4 serial 8
+dnl Copyright (C) 1999-2007 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.
@@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Paul Eggert.
 
 # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
 
 # Note: If the type 'unsigned long long int' exists but is only 32 bits
 # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
@@ -21,7 +21,10 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
     [ac_cv_type_unsigned_long_long_int],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
-         [[unsigned long long int ull = 18446744073709551615ULL;
+         [[#if ! (18446744073709551615ULL <= -1ull)
+             error in preprocessor;
+           #endif
+           unsigned long long int ull = 18446744073709551615ULL;
            typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
                           ? 1 : -1)];
           int i = 63;]],

diff --git a/maint.mk b/maint.mk
index a7a5a28f870cb5372307b09c0bf883df154f57aa..662b37174f2fa2e79932c621beeec830e17ae3d3 100644 (file)
--- a/maint.mk
+++ b/maint.mk
@@ -30,7 +30,7 @@ C_SOURCES += $(C_SOURCES_ADD)
 # Do not save the original name or timestamp in the .tar.gz file.
 # Use --rsyncable if available.
 gzip_rsyncable := \
-  $(shell gzip --help|grep rsyncable >/dev/null && echo --rsyncable)
+  $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --rsyncable)
 GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
 
 # Prevent programs like 'sort' from considering distinct strings to be equal.