diff --git a/configure.ac b/configure.ac index 99b69d6c..645e5467 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,16 @@ AC_CANONICAL_HOST AC_CONFIG_HEADERS(config.h) MOO_DEFINE_VERSIONS -MOO_AC_I18N([ru]) + +AC_PROG_INTLTOOL([0.29]) +GETTEXT_PACKAGE=moo +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.]) +ALL_LINGUAS="ru" +AM_GLIB_GNU_GETTEXT +MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +AC_SUBST(MOO_INTLTOOL_INI_RULE) + # Check operating system MOO_AC_CHECK_OS diff --git a/m4/moo-i18n.m4 b/m4/moo-i18n.m4 deleted file mode 100644 index 563403d6..00000000 --- a/m4/moo-i18n.m4 +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################## -# MOO_AC_I18N -# -AC_DEFUN([MOO_AC_I18N],[ - AC_PROG_INTLTOOL([0.29]) - - GETTEXT_PACKAGE=moo - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.]) - - ALL_LINGUAS="$1" - AM_GLIB_GNU_GETTEXT - - MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - AC_SUBST(MOO_INTLTOOL_INI_RULE) -])