[monkey-bubble: 434/753] Add check for GConf to configure.in, and add GCONF_CFLAGS and GCONF_LIBS.

[Sven Herzberg <herzi src gnome org>]

commit 2b7de8636844d4d5fd9778dcfef6844b0dbae145
Author: Cody Russell <bratsche src gnome org>
Date:   Mon Jun 11 18:09:14 2001 +0000

    Add check for GConf to configure.in, and add GCONF_CFLAGS and GCONF_LIBS.

 ChangeLog               |    5 +++++
 configure.in            |    4 ++++
 demos/ChangeLog         |    4 ++++
 demos/Makefile.am       |    1 +
 libgnomeui/ChangeLog    |    6 ++++++
 libgnomeui/Makefile.am  |    2 ++
 libgnomeui/wap-textfu.c |    2 +-
 7 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7268103..6656664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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 447c2c9..f865da5 100644
--- a/configure.in
+++ b/configure.in
@@ -65,6 +65,10 @@ 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/demos/ChangeLog b/demos/ChangeLog
index 97d7b21..f63b388 100644
--- a/demos/ChangeLog
+++ b/demos/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-11  Cody Russell  <bratsche gnome org>
+
+	* Makefile.am: Add GCONF_CFLAGS.
+
 2001-05-19  Martin Baulig  <baulig suse de>
 
 	* Makefile.am: Comment out animator_demo.
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 556e017..9393463 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir)/libgnomeui			\
 	$(WARN_CFLAGS)					\
 	$(LIBGNOMECANVAS_CFLAGS)			\
+	$(GCONF_CFLAGS)					\
         -DGNOMEUILIBDIR=\""$(libdir)"\" 		\
         -DGNOMEUIDATADIR=\""$(datadir)"\" 		\
         -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\"	\
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 78d0f6d..bcaeb3d 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11  Cody Russell  <bratsche gnome org>
+
+	* wap-textfu.c: Fix small warning so we can build with -Werror.
+
+	* Makefile.am: Add GCONF_CFLAGS and GCONF_LIBS.
+
 2001-06-10  Chema Celorio  <chema celorio com>
 
 	* gnome-selector-client.c (gnome_selector_client_construct_from_objref):
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index a28f79b..1381830 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -32,6 +32,7 @@ INCLUDES = \
 	$(LIBGNOME_CFLAGS)				\
 	$(LIBGNOMECANVAS_CFLAGS)			\
 	$(LIBBONOBOUI_CFLAGS)				\
+	$(GCONF_CFLAGS)					\
 	-DGTK_VERSION=\""$(GTK_VERSION)"\"		\
 	-DVERSION=\"$(VERSION)\"
 
@@ -222,6 +223,7 @@ libgnomeui_2_la_LDFLAGS = \
 libgnomeui_2_la_LIBADD = \
 	$(LIBGNOME_LIBS)			\
 	$(LIBGNOMECANVAS_LIBS)			\
+	$(GCONF_LIBS)				\
 	$(LIBBONOBOUI_LIBS)
 
 LDADD = \
diff --git a/libgnomeui/wap-textfu.c b/libgnomeui/wap-textfu.c
index 936144e..b733e54 100644
--- a/libgnomeui/wap-textfu.c
+++ b/libgnomeui/wap-textfu.c
@@ -3385,7 +3385,7 @@ static char *
 wap_textfu_get_var(WapTextFu *textfu, const char *varname, int n)
 {
   GList *l;
-  WapInputInfo *input;
+  WapInputInfo *input = NULL;
   PlacedItem *item;
 
   g_assert(varname[0] == '$');