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

[Antonius Riha <antoniusri src gnome org>]

commit 78b5636744ed1adcc96f47bb92584f0e08a35fb8
Author: Antonius Riha <antoniusriha gmail com>
Date:   Wed Sep 19 20:26:59 2012 +0200

    [build] Restore build switches: appind, notify and gtk_2_12

 Makefile.am  |    9 ++++++++-
 configure.ac |    9 ++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 10a4903..ec11278 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,19 @@ 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)
+
 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:EnableAppIndicator=$(enable_appindicator) \
+	/property:EnableNotifySharp=$(enable_notify_sharp) \
+	/property:EnableGtkSharp12=$(enable_gtk_2_12)
 
 pkgdata_DATA =  $(DLL_REFERENCES)
 
diff --git a/configure.ac b/configure.ac
index 4f5cb01..51254d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,16 +64,15 @@ 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")
-AM_CONDITIONAL(GTK_2_12, test "$GTK_2_12" = "yes")
+AC_SUBST(GTK_2_12)
 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, enable_notify_sharp="yes", enable_notify_sharp="no")
-AC_SUBST(enable_notify_sharp)
-AC_SUBST(NOTIFY_SHARP_LIBS)
+PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, notify_sharp="yes", notify_sharp="no")
+AC_SUBST(notify_sharp)
 
 #
 # AppIndicator
@@ -271,7 +270,7 @@ Configuration:
 
 	Prefix:            ${prefix}
 	Debug build:       ${enable_debug}
-	Notification:      ${enable_notify_sharp}
+	Notification:      ${notify_sharp}
 	Dummy Backend:     ${final_backend_dummy}
 	Evolution Backend: ${final_backend_eds}
 	ICECore Backend:   ${final_backend_icecore}