From 677cf6d0a4b70e74c72d221f54cf6f0f32870db9 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Thu, 26 Jul 2001 15:32:47 +0000 Subject: [PATCH] Fix problem where meaning of --enable-bonobo-conf was the opposite of what 2001-07-26 Bradford Hovinen * configure.in (AC_ARG_ENABLE): Fix problem where meaning of --enable-bonobo-conf was the opposite of what it should have been --- ChangeLog | 5 +++++ configure.in | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6f79a238..e024b142c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-07-26 Bradford Hovinen + + * configure.in (AC_ARG_ENABLE): Fix problem where meaning of + --enable-bonobo-conf was the opposite of what it should have been + 2001-07-25 Chema Celorio * configure.in (PKG_BONOBO_CONF_CHECK): update the requirements for diff --git a/configure.in b/configure.in index 1ad1ea0eb..c077495de 100644 --- a/configure.in +++ b/configure.in @@ -94,14 +94,14 @@ dnl ============================================== dnl Check for --enable-bonobo-conf option dnl ============================================== +CC_USE_BONOBO_CONF=yes + 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= ],[ +CC_USE_BONOBO_CONF=no +]) + +if test "x$CC_USE_BONOBO_CONF" = "xyes"; then PKG_BONOBO_CHECK="bonobo bonobox" PKG_BONOBO_CONF_CHECK="bonobo bonobo_conf >= 0.9" bonobo_conf_enable=yes @@ -109,7 +109,14 @@ libcommon_enable=yes LIBCOMMON_DIR=common moniker_enable=yes AC_DEFINE(HAVE_BONOBO) -]) +else +PKG_BONOBO_CHECK= +PKG_BONOBO_CONF_CHECK= +bonobo_conf_enable= +libcommon_enable= +LIBCOMMON_DIR= +moniker_enable= +fi AC_SUBST(LIBCOMMON_DIR)