From 3eda2b0d3515e49f80266aa0be135eecf26e6a5c Mon Sep 17 00:00:00 2001
From: Alex Hudson <alex@stratagia.co.uk>
Date: Wed, 8 Jun 2011 20:31:28 +0100
Subject: [PATCH] Allow Sparkle to link against a system SmartIrc4Net library

---
 Makefile.am                |  2 +-
 build/build.environment.mk |  5 +++--
 configure.ac               | 11 ++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b78adc24..92fedd59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS =	\
 	build	\
 	help	\
-	SmartIrc4net \
+	${SPARKLE_SMARTIRC4NETDIR} \
 	SparkleLib \
 	SparkleShare \
 	data \
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 277a5c5a..59717142 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -15,7 +15,8 @@ LINK_GTK = $(GTKSHARP_LIBS)
 LINK_GNOME = $(GNOME_SHARP_LIBS)
 LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
 LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
-LINK_SMARTIRC4NET = -r:$(top_builddir)/$(SMARTIRC4NET_ASSEMBLY)
+LINK_SMARTIRC4NET = $(SMARTIRC4NET_LIBS)
+LINK_SMARTIRC4NET_LOCAL = -r:$(abs_top_builddir)/$(SMARTIRC4NET_ASSEMBLY)
 
 REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
 LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll
@@ -25,7 +26,7 @@ REF_FRIENDFACE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX)
 LINK_FRIENDFACE = -r:$(DIR_BIN)/FriendFace.dll
 LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE)
 
-REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET)
+REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) $(LINK_SMARTIRC4NET_LOCAL)
 LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
 LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
 
diff --git a/configure.ac b/configure.ac
index cd62f201..eaeb9f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,16 @@ dnl package checks, common for all configs
 
 
 SPARKLESHARE_CHECK_GTK_SHARP
-SPARKLESHARE_SMARTIRC4NET
+
+PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net],
+	SPARKLE_SMARTIRC4NETDIR=""
+	,
+	SPARKLESHARE_SMARTIRC4NET
+ 	SMARTIRC4NET_LIBS=""
+	AC_SUBST(SMARTIRC4NET_LIBS)
+	SPARKLE_SMARTIRC4NETDIR="SmartIrc4net"
+	AC_SUBST(SPARKLE_SMARTIRC4NETDIR)
+)
 
 dnl check for webkit-sharp
 PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no)