[monkey-bubble: 521/753] always define ENABLE_ORBIT2 require a version of libbonobo that requires

[Sven Herzberg <herzi src gnome org>]

commit 0f64bf0b8afa95ff0ef6cc23cdb7e671977991a8
Author: Michael Meeks <michael ximian com>
Date:   Tue Jul 10 17:42:46 2001 +0000

    always define ENABLE_ORBIT2 require a version of libbonobo that requires
    
    2001-07-10  Michael Meeks  <michael ximian com>
    
    	* configure.in: always define ENABLE_ORBIT2
    	require a version of libbonobo that requires ORBit2.

 ChangeLog    |    5 +++++
 configure.in |    7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 591f0e3..912ed98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-07-10  Michael Meeks  <michael ximian com>
 
+	* configure.in: always define ENABLE_ORBIT2
+	require a version of libbonobo that requires ORBit2.
+
+2001-07-10  Michael Meeks  <michael ximian com>
+
 	* tests/test-storage.c (main): hack it up.
 
 2001-07-09  Michael Meeks  <michael ximian com>
diff --git a/configure.in b/configure.in
index 9441b50..180f82e 100644
--- a/configure.in
+++ b/configure.in
@@ -43,10 +43,7 @@ dnl Don't use AC_PROG_AWK since we need the full pathname.
 AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
 AC_PATH_PROGS(PERL, perl5 perl)
 
-AC_ARG_ENABLE(orbit2, [  --enable-orbit2        enable ORBit2 bits], enable_orbit2=yes, enable_orbit2=no)
-if test z$enable_orbit2 = zyes; then
-	AC_DEFINE(ENABLE_ORBIT2)
-fi
+AC_DEFINE(ENABLE_ORBIT2)
 
 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt
@@ -63,7 +60,7 @@ AC_SUBST(REBUILD)
 dnl
 dnl Start of pkg-config checks
 dnl
-PKG_CHECK_MODULES(LIBGNOME, ORBit-2.0 >= 2.3.90 glib-2.0 >= 1.3.1 gnome-vfs-2.0 oaf-2.0 libxml-2.0 libbonobo-2.0)
+PKG_CHECK_MODULES(LIBGNOME, ORBit-2.0 >= 2.3.90 glib-2.0 >= 1.3.1 gnome-vfs-2.0 oaf-2.0 libxml-2.0 libbonobo-2.0 >= 1.97.0)
 AC_SUBST(LIBGNOME_CFLAGS)
 AC_SUBST(LIBGNOME_LIBS)