diff options
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | configure.ac | 29 | ||||
| -rw-r--r-- | quilt.changes | 6 |
3 files changed, 35 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 6e641af..2831b29 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,6 +34,8 @@ DIFFSTAT := @DIFFSTAT@ RPMBUILD := @RPMBUILD@ SENDMAIL := @SENDMAIL@ +USE_NLS := @USE_NLS@ + CC := @CC@ CPPFLAGS += @CPPFLAGS@ @DEFS@ CFLAGS += @CFLAGS@ @@ -123,7 +125,11 @@ all : scripts compat $(DOC:%=doc/%) $(MAN1) mofiles $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o) $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) -mofiles : $(if $(MSGFMT),$(LINGUAS:%=po/%.mo)) +ifeq ($(USE_NLS),yes) +mofiles : $(LINGUAS:%=po/%.mo) +else +mofiles : +endif %.mo : %.po msgfmt --statistics -o $@ $< @@ -363,7 +369,7 @@ distclean : clean rm -f config.log config.status Makefile rm -rf autom4te.cache/ -ifneq ($(MSGFMT),) +ifeq ($(USE_NLS),1) install-main :: for lang in $(LINGUAS) ; do \ dir=$(BUILD_ROOT)$(localedir)/$$lang/LC_MESSAGES; \ diff --git a/configure.ac b/configure.ac index 1f51420..595b79b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.61 $) +AC_REVISION ($Revision: 1.62 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -248,21 +248,34 @@ fi QUILT_COMPAT_PROG_PATH(SENDMAIL, [sendmail], [], [/usr/sbin]) -AC_ARG_ENABLE(nls, AC_HELP_STRING( - [--enable-nls], [include natural language support])) -if test "$enableval" != "no"; then - AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(MSGMERGE, [msgmerge]) +AC_PATH_PROG(MSGFMT, [msgfmt]) +AC_PATH_PROG(XGETTEXT, [xgettext]) +AC_PATH_PROG(MSGUNIQ, [msguniq]) +AC_PATH_PROG(MSGCAT, [msgcat]) +if test -n "$MSGFMT" -a -n "$MSGMERGE" -a -n "$XGETTEXT" -a -n "$MSGUNIQ" -a -n "$MSGCAT" ; then + HAVE_NLS=yes +else + HAVE_NLS=no fi -if test "$enableval" = "yes" -a -z "$MSGFMT" ; then - AC_MSG_ERROR([ + +USE_NLS=no +AC_ARG_ENABLE(nls, AC_HELP_STRING( + [--disable-nls], [exclude natural language support]), + [USE_NLS=$enableval],[USE_NLS=$HAVE_NLS]) + +if test $USE_NLS = yes -a $HAVE_NLS = no ; then + AC_MSG_ERROR([ You do not appear to have msgfmt, which is part of the GNU Gettext package. It is a required package as you chose the '--enable-nls' option to configure. You can download GNU Gettext from ftp.gnu.org ]) fi -if test -z "$MSGFMT" ; then + +if test $USE_NLS = no ; then AC_MSG_NOTICE([Building without natural language support]) fi +AC_SUBST(USE_NLS) dnl Determine where package documentation is supposed to go if test -n "$RPM_DOC_DIR" ; then diff --git a/quilt.changes b/quilt.changes index bd9bfd2..2f8cd98 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Jan 21 21:29:22 CET 2006 - jayvdb@gmail.com + +- Default to use NLS when NLS binaries are available (minor + changes by agruen@suse.de). + +------------------------------------------------------------------- Sat Jan 21 21:03:30 CET 2006 - agruen@suse.de - Split off strip_diffstat from header command. |