diff options
| -rw-r--r-- | Makefile.in | 15 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 30 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index c0c5e43..9829de8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,13 @@ BASH := @BASH@ DIFF := @DIFF@ PATCH := @PATCH@ MKTEMP := @MKTEMP@ +MSGFMT := @MSGFMT@ + +ifeq "$(MSGFMT)" "" +MAKE_NLS := @true +else +MAKE_NLS := $(MAKE) +endif CFLAGS := @CFLAGS@ -Wall @@ -79,6 +86,7 @@ SRC += $(PO:%=po/%) #----------------------------------------------------------------------- all : scripts + $(MAKE_NLS) -C po all BUILD_ROOT=$(BUILD_ROOT) scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) $(SCRIPTS:%=scripts/%) \ $(LIB:%=lib/%) $(DOC:%=doc/%) $(MAN1) @@ -162,8 +170,8 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \ @chmod --reference=$< $@ Makefile : Makefile.in - echo "Please run ./configure by hand" - false + @echo "Please run ./configure by hand" + @false install : scripts @INSTALL@ -d $(BUILD_ROOT)$(bindir) @@ -187,10 +195,9 @@ install : scripts @INSTALL@ -d $(BUILD_ROOT)$(mandir)/man1 @INSTALL@ -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ - $(MAKE) -C po install BUILD_ROOT=$(BUILD_ROOT) \ + $(MAKE_NLS) -C po install BUILD_ROOT=$(BUILD_ROOT) \ LINGUAS="$(LINGUAS)" localedir=$(localedir) - clean : rm -f $(DIRT) diff --git a/configure.ac b/configure.ac index 25119ad..c1af9ec 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.22],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.6 $) +AC_REVISION ($Revision: 1.7 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -132,6 +132,24 @@ else AC_MSG_RESULT(yes) fi +# Check for NLS +AC_ARG_ENABLE(nls, AC_HELP_STRING( + [--enable-nls], [include natural language support])) +if test "$enableval" != "no"; then + AC_PATH_PROG(MSGFMT, msgfmt) +fi +if test "$enableval" = "yes" -a -z "$MSGFMT" ; 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. +]) + exit 1 +fi +if test -z "$MSGFMT" ; then + AC_MSG_NOTICE([Building without natural language support]) +fi + AC_CONFIG_FILES(Makefile) AC_OUTPUT |