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
This commit is contained in:
Chema Celorio 2001-07-26 01:10:12 +00:00 committed by Jose Maria Celorio
parent a4d165d70d
commit 9b77f88b17
2 changed files with 32 additions and 9 deletions

View file

@ -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.

View file

@ -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 "
"