[gnome-panel] [build] Make automatic detection of bonobo work in configure

[Vincent Untz <vuntz src gnome org>]

commit 4955d74f0953ad58aad461beba455b3e259a13c2
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Jun 22 19:43:29 2010 +0200

    [build] Make automatic detection of bonobo work in configure
    
    It was supposed to work, but if bonobo was not explicitly disabled and
    it was missing, configure failed.

 configure.in |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index 11e0b9b..86f2b35 100644
--- a/configure.in
+++ b/configure.in
@@ -309,15 +309,17 @@ else
     AC_MSG_ERROR(Bonobo compatibility modules explicity enabled but not available)
   fi
 
-  PKG_CHECK_MODULES(PANEL_MODULE_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED)
-  PKG_CHECK_MODULES(LIBPANEL_APPLET_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
+  if test "x$HAVE_BONOBO" = "xyes"; then
+    PKG_CHECK_MODULES(PANEL_MODULE_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED)
+    PKG_CHECK_MODULES(LIBPANEL_APPLET_BONOBO, ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
 
-  dnl IDL directories
-  ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-  BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-  BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
+    dnl IDL directories
+    ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
+    BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
+    BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 
-  AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules, no)
+    AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules, no)
+  fi
 fi
 
 AM_CONDITIONAL(HAVE_BONOBO, test "x$HAVE_BONOBO" = "xyes")