diff options
| author | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-09-17 21:30:15 +0000 |
|---|---|---|
| committer | Stéphane Loeuillet <gstreamer@leroutier.net> | 2004-09-17 21:30:15 +0000 |
| commit | ded6dc5186cb7f8c64cb06a8591b9f787122c6f1 (patch) | |
| tree | aa4b34567ae7612914f939b761dc30e2e82e8dde | |
| parent | 5ec931d243c53ddda5b2cbb9a2c21ce89747bcb4 (diff) | |
update with a newer upstream version of this m4 fileRELEASE-0_7_94RELEASE-0_7_93
Original commit message from CVS:
update with a newer upstream version of this m4 file
| -rw-r--r-- | m4/glib-gettext.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/m4/glib-gettext.m4 b/m4/glib-gettext.m4 index 33d6473..5a4ef28 100644 --- a/m4/glib-gettext.m4 +++ b/m4/glib-gettext.m4 @@ -184,6 +184,8 @@ glib_DEFUN([GLIB_WITH_NLS], GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" AC_CHECK_FUNCS(dcgettext) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, @@ -210,6 +212,7 @@ glib_DEFUN([GLIB_WITH_NLS], DATADIRNAME=lib ;; esac]) + LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else gt_cv_have_gettext=no @@ -274,7 +277,7 @@ glib_DEFUN([GLIB_WITH_NLS], # on various variables needed by the Makefile.in.in installed by # glib-gettextize. dnl -glib_DEFUN(GLIB_GNU_GETTEXT, +glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_HEADER_STDC])dnl @@ -351,7 +354,7 @@ glib_DEFUN(GLIB_GNU_GETTEXT, # ------------------------------- # Define VARIABLE to the location where catalog files will # be installed by po/Makefile. -glib_DEFUN(GLIB_DEFINE_LOCALEDIR, +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl glib_save_prefix="$prefix" glib_save_exec_prefix="$exec_prefix" |