patch for gconf.m4

[jacob berkman <jacob ximian com>]

this patch calls gconftool-2 from the .m4, and fixes a quoting typo.

the second patch removes the gconftool symlink from being installed like
we discussed last week.

jacob
-- 
"In fact, can you imagine anything more terrifying than a zombie clown?"
	-- moby

Index: gconf.m4.in
===================================================================
RCS file: /cvs/gnome/gconf/gconf.m4.in,v
retrieving revision 1.11
diff -u -r1.11 gconf.m4.in
--- gconf.m4.in	2002/01/03 20:17:28	1.11
+++ gconf.m4.in	2002/02/05 19:37:19
@@ -8,7 +8,7 @@
 AC_DEFUN(AM_GCONF_SOURCE_2,
 [
   if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool --get-default-source`
+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   else
     GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
   fi
@@ -17,7 +17,7 @@
   [  --with-gconf-source=sourceaddress      Config database for installing 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")
+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
 
   if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
     GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas/'
@@ -29,5 +29,5 @@
   [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
 
   AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT("Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files")
+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
 ])

Index: gconf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v
retrieving revision 1.73
diff -u -r1.73 Makefile.am
--- gconf/Makefile.am	2002/02/04 23:23:08	1.73
+++ gconf/Makefile.am	2002/02/05 19:39:06
@@ -108,9 +108,6 @@
 
 EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
 
-install-exec-local:
-	(cd $(DESTDIR)$(bindir) && $(RM) gconftool && $(LN_S) -f gconftool-$(MAJOR_VERSION) gconftool)
-
 install-data-local:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
 	$(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path