Improve gettext.m4 in various cases.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a521aa47abf074e4283f1b73a72fabbdf7793846..29da100658169718c61f60da28b12f25980d2d2f 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-27  H. J. Lu  <hjl@lucon.org>
+            Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext.m4 (AM_WITH_NLS): Fix $CONFIG_FILES matching so it deals
+       correctly with tabs. Define INSTOBJEXT and GENCAT for older Makefiles.
+
 2001-04-19  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext-0.10.37 released.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 37fc43c83d355ad4b6d3f7d0d1cf5179e2022214..658785bf31209b592781d7eca0e2f0513e4ef1fb 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -159,10 +159,12 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
       POSUB=po
     fi
     AC_OUTPUT_COMMANDS(
-     [case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-        ;;
-      esac])
+     [for f in $CONFIG_FILES; do
+        case $f in po/Makefile.in | po/Makefile.in:*)
+          sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+          ;;
+        esac
+      done])
 
 
     dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
@@ -228,6 +230,14 @@ changequote([,])dnl
     dnl For backward compatibility. Some Makefiles may be using this.
     DATADIRNAME=share
     AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
   ])
 
 dnl Usage: Just like AM_WITH_NLS, which see.