From 9b77f88b1769a28a16a7dd6e76c120cbca6dc0d9 Mon Sep 17 00:00:00 2001
From: Chema Celorio <chema@celorio.com>
Date: Thu, 26 Jul 2001 01:10:12 +0000
Subject: [PATCH] remove the --enable-bonobo-conf and replace with
 --disable-bonobo-conf.

2001-07-25  Chema Celorio  <chema@celorio.com>

	* configure.in (BONOBO_CHECK): remove the --enable-bonobo-conf and replace with
	--disable-bonobo-conf. The default is now with bonobo-conf
---
 ChangeLog    |  5 +++++
 configure.in | 36 +++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 086d84924..8ec126b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-25  Chema Celorio  <chema@celorio.com>
+
+	* configure.in (BONOBO_CHECK): remove the --enable-bonobo-conf and replace with
+	--disable-bonobo-conf. The default is now with bonobo-conf
+
 2001-07-25  Chema Celorio  <chema@celorio.com>
 
 	(capplet_modules): add bonobo_conf back. 
diff --git a/configure.in b/configure.in
index b0d496d86..34a2fd902 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(control-center)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(control-center, 1.5.1)
+AM_INIT_AUTOMAKE(control-center, 1.5.2)
 
 AM_MAINTAINER_MODE
 
@@ -94,7 +94,14 @@ dnl ==============================================
 dnl Check for --enable-bonobo-conf option
 dnl ==============================================
 
-AC_ARG_ENABLE(bonobo-conf,[     --enable-bonobo-conf    Enable bonobo-conf support in the capplets],[
+AC_ARG_ENABLE(bonobo-conf,[     --disable-bonobo-conf    Disable bonobo-conf support in the capplets],[
+PKG_BONOBO_CHECK=
+PKG_BONOBO_CONF_CHECK=
+bonobo_conf_enable=
+libcommon_enable=
+LIBCOMMON_DIR=
+moniker_enable=
+],[
 PKG_BONOBO_CHECK="bonobo bonobox"
 PKG_BONOBO_CONF_CHECK="bonobo bonobo_conf >= 0.8"
 bonobo_conf_enable=yes
@@ -102,13 +109,6 @@ libcommon_enable=yes
 LIBCOMMON_DIR=common
 moniker_enable=yes
 AC_DEFINE(HAVE_BONOBO)
-],[
-PKG_BONOBO_CHECK=
-PKG_BONOBO_CONF_CHECK=
-bonobo_conf_enable=
-libcommon_enable=
-LIBCOMMON_DIR=
-moniker_enable=
 ])
 
 AC_SUBST(LIBCOMMON_DIR)
@@ -245,3 +245,21 @@ capplets/screensaver/Makefile
 capplets/screensaver/screensavers/Makefile
 capplets/sound/Makefile
 intl/Makefile])
+echo "
+
+Configuration (XST):
+
+        Compiler       :	${CC}"
+case "X$bonobo_conf_enable" in
+Xyes)
+echo "        Use bonobo-conf : YES"
+;;
+*)
+echo "        Use bonobo-conf : NO"
+echo
+;;
+esac
+echo "
+
+"
+