The gettext version checking is causing more trouble than it's curing;

remove it.

diff --git a/ChangeLog b/ChangeLog
index 87f9f88177e019e014be3cce150bf087617ee0a2..5f72dca9f333d6218cb44344b27bd33371f698bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       The gettext version checking is causing more trouble than it's
+       curing; remove it.  Problem reported by Paul Hilfinger.
+
+       * bootstrap: Issue a warning that one can expect a message
+       'AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION'.
+       * configure.ac (AM_GNU_GETTEXT_VERSION): Remove.
+

 2004-05-23  Paul Eggert  <eggert@cs.ucla.edu>
 
        Ensure that the C++ compiler used for testing actually works on a
 2004-05-23  Paul Eggert  <eggert@cs.ucla.edu>
 
        Ensure that the C++ compiler used for testing actually works on a

diff --git a/bootstrap b/bootstrap
index e995f486da20076d743a1b20a70d086f00e6afa7..d1f48516bfc414779bb4bdfdff9d99f34368b355 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -166,6 +166,7 @@ esac
 
 # Reconfigure, getting other files.
 
 
 # Reconfigure, getting other files.
 

+echo "$0: Expect an 'AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION' warning"

 echo "$0: autoreconf --verbose --install --force ..."
 autoreconf --verbose --install --force || exit
 
 echo "$0: autoreconf --verbose --install --force ..."
 autoreconf --verbose --install --force || exit
 

diff --git a/configure.ac b/configure.ac
index 866edfe6c2c9ee9e4ba40f3d9bd140d498826e77..f7b42501bd8c56b4c20d4b2c74ce1124b48aa686 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,6 @@ BISON_PREREQ_TIMEVAR
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET
 
 # gnulib and gettext.
 GNULIB_AUTOCONF_SNIPPET

-AM_GNU_GETTEXT_VERSION([0.14.1])

 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)