From adb15abf6ff71101a6eff76a44c310e8dd342f65 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Date: Mon, 4 Nov 2013 23:03:19 +0100
Subject: [PATCH] build: Require notify-sharp-3.0 and clean up configure checks

Now that notify-sharp has a 3.0 release that depends on GTK 3, we can
require the proper pkg-config module.

Remove notify-sharp.m4 file, and the useless call to the macro that was
defined in it.

Also remove some unneeded variables in build.environment.mk.
---
 build/build.environment.mk            |  4 ----
 build/m4/sparkleshare/notify-sharp.m4 | 12 ------------
 configure.ac                          | 11 ++---------
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100755 build/m4/sparkleshare/notify-sharp.m4

diff --git a/build/build.environment.mk b/build/build.environment.mk
index e99c6cfb..8fd2b446 100755
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -15,10 +15,6 @@ LINK_GNOME = $(GNOME_SHARP_LIBS)
 LINK_WEBKIT = $(WEBKITGTK_SHARP_LIBS)
 LINK_APP_INDICATOR = $(APP_INDICATOR_LIBS)
 
-REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
-LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll
-LINK_NOTIFY_SHARP_DEPS = $(REF_NOTIFY_SHARP) $(LINK_NOTIFY_SHARP)
-
 REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
 LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
 LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
diff --git a/build/m4/sparkleshare/notify-sharp.m4 b/build/m4/sparkleshare/notify-sharp.m4
deleted file mode 100755
index 8b8d4dfe..00000000
--- a/build/m4/sparkleshare/notify-sharp.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-AC_DEFUN([SPARKLESHARE_CHECK_NOTIFY_SHARP],
-[
-	PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_notify_sharp=yes, have_notify_sharp=no)
-	if test "x$have_notify_sharp" = "xyes"; then
-		AC_SUBST(NOTIFY_SHARP_LIBS)
-		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
-	else
-		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
-		AC_MSG_RESULT([no])
-	fi
-])
-
diff --git a/configure.ac b/configure.ac
index 08ffdcde..dd06935e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -34,8 +34,6 @@ SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([
 ])]
 )
 
-SPARKLESHARE_CHECK_NOTIFY_SHARP
-
 AC_ARG_ENABLE(debug,
 	AC_HELP_STRING([--enable-debug],
 		[Use 'DEBUG' Configuration [default=YES]]),
@@ -66,6 +64,8 @@ OSNAME=`uname -s`
 if test "$OSNAME" = "Linux" ; then
 	SPARKLESHARE_CHECK_GTK_SHARP
 
+	PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp-3.0)
+
 	dnl check for webkitgtk-sharp
 	PKG_CHECK_MODULES(WEBKITGTK_SHARP, webkitgtk-sharp-3.0, have_webkitgtk_sharp=yes, have_webkitgtk_sharp=no)
 	if test "x$have_webkitgtk_sharp" = "xno" ; then
@@ -73,13 +73,6 @@ if test "$OSNAME" = "Linux" ; then
 	fi
 	AC_SUBST(WEBKITGTK_SHARP_LIBS)
 
-	dnl check for notify-sharp
-	PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_notify_sharp=yes, have_notify_sharp=no)
-	if test "x$have_notify_sharp" = "xno" ; then
-		AC_ERROR("notify-sharp is a required dependency: you need to install the appropriate devel package before you can compile")
-	fi
-	AC_SUBST(NOTIFY_SHARP_LIBS)
-
 	APPINDICATOR_REQUIRED=0.1
 
 	if test x$enable_appindicator = xauto ; then