Commits

Yevgen Muntyan committed a2d8404

Do not use USE_NLS, glib overwrites that

  • Participants
  • Parent commits 4779e8d
  • Tags 0.99.1

Comments (0)

Files changed (3)

File m4/moo-intltool.m4

 
 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

File po-gsv/Makefile.am

 	$(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)"; \

File po/Makefile.am

 	$(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)"; \