Don't DEFUN AM_INTL_SUBDIR twice.

diff --git a/ChangeLog b/ChangeLog
index 7bc0bbd76d6235fa08c1a96e6fb469b0f6fd43b2..00e5048504238e7ceec28bd708d922b2c49a2a38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
        * bootstrap (--gnulib-srcdir=*, --cvs-user=*):
        Fix typo by replacing $1 with $option.
        Remove more 'intl'-related files.
        * bootstrap (--gnulib-srcdir=*, --cvs-user=*):
        Fix typo by replacing $1 with $option.
        Remove more 'intl'-related files.

+       Don't DEFUN AM_INTL_SUBDIR twice.

 
        * lib/.cvsignore: Add strndup.h.  Remove memchr.c, memcmp.c,
        memrchr.c, strcasecmp.c, strchr.c, strrchr.c, strspn.c, strtol.c,
 
        * lib/.cvsignore: Add strndup.h.  Remove memchr.c, memcmp.c,
        memrchr.c, strcasecmp.c, strchr.c, strrchr.c, strspn.c, strtol.c,

diff --git a/bootstrap b/bootstrap
index 55a62992494ee5d3a3386492297bd2ee9b70df27..e995f486da20076d743a1b20a70d086f00e6afa7 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -206,8 +206,6 @@ sed '
 ' m4/gettext.m4 >m4/gettext.m4t &&
 mv m4/gettext.m4t m4/gettext.m4 || exit
 
 ' m4/gettext.m4 >m4/gettext.m4t &&
 mv m4/gettext.m4t m4/gettext.m4 || exit
 

-echo 'AC_DEFUN([AM_INTL_SUBDIR],[])' >>m4/gettext.m4 || exit
-

 # Patch what appears to be a bug in gettext 0.14.1;
 # remove this once the bug is fixed.
 grep @top_builddir@ po/Makefile.in.in >/dev/null || {
 # Patch what appears to be a bug in gettext 0.14.1;
 # remove this once the bug is fixed.
 grep @top_builddir@ po/Makefile.in.in >/dev/null || {