Do not use USE_NLS, glib overwrites that

This commit is contained in:
Yevgen Muntyan 2010-10-01 01:00:22 -07:00
parent 3e8a1727cd
commit b9c2715be9
3 changed files with 11 additions and 6 deletions

View File

@ -16,8 +16,13 @@ AC_DEFUN([_MOO_INTLTOOL_NO_NLS],[
AC_DEFUN([MOO_INTL],[
AM_GLIB_GNU_GETTEXT
AC_REQUIRE([AM_NLS])
if test "$USE_NLS" = "yes"; then
AC_ARG_ENABLE([nls],AC_HELP_STRING([--disable-nls],[do not use Native Language Support]),[
ENABLE_NLS=$enableval
],[
ENABLE_NLS=yes
])
AC_SUBST([ENABLE_NLS])
if test "$ENABLE_NLS" = "yes"; then
_MOO_INTLTOOL
else
_MOO_INTLTOOL_NO_NLS

View File

@ -15,13 +15,13 @@ SUFFIXES: .po .gmo .mo
$(AM_V_GEN)file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
all: all-catalogs-@USE_NLS@
all: all-catalogs-$(ENABLE_NLS)
all-catalogs-yes: $(CATALOGS)
all-catalogs-no:
$(CATALOGS): $(srcdir)/Makefile.am
install: install-catalogs
install-catalogs: install-catalogs-@USE_NLS@
install-catalogs: install-catalogs-$(ENABLE_NLS)
install-catalogs-no: all
install-catalogs-yes: all
linguas="$(LINGUAS)"; \

View File

@ -15,13 +15,13 @@ SUFFIXES: .po .gmo .mo
$(AM_V_GEN)file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
all: all-catalogs-@USE_NLS@
all: all-catalogs-$(ENABLE_NLS)
all-catalogs-yes: $(CATALOGS)
all-catalogs-no:
$(CATALOGS): $(srcdir)/Makefile.am
install: install-catalogs
install-catalogs: install-catalogs-@USE_NLS@
install-catalogs: install-catalogs-$(ENABLE_NLS)
install-catalogs-no: all
install-catalogs-yes: all
linguas="$(LINGUAS)"; \