[tasque/xbuild] [build] Restore configure switches

[Antonius Riha <antoniusri src gnome org>]

commit 16a955acf65aea6a0f89f53a3d90f9ed335fe14f
Author: Antonius Riha <antoniusriha gmail com>
Date:   Thu Sep 20 10:08:04 2012 +0200

    [build] Restore configure switches
    
    using conditionals

 Makefile.am  |   65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |   13 +---------
 2 files changed, 66 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 10a4903..fb583eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,75 @@ else
 conf = "GtkLinuxRelease"
 endif
 
+if GTK_2_12
+enable_gtk_2_12 = "true"
+else
+enable_gtk_2_12 = "false"
+endif
+
+if ENABLE_NOTIFY_SHARP
+enable_notify_sharp = "true"
+else
+enable_notify_sharp = "false"
+endif
+
+if ENABLE_APPINDICATOR
+enable_appindicator = "true"
+else
+enable_appindicator = "false"
+endif
+
+if ENABLE_BACKEND_DUMMY
+enable_backend_dummy = "true"
+else
+enable_backend_dummy = "false"
+endif
+
+if ENABLE_BACKEND_SQLITE
+enable_backend_sqlite = "true"
+else
+enable_backend_sqlite = "false"
+endif
+
+if ENABLE_BACKEND_ICECORE
+enable_backend_icecore = "true"
+else
+enable_backend_icecore = "false"
+endif
+
+if ENABLE_BACKEND_EDS
+enable_backend_eds = "true"
+else
+enable_backend_eds = "false"
+endif
+
+if ENABLE_BACKEND_HIVEMINDER
+enable_backend_hiveminder = "true"
+else
+enable_backend_hiveminder = "false"
+endif
+
+if ENABLE_BACKEND_RTM
+enable_backend_rtm = "true"
+else
+enable_backend_rtm = "false"
+endif
+
 PROPERTIES = \
 	/property:Configuration=$(conf) \
 	/property:AbsTopSrcDir=$(abs_top_srcdir) \
 	/property:AbsTopBuildDir=$(abs_top_builddir) \
 	/property:AbsDistDir="`pwd`/$(distdir)" \
-	/property:Prefix=$(prefix)
+	/property:Prefix=$(prefix) \
+	/property:EnableGtkSharp12=$(enable_gtk_2_12) \
+	/property:EnableNotifySharp=$(enable_notify_sharp) \
+	/property:EnableAppIndicator=$(enable_appindicator) \
+	/property:EnableBackendDummy=$(enable_backend_dummy) \
+	/property:EnableBackendSqlite=$(enable_backend_sqlite) \
+	/property:EnableBackendIceCore=$(enable_backend_icecore) \
+	/property:EnableBackendEds=$(enable_backend_eds) \
+	/property:EnableBackendHiveminder=$(enable_backend_hiveminder) \
+	/property:EnableBackendRtm=$(enable_backend_rtm)
 
 pkgdata_DATA =  $(DLL_REFERENCES)
 
diff --git a/configure.ac b/configure.ac
index ae044b5..597e6f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,8 +72,7 @@ PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-1.0])
 # Allow the project to build without notify-sharp
 #
 PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, enable_notify_sharp="yes", enable_notify_sharp="no")
-AC_SUBST(enable_notify_sharp)
-AC_SUBST(NOTIFY_SHARP_LIBS)
+AM_CONDITIONAL(ENABLE_NOTIFY_SHARP, test "x$enable_notify_sharp" != "xno")
 
 #
 # AppIndicator
@@ -93,7 +92,7 @@ If appindicator-sharp is not available on your system, you probably won't need i
 appindicator pass --enable-appindicator=no to configure."])
 	fi
 fi
-AC_SUBST(appindicator)
+AM_CONDITIONAL(ENABLE_APPINDICATOR, test "x$appindicator" != "xno")
 
 
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Use 'Debug' Configuration [default=no]]),
@@ -139,8 +138,6 @@ 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
@@ -153,8 +150,6 @@ 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
@@ -167,8 +162,6 @@ 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
@@ -215,7 +208,6 @@ if test "x$final_backend_icecore" != "xno" ; then
        # FIXME : Is this the right way to do this ?
        PKG_CHECK_MODULES(ICE_DESKTOP, Novell.IceDesktop)
 fi
-AC_SUBST(ICE_DESKTOP_LIBS)
 
 #
 # Evolution-Sharp for EDSBackend Support
@@ -230,7 +222,6 @@ 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)
 fi
-AC_SUBST(EVOLUTION_SHARP_LIBS)
 
 #
 # Hiveminder Backend