[gst-cvs] leroutier common: common/m4/

[<ler...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         common
Changes by:     leroutier
Date:           Fri Sep 17 2004  14:30:27 PDT

Log message:
update with a newer upstream version of this m4 file

Modified files:
    m4              : glib-gettext.m4

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/common/m4/glib-gettext.m4.diff?r1=1.3&r2=1.4

====Begin Diffs====
Index: glib-gettext.m4
===================================================================
RCS file: /cvs/gstreamer/common/m4/glib-gettext.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- glib-gettext.m4	11 Feb 2004 16:25:44 -0000	1.3
+++ glib-gettext.m4	17 Sep 2004 21:30:15 -0000	1.4
@@ -184,6 +184,8 @@
 	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 @@
             DATADIRNAME=lib
 	    ;;
 	    esac])
+          LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
 	else
 	  gt_cv_have_gettext=no
@@ -274,7 +277,7 @@
 # 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 @@
 # -------------------------------
 # 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"