[monkey-bubble: 437/753] Reverted this: 2001-06-11 Cody Russell <bratsche gnome org>



commit 3ce6fbe793f6d9f6be3df63571b3f1c1483fb5b8
Author: Cody Russell <bratsche gnome org>
Date:   Tue Jun 12 13:39:11 2001 +0000

    Reverted this:
    2001-06-11  Cody Russell  <bratsche gnome org>
    
    	* configure.in: Add check for GCONF, then AC_SUBST GCONF_LIBS
    	and GCONF_CFLAGS.

 ChangeLog              |    5 -----
 configure.in           |    4 ----
 libgnomeui/Makefile.am |    2 --
 3 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6656664..7268103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-2001-06-11  Cody Russell  <bratsche gnome org>
-
-	* configure.in: Add check for GCONF, then AC_SUBST GCONF_LIBS
-	and GCONF_CFLAGS.
-
 2001-06-07  Pablo Saratxaga  <pablo mandrakesoft com>
 
 	* configure.in: Added "az" and "wa" to the languages list.
diff --git a/configure.in b/configure.in
index f865da5..447c2c9 100644
--- a/configure.in
+++ b/configure.in
@@ -65,10 +65,6 @@ GNOME_PKGCONFIG_CHECK_MODULES(LIBBONOBOUI, libbonoboui-2.0:1.96.0)
 AC_SUBST(LIBBONOBOUI_CFLAGS)
 AC_SUBST(LIBBONOBOUI_LIBS)
 
-GNOME_PKGCONFIG_CHECK_MODULES(GCONF, gconf-2.0:1.1)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
 AC_CHECK_LIB(popt, poptStrippedArgv,, AC_MSG_ERROR([popt 1.5 or newer is required to build
 gnome-libs. You can download the latest version from ftp://people.redhat.com/sopwith/popt/]))
 
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index 1381830..a28f79b 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -32,7 +32,6 @@ INCLUDES = \
 	$(LIBGNOME_CFLAGS)				\
 	$(LIBGNOMECANVAS_CFLAGS)			\
 	$(LIBBONOBOUI_CFLAGS)				\
-	$(GCONF_CFLAGS)					\
 	-DGTK_VERSION=\""$(GTK_VERSION)"\"		\
 	-DVERSION=\"$(VERSION)\"
 
@@ -223,7 +222,6 @@ libgnomeui_2_la_LDFLAGS = \
 libgnomeui_2_la_LIBADD = \
 	$(LIBGNOME_LIBS)			\
 	$(LIBGNOMECANVAS_LIBS)			\
-	$(GCONF_LIBS)				\
 	$(LIBBONOBOUI_LIBS)
 
 LDADD = \



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