[tasque/xbuild] Revert "[build] Restore backend build switches"
- From: Antonius Riha <antoniusri src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tasque/xbuild] Revert "[build] Restore backend build switches"
- Date: Thu, 20 Sep 2012 08:08:45 +0000 (UTC)
commit 754890d89ec9207a6f3988226a64063b174932ca
Author: Antonius Riha <antoniusriha gmail com>
Date: Thu Sep 20 09:43:16 2012 +0200
Revert "[build] Restore backend build switches"
Keep xbuild property BuildEnabled though.
This reverts commit 76c8dc3b43721aee3242c5d0676d721130d32291.
Conflicts:
Makefile.am
configure.ac | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c20e28f..ae044b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,8 @@ AC_ARG_ENABLE(all_backends,
AC_HELP_STRING([--enable-all-backends],
[Enable all backends, including standard and experimental [default=no]]),
final_all_backends=$enableval, final_all_backends=no)
+AM_CONDITIONAL(ENABLE_ALL_BACKENDS, test "x$final_all_backends" != "xno")
+
if test "x$final_all_backends" != "xno" ; then
final_standard_backends=yes
final_experimental_backends=yes
@@ -151,6 +153,8 @@ AC_ARG_ENABLE(standard_backends,
AC_HELP_STRING([--enable-standard-backends],
[Enable standard (RTM, SQLite) backends. [default=yes]]),
final_standard_backends=$enableval, final_standard_backends=yes)
+AM_CONDITIONAL(ENABLE_STANDARD_BACKENDS, test "x$final_standard_backends" != "xno")
+
if test "x$final_standard_backends" != "xno" ; then
final_backend_rtm=yes
final_backend_sqlite=yes
@@ -163,6 +167,8 @@ AC_ARG_ENABLE(experimental_backends,
AC_HELP_STRING([--enable-experimental-backends],
[Enable experimental (Hiveminder, ICECore) backends. [default=no]]),
final_experimental_backends=$enableval, )
+AM_CONDITIONAL(ENABLE_EXPERIMENTAL_BACKENDS, test "x$final_experimental_backends" != "xno")
+
if test "x$final_experimental_backends" != "xno" ; then
final_backend_hiveminder=yes
final_backend_icecore=yes
@@ -175,7 +181,7 @@ AC_ARG_ENABLE(backend_dummy,
AC_HELP_STRING([--enable-backend-dummy],
[Enable the Dummy (Debug) Backend [default=if --enable-debug: yes; else: no]]),
final_backend_dummy=$enableval, final_backend_dummy=$enable_debug)
-AC_SUBST(final_backend_dummy)
+AM_CONDITIONAL(ENABLE_BACKEND_DUMMY, test "x$final_backend_dummy" != "xno")
#
# Remember the Milk Backend
@@ -195,7 +201,7 @@ AC_ARG_ENABLE(backend_sqlite,
if test "x$final_backend_sqlite" != "xno"; then
GAC_CHECK_MODULES([MONO_DATA_SQLITE], [Mono.Data.Sqlite])
fi
-AC_SUBST(final_backend_sqlite)
+AM_CONDITIONAL(ENABLE_BACKEND_SQLITE, test "x$final_backend_sqlite" != "xno")
#
# ICEcore for IceBackend Support
@@ -204,7 +210,7 @@ AC_ARG_ENABLE(backend_icecore,
AC_HELP_STRING([--enable-backend-icecore],
[Enable the ICEcore Backend [default=no]]),
final_backend_icecore=$enableval, )
-AC_SUBST(final_backend_icecore)
+AM_CONDITIONAL(ENABLE_BACKEND_ICECORE, test "x$final_backend_icecore" != "xno")
if test "x$final_backend_icecore" != "xno" ; then
# FIXME : Is this the right way to do this ?
PKG_CHECK_MODULES(ICE_DESKTOP, Novell.IceDesktop)
@@ -214,11 +220,12 @@ AC_SUBST(ICE_DESKTOP_LIBS)
#
# Evolution-Sharp for EDSBackend Support
#
+
AC_ARG_ENABLE(backend_eds,
AC_HELP_STRING([--enable-backend-eds],
[Enable the EDS Backend [default=no]]),
final_backend_eds=$enableval, )
-AC_SUBST(final_backend_eds)
+AM_CONDITIONAL(ENABLE_BACKEND_EDS, test "x$final_backend_eds" != "xno")
if test "x$final_backend_eds" != "xno" ; then
# FIXME : Is this the right way to do this ?
PKG_CHECK_MODULES(EVOLUTION_SHARP, evolution-sharp >= 0.18.1)
@@ -232,7 +239,7 @@ AC_ARG_ENABLE(backend_hiveminder,
AC_HELP_STRING([--enable-backend-hiveminder],
[Enable the Hiveminder Backend [default=no]]),
final_backend_hiveminder=$enableval, )
-AC_SUBST(final_backend_hiveminder)
+AM_CONDITIONAL(ENABLE_BACKEND_HIVEMINDER, test "x$final_backend_hiveminder" != "xno")
#
# If no backends were enabled,
@@ -246,7 +253,7 @@ if test "x$final_backend_dummy" = "xno" -a "x$final_backend_rtm" = "xno" \
final_backend_rtm=yes
fi
# Define ENABLE_BACKEND_RTM here so it only gets defined once
-AC_SUBST(final_backend_rtm)
+AM_CONDITIONAL(ENABLE_BACKEND_RTM, test "x$final_backend_rtm" != "xno")
AC_CONFIG_FILES([
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]