[gvfs] Remove last traces of GConf

[Tomas Bzatek <tbzatek src gnome org>]

commit e22dbb2aeadd3d45a93e702046bc9dc247368f4b
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Fri Nov 12 18:34:07 2010 +0100

    Remove last traces of GConf

 configure.ac       |   20 --------------------
 daemon/Makefile.am |   21 ++++++---------------
 2 files changed, 6 insertions(+), 35 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4688864..629b43a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,25 +196,6 @@ fi
 
 AM_CONDITIONAL(USE_FUSE, [test "$msg_fuse" = "yes"])
 
-dnl **********************
-dnl *** Check for GConf ***
-dnl **********************
-AC_ARG_ENABLE(gconf, AS_HELP_STRING([--disable-gconf],[build without GConf support]))
-msg_gconf=no
-GCONF_LIBS=
-GCONF_CFLAGS=
-
-if test "x$enable_gconf" != "xno"; then
-  PKG_CHECK_EXISTS(gconf-2.0, msg_gconf=yes)
-
-  if test "x$msg_gconf" = "xyes"; then
-    PKG_CHECK_MODULES(GCONF, gconf-2.0)
-    AC_DEFINE(HAVE_GCONF, 1, [Define to 1 if GConf is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"])
-
 dnl ********************************************
 dnl *** Check for expat (for obexftp and gdu ***
 dnl ********************************************
@@ -726,7 +707,6 @@ echo "
         Gphoto2 support:              $msg_gphoto2
 	archive support:              $msg_archive
 	AFC support:                  $msg_afc
-        GConf support:                $msg_gconf
         DNS-SD support:               $msg_avahi
 	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
 	Build GDU volume monitor:     $msg_gdu
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 024ec4e..21aeb83 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -40,10 +40,10 @@ service_DATA = gvfs-daemon.service
 %.mount: %.mount.in ../config.log
 	$(AM_V_GEN) $(SED) -e "s|\ libexecdir\@|$(libexecdir)|" $< > $@
 
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp
+libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network
 
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in
-mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount
+mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
+mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
 
 mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in 
 if HAVE_HTTP
@@ -74,12 +74,6 @@ mount_DATA += gphoto2.mount
 libexec_PROGRAMS += gvfsd-gphoto2
 endif
 
-mount_in_files += network.mount.in
-if USE_GCONF
-mount_DATA += network.mount
-libexec_PROGRAMS += gvfsd-network
-endif
-
 mount_in_files += obexftp.mount.in
 if USE_OBEXFTP
 mount_DATA += obexftp.mount
@@ -219,10 +213,9 @@ gvfsd_smb_CPPFLAGS = \
 	-DBACKEND_HEADER=gvfsbackendsmb.h \
 	-DDEFAULT_BACKEND_TYPE=smb-share \
 	-DMAX_JOB_THREADS=1 \
-	$(GCONF_CFLAGS) \
 	-DBACKEND_TYPES='"smb-share", G_VFS_TYPE_BACKEND_SMB,'
 
-gvfsd_smb_LDADD = $(SAMBA_LIBS) $(GCONF_LIBS) $(libraries)
+gvfsd_smb_LDADD = $(SAMBA_LIBS) $(libraries)
 
 gvfsd_smb_browse_SOURCES = \
 	gvfsbackendsmbbrowse.c gvfsbackendsmbbrowse.h \
@@ -233,10 +226,9 @@ gvfsd_smb_browse_CPPFLAGS = \
 	-DBACKEND_HEADER=gvfsbackendsmbbrowse.h \
 	-DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.smb_browse \
 	-DMAX_JOB_THREADS=1 \
-	$(GCONF_CFLAGS) \
 	-DBACKEND_TYPES='"smb-network", G_VFS_TYPE_BACKEND_SMB_BROWSE,"smb-server", G_VFS_TYPE_BACKEND_SMB_BROWSE,'
 
-gvfsd_smb_browse_LDADD = $(SAMBA_LIBS)  $(GCONF_LIBS) $(libraries)
+gvfsd_smb_browse_LDADD = $(SAMBA_LIBS) $(libraries)
 
 gvfsd_obexftp_SOURCES = \
 	gvfsbackendobexftp.c gvfsbackendobexftp.h \
@@ -330,10 +322,9 @@ gvfsd_network_CPPFLAGS = \
 	-DBACKEND_HEADER=gvfsbackendnetwork.h \
 	-DDEFAULT_BACKEND_TYPE=network \
 	-DMAX_JOB_THREADS=1 \
-	$(GCONF_CFLAGS) \
 	-DBACKEND_TYPES='"network", G_VFS_TYPE_BACKEND_NETWORK,'
 
-gvfsd_network_LDADD = $(libraries) $(GCONF_LIBS)
+gvfsd_network_LDADD = $(libraries)
 
 gvfsd_dnssd_SOURCES = \
 	gvfsbackenddnssd.c gvfsbackenddnssd.h \