[patch] eliminate duplicate macros



I'm not sure exactly why we need a gconf.m4 in a world where
we're using pkgconfig. But the latest change to gconf HEAD
results in a gconf.m4 that has duplicate macros in it.

Here's a patch that fixes that:

Index: gconf.m4.in
===================================================================
RCS file: /cvs/gnome/gconf/gconf.m4.in,v
retrieving revision 1.3
diff -p -u -r1.3 gconf.m4.in
--- gconf.m4.in	2001/08/07 20:56:49	1.3
+++ gconf.m4.in	2001/08/08 18:14:11
@@ -15,21 +15,3 @@ AC_ARG_WITH(gconf-source, 
   AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
   AC_MSG_RESULT("Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation")
 ])
-
-dnl AM_PATH_GCONF
-dnl Define GCONF_SCHEMA_CONFIG_SOURCE
-dnl
-AC_DEFUN(AM_GCONF_SOURCE,
-[
-if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-  GCONF_SCHEMA_CONFIG_SOURCE=`gconftool --get-default-source`
-else
-  GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-fi
-
-AC_ARG_WITH(gconf-source, 
-[  --with-gconf-source=sourceaddress      Where to install schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT("Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation")
-])
===================================================================

It seems that the old gconf.m4 had this same problem, but since it
was never installed, the problem didn't cause any real trouble.

Perhaps the gconf.m4.in change was intended for the stable branch?

    -- Darin




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]