From 46dc199a0ddd35a38e115a37027b1fd74cedd7a7 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Sat, 11 Sep 2010 15:14:58 +0200 Subject: [PATCH] [build] Reference the SmartIrc4net library in the autotools build This add a mandatory dependency on SmartIrc4net. --- build/build.environment.mk | 3 ++- build/m4/sparkleshare/smartirc4net.m4 | 6 ++++++ configure.ac | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 build/m4/sparkleshare/smartirc4net.m4 diff --git a/build/build.environment.mk b/build/build.environment.mk index 8c870828..4fa916ea 100644 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -24,6 +24,7 @@ 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 = $(SMARTIRC4NET_LIBS) REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS) @@ -34,7 +35,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_GTK) $(LINK_MONO_POSIX) +REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB) diff --git a/build/m4/sparkleshare/smartirc4net.m4 b/build/m4/sparkleshare/smartirc4net.m4 new file mode 100644 index 00000000..e581531f --- /dev/null +++ b/build/m4/sparkleshare/smartirc4net.m4 @@ -0,0 +1,6 @@ +AC_DEFUN([SPARKLESHARE_CHECK_SMARTIRC4NET], +[ + PKG_CHECK_MODULES(SMARTIRC4NET, smartirc4net) + AC_SUBST(SMARTIRC4NET_LIBS) +]) + diff --git a/configure.ac b/configure.ac index e45e276b..6f741288 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ AC_SUBST(NDESK_DBUS_GLIB_LIBS) SPARKLESHARE_CHECK_GTK_SHARP #SPARKLESHARE_CHECK_NOTIFY_SHARP +SPARKLESHARE_CHECK_SMARTIRC4NET SHAMROCK_CHECK_NUNIT