[tasque/xbuild] Revert "[build] Restore build switches: appind, notify and gtk_2_12"

[Antonius Riha <antoniusri src gnome org>]

commit 5604cda3f71bdf9cb29f9b51d5f34179f797a1bd
Author: Antonius Riha <antoniusriha gmail com>
Date:   Thu Sep 20 09:36:20 2012 +0200

    Revert "[build] Restore build switches: appind, notify and gtk_2_12"
    
    This reverts commit 78b5636744ed1adcc96f47bb92584f0e08a35fb8.
    
    Conflicts:
    
    	Makefile.am

 Makefile.am  |   23 +----------------------
 configure.ac |    9 +++++----
 2 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 10dab91..10a4903 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,33 +4,12 @@ else
 conf = "GtkLinuxRelease"
 endif
 
-enable_appindicator=$(shell if test "x appindicator@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-enable_notify_sharp=$(shell if test "x notify_sharp@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-enable_gtk_2_12=$(shell if test "x GTK_2_12@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-
-enable_backend_dummy=$(shell if test "x final_backend_dummy@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-enable_backend_rtm=$(shell if test "x final_backend_rtm@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-enable_backend_sqlite=$(shell if test "x final_backend_sqlite@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-enable_backend_icecore=$(shell if test "x final_backend_icecore@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-enable_backend_eds=$(shell if test "x final_backend_eds@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-enable_backend_hiveminder=$(shell if test "x final_backend_hiveminder@" != "xno" ; then echo "true" ; else echo "false" ; fi)
-
-
 PROPERTIES = \
 	/property:Configuration=$(conf) \
 	/property:AbsTopSrcDir=$(abs_top_srcdir) \
 	/property:AbsTopBuildDir=$(abs_top_builddir) \
 	/property:AbsDistDir="`pwd`/$(distdir)" \
-	/property:Prefix=$(prefix) \
-	/property:EnableAppIndicator=$(enable_appindicator) \
-	/property:EnableNotifySharp=$(enable_notify_sharp) \
-	/property:EnableGtkSharp12=$(enable_gtk_2_12) \
-	/property:EnableBackendDummy=$(enable_backend_dummy) \
-	/property:EnableBackendRtm=$(enable_backend_rtm) \
-	/property:EnableBackendSqlite=$(enable_backend_sqlite) \
-	/property:EnableBackendIceCore=$(enable_backend_icecore) \
-	/property:EnableBackendEds=$(enable_backend_eds) \
-	/property:EnableBackendHiveminder=$(enable_backend_hiveminder)
+	/property:Prefix=$(prefix)
 
 pkgdata_DATA =  $(DLL_REFERENCES)
 
diff --git a/configure.ac b/configure.ac
index 1271093..c20e28f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,15 +64,16 @@ AM_GLIB_GNU_GETTEXT
 PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0 >= 2.10.0])
 PKG_CHECK_MODULES([GTK_SHARP_2_12], gtk-sharp-2.0 >= 2.12.0, GTK_2_12="yes", GTK_2_12="no")
-AC_SUBST(GTK_2_12)
+AM_CONDITIONAL(GTK_2_12, test "$GTK_2_12" = "yes")
 PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-1.0])
 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, notify_sharp="yes", notify_sharp="no")
-AC_SUBST(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)
 
 #
 # AppIndicator
@@ -263,7 +264,7 @@ Configuration:
 
 	Prefix:            ${prefix}
 	Debug build:       ${enable_debug}
-	Notification:      ${notify_sharp}
+	Notification:      ${enable_notify_sharp}
 	Dummy Backend:     ${final_backend_dummy}
 	Evolution Backend: ${final_backend_eds}
 	ICECore Backend:   ${final_backend_icecore}