[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: gettext-0.10.37 is not compatible with gettext-0.10.35
From: |
H . J . Lu |
Subject: |
Re: gettext-0.10.37 is not compatible with gettext-0.10.35 |
Date: |
Thu, 26 Apr 2001 10:32:16 -0700 |
User-agent: |
Mutt/1.2.5i |
On Thu, Apr 26, 2001 at 10:37:10AM +0200, Bruno Haible wrote:
> H. J. Lu writes:
>
> > It works better now. But it is still broken. You removed GENCAT from
> > gettext.m4. Now texinfo-4.0/po/Makefile.in has
> >
> > GENCAT =
> >
> > instead of
> >
> > GENCAT = @GENCAT@
> >
> > atfter
> >
> > # aclocal
> > # autoconf
> > # automake
> >
> > Could you please provide a patch to put back ALL the stuff you removed
> > from gettext.m4 in gettext-0.10.37?
>
> Please try this one.
>
I found the problem with texinfo. This patch
2001-04-12 Bruno Haible <address@hidden>
* gettext.m4 (AM_WITH_NLS): Fix syntax error in 'case'. Change
whitespace in $CONFIG_FILES to spaces for matching with 'case'.
Reported by Thorsten Kukuk <address@hidden>.
is is wrong. It may not handle
AC_OUTPUT([Makefile \
doc/Makefile \
info/Makefile \
intl/Makefile \
lib/Makefile \
makeinfo/Makefile \
makeinfo/tests/Makefile \
po/Makefile.in \
util/Makefile \
])
in texinfo 4.0. There may be tabs in CONFIG_FILES. This patch seems
to workf or texinfo 4.0.
H.J.
---
--- gettext-0.10.37/m4/gettext.m4.compat Thu Apr 12 19:34:32 2001
+++ gettext-0.10.37/m4/gettext.m4 Thu Apr 26 10:28:45 2001
@@ -159,10 +159,13 @@ return (int) gettext ("")]ifelse([$2], n
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)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ break
+ ;;
+ esac
+ done])
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
@@ -228,6 +231,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.
- gettext-0.10.37 is not compatible with gettext-0.10.35, H . J . Lu, 2001/04/21
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, Bruno Haible, 2001/04/24
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, H . J . Lu, 2001/04/24
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, Bruno Haible, 2001/04/25
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, H . J . Lu, 2001/04/25
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, Bruno Haible, 2001/04/25
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, H . J . Lu, 2001/04/25
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, Bruno Haible, 2001/04/26
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, H . J . Lu, 2001/04/26
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35,
H . J . Lu <=
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, Andreas Schwab, 2001/04/27
- Re: gettext-0.10.37 is not compatible with gettext-0.10.35, Bruno Haible, 2001/04/27