[monkey-bubble: 156/753] Unconditionally depend on libbonobo; removed the `HAVE_LIBBONOBO' automake

[Sven Herzberg <herzi src gnome org>]

commit 12df882ad1f73307414893de06e8c8ac085f891c
Author: Martin Baulig <baulig suse de>
Date:   Tue Apr 17 21:04:06 2001 +0000

    Unconditionally depend on libbonobo; removed the `HAVE_LIBBONOBO' automake
    
    2001-04-17  Martin Baulig  <baulig suse de>
    
    	* configure.in: Unconditionally depend on libbonobo; removed the
    	`HAVE_LIBBONOBO' automake conditional.
    	(LIBGNOME_EXTRA_DEPS): Removed.

 ChangeLog    |    6 ++++++
 acconfig.h   |    1 -
 configure.in |   13 +------------
 3 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 163942f..0400a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-17  Martin Baulig  <baulig suse de>
+
+	* configure.in: Unconditionally depend on libbonobo; removed the
+	`HAVE_LIBBONOBO' automake conditional.
+	(LIBGNOME_EXTRA_DEPS): Removed.
+
 2001-04-16  Martin Baulig  <baulig suse de>
 
 	* configure.in (HAVE_LIBBONOBO): #define this if we have libbonobo.
diff --git a/acconfig.h b/acconfig.h
index 08c0fa3..b23dbc0 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -7,4 +7,3 @@
 #undef HAVE_STPCPY
 #undef GNOME_EXCLUDE_DEPRECATED_SOURCE
 #undef GNOME_EXCLUDE_DEPRECATED
-#undef HAVE_LIBBONOBO
diff --git a/configure.in b/configure.in
index 1011aef..087bec8 100644
--- a/configure.in
+++ b/configure.in
@@ -122,21 +122,10 @@ GNOME_PKGCONFIG_CHECK_MODULES(LIBXML, libxml-2.0:2.3.1)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
-GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES(LIBBONOBO, libbonobo-2.0:1.96.0)
-AM_CONDITIONAL(HAVE_LIBBONOBO, test x$have_LIBBONOBO = yes)
-if test x$have_LIBBONOBO = xyes ; then
-  AC_DEFINE(HAVE_LIBBONOBO)
-fi
+GNOME_PKGCONFIG_CHECK_MODULES(LIBBONOBO, libbonobo-2.0:1.96.0)
 AC_SUBST(LIBBONOBO_CFLAGS)
 AC_SUBST(LIBBONOBO_LIBS)
 
-if test x$have_LIBBONOBO = xyes ; then
-  LIBGNOME_EXTRA_DEPS=libbonobo-2.0
-else
-  LIBGNOME_EXTRA_DEPS=
-fi
-AC_SUBST(LIBGNOME_EXTRA_DEPS)
-
 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/]))