glib m4 patch for new aclocal

[Patrick Welche <prlw1 newn cam ac uk>]

As new aclocal will multiply process .m4 files, the macro names in AC_DEFUN
should be quoted (otherwise they get substituted with the definition on 
the second pass), so please apply the enclosed trivial patch.

BTW trying a build with todays cvs I get:
gcc -shared  .libs/garray.o .libs/gasyncqueue.o .libs/gbacktrace.o .libs/gcache.o .libs/gcompletion.o .libs/gconvert.o .libs/gdataset.o .libs/gdate.o .libs/gdir.o .libs/gerror.o .libs/gfileutils.o .libs/ghash.o .libs/ghook.o .libs/giochannel.o .libs/glist.o .libs/gmain.o .libs/gmarkup.o .libs/gmem.o .libs/gmessages.o .libs/gnode.o .libs/gpattern.o .libs/gprimes.o .libs/gqsort.o .libs/gqueue.o .libs/grel.o .libs/grand.o .libs/gscanner.o .libs/gshell.o .libs/gslist.o .libs/gstrfuncs.o .libs/gstring.o .libs/gthread.o .libs/gthreadpool.o .libs/gtimer.o .libs/gtree.o .libs/guniprop.o .libs/gutf8.o .libs/gunibreak.o .libs/gunicollate.o .libs/gunidecomp.o .libs/gutils.o .libs/gprintf.o .libs/giounix.o .libs/gspawn.o -Wl,--whole-archive libcharset/.libs/libcharset.a gnulib/.libs/libgnulib.a -Wl,--no-whole-archive  -L/usr/local/lib -lintl  -Wl,-soname -Wl,libglib-2.0.so.300 -o .libs/libglib-2.0.so.300.0
gcc: libcharset/.libs/libcharset.a: No such file or directory
gmake[3]: *** [libglib-2.0.la] Error 1

gcc version 2.95.3 20010315 (release) (NetBSD nb4)  NetBSD-1.6ZC/i386
autogen.sh --disable-gtk-doc

will try to work that out later..

Cheers,

Patrick
(I see you still have AC_CYGWIN and AC_EXEEXT in configure.in)

Index: m4macros/glib-2.0.m4
===================================================================
RCS file: /cvs/gnome/glib/m4macros/glib-2.0.m4,v
retrieving revision 1.11
diff -u -r1.11 glib-2.0.m4
--- m4macros/glib-2.0.m4	6 May 2002 16:07:03 -0000	1.11
+++ m4macros/glib-2.0.m4	7 Oct 2003 19:52:47 -0000
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 
 dnl gthread is specified in MODULES, pass to pkg-config
 dnl
-AC_DEFUN(AM_PATH_GLIB_2_0,
+AC_DEFUN([AM_PATH_GLIB_2_0],
 [dnl 
 dnl Get the cflags and libraries from pkg-config
 dnl
Index: m4macros/glib-gettext.m4
===================================================================
RCS file: /cvs/gnome/glib/m4macros/glib-gettext.m4,v
retrieving revision 1.24
diff -u -r1.24 glib-gettext.m4
--- m4macros/glib-gettext.m4	19 Aug 2003 13:45:33 -0000	1.24
+++ m4macros/glib-gettext.m4	7 Oct 2003 19:52:47 -0000
@@ -277,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
    
@@ -354,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"
@@ -375,6 +375,6 @@
 dnl Now the definitions that aclocal will find
 dnl
 ifdef(glib_configure_in,[],[
-AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl