[network-manager-openvpn/rm-userset: 3/4] gnome: GConf is no longer used

[Dan Williams <dcbw src gnome org>]

commit e1716f48a085e159545bb8544d7bb45bcec0cf5e
Author: Dan Williams <dcbw redhat com>
Date:   Fri Feb 11 00:22:56 2011 -0600

    gnome: GConf is no longer used

 configure.ac                 |    4 ----
 properties/Makefile.am       |    2 --
 properties/tests/Makefile.am |    2 --
 3 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4316c35..8d6c0f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,10 +82,6 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GDK_PIXBUF_CFLAGS)
 	AC_SUBST(GDK_PIXBUF_LIBS)
 
-	PKG_CHECK_MODULES(GCONF, gconf-2.0)
-	AC_SUBST(GCONF_CFLAGS)
-	AC_SUBST(GCONF_LIBS)
-
 	PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
 	AC_SUBST(GNOMEKEYRING_CFLAGS)
 	AC_SUBST(GNOMEKEYRING_LIBS)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index bbd80a7..4099b8c 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -16,7 +16,6 @@ ui_DATA = nm-openvpn-dialog.ui
 
 libnm_openvpn_properties_la_CFLAGS =                    \
         $(GTK_CFLAGS)                                   \
-        $(GCONF_CFLAGS)                                 \
         $(NETWORK_MANAGER_CFLAGS)                       \
         $(GNOMEKEYRING_CFLAGS)                          \
         $(DISABLE_DEPRECATED)                           \
@@ -31,7 +30,6 @@ libnm_openvpn_properties_la_CFLAGS =                    \
 
 libnm_openvpn_properties_la_LIBADD =    \
         $(GTK_LIBS)                     \
-        $(GCONF_LIBS)                   \
         $(NETWORK_MANAGER_LIBS)         \
         $(top_builddir)/common-gnome/libnm-openvpn-common-gnome.la \
         $(top_builddir)/common/libnm-openvpn-common.la
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 6d2314b..15ad86c 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -10,7 +10,6 @@ test_import_export_SOURCES = \
 test_import_export_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(GCONF_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
 	$(NETWORK_MANAGER_CFLAGS) \
 	$(DBUS_CFLAGS)
@@ -18,7 +17,6 @@ test_import_export_CPPFLAGS = \
 test_import_export_LDADD = \
 	$(GTHREAD_LIBS) \
 	$(GTK_LIBS) \
-	$(GCONF_LIBS) \
 	$(GNOMEKEYRING_LIBS) \
 	$(DBUS_LIBS) \
 	$(NETWORK_MANAGER_LIBS) \