[monkey-bubble: 285/753] Optionally depend on libgnomesupport (from the libgnomebase module).

[Sven Herzberg <herzi src gnome org>]

commit e3e0fa6d239837125262bd2005e9571aa20b58b5
Author: Martin Baulig <baulig suse de>
Date:   Fri May 18 19:25:25 2001 +0000

    Optionally depend on libgnomesupport (from the libgnomebase module).
    
    2001-05-18  Martin Baulig  <baulig suse de>
    
    	* configure.in: Optionally depend on libgnomesupport (from
    	the libgnomebase module).
    
    	* acconfig.h (HAVE_GNOMESUPPORT): Added.
    
    	* libgnome/libgnome-init.c: #include <gnomesupport.h> if we
    	HAVE_GNOMESUPPORT.

 ChangeLog             |   10 ++++++++++
 acconfig.h            |    1 +
 configure.in          |    7 +++++++
 libgnome/Makefile.am  |    2 ++
 libgnome/gnome-init.c |    4 ++++
 5 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5e7bec0..b4b9ca8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-18  Martin Baulig  <baulig suse de>
+
+	* configure.in: Optionally depend on libgnomesupport (from
+	the libgnomebase module).
+
+	* acconfig.h (HAVE_GNOMESUPPORT): Added.
+
+	* libgnome/libgnome-init.c: #include <gnomesupport.h> if we
+	HAVE_GNOMESUPPORT.
+
 2001-04-30  Martin Baulig  <baulig suse de>
 
 	* idl/: New directory.
diff --git a/acconfig.h b/acconfig.h
index b23dbc0..06ae7e6 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -7,3 +7,4 @@
 #undef HAVE_STPCPY
 #undef GNOME_EXCLUDE_DEPRECATED_SOURCE
 #undef GNOME_EXCLUDE_DEPRECATED
+#undef HAVE_GNOMESUPPORT
diff --git a/configure.in b/configure.in
index 164254e..bd595d4 100644
--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,13 @@ fi
 dnl
 dnl Start of pkg-config checks
 dnl
+GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES(LIBGNOMESUPPORT, libgnomesupport-2.0:1.96.0)
+if test x$HAVE_LIBGNOMESUPPORT = xyes ; then
+  AC_DEFINE(HAVE_GNOMESUPPORT)
+fi
+AC_SUBST(LIBGNOMESUPPORT_CFLAGS)
+AC_SUBST(LIBGNOMESUPPORT_LIBS)
+
 GNOME_PKGCONFIG_CHECK_MODULES(ORBIT, ORBit-2.0:2.3.90)
 AC_PATH_PROG(ORBIT_IDL, orbit-idl, no)
 AC_SUBST(ORBIT_CFLAGS)
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index ff15cec..56d8013 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -20,6 +20,7 @@ INCLUDES = \
 	-I$(srcdir)/..				\
 	$(WARN_CFLAGS)				\
 	$(GLIB_CFLAGS)				\
+	$(LIBGNOMESUPPORT_CFLAGS)		\
 	$(LIBBONOBO_CFLAGS)			\
 	$(OAF_CFLAGS)				\
 	$(GCONF_CFLAGS)				\
@@ -194,6 +195,7 @@ gnome-config.o: parse-path.cP
 
 libgnome_2_la_LDFLAGS = -version-info $(LIB_VERSION)
 libgnome_2_la_LIBADD =		\
+	$(LIBGNOMESUPPORT_LIBS)	\
 	$(OAF_LIBS)		\
 	$(GCONF_LIBS)		\
 	$(LIBXML_LIBS)		\
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index bdccba4..23e40a9 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -47,6 +47,10 @@
 #include <liboaf/liboaf.h>
 #include <libbonobo.h>
 
+#ifdef HAVE_GNOMESUPPORT
+#include <gnomesupport.h>
+#endif
+
 #include <libgnomevfs/gnome-vfs-init.h>
 
 /*****************************************************************************