beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Allow Sparkle to link against a system SmartIrc4Net library

Browse source
This commit is contained in:
Alex Hudson 2011-06-08 20:31:28 +01:00
parent 19aca9d238
commit e08ca676e8
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,7 +1,7 @@
SUBDIRS = \ SUBDIRS = \
build \ build \
help \ help \
SmartIrc4net \ ${SPARKLE_SMARTIRC4NETDIR} \
SparkleLib \ SparkleLib \
SparkleShare \ SparkleShare \
data \ data \

5
build/build.environment.mk
View file

@ -15,7 +15,8 @@ LINK_GTK = $(GTKSHARP_LIBS)
LINK_GNOME = $(GNOME_SHARP_LIBS) LINK_GNOME = $(GNOME_SHARP_LIBS)
LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS) LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(NDESK_DBUS_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) REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll 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 = -r:$(DIR_BIN)/FriendFace.dll
LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE) 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 = -r:$(DIR_BIN)/SparkleLib.dll
LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB) LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)

9
configure.ac
View file

@ -78,7 +78,16 @@ dnl package checks, common for all configs
SPARKLESHARE_CHECK_GTK_SHARP SPARKLESHARE_CHECK_GTK_SHARP
PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net],
SPARKLE_SMARTIRC4NETDIR=""
,
SPARKLESHARE_SMARTIRC4NET SPARKLESHARE_SMARTIRC4NET
SMARTIRC4NET_LIBS=""
AC_SUBST(SMARTIRC4NET_LIBS)
SPARKLE_SMARTIRC4NETDIR="SmartIrc4net"
AC_SUBST(SPARKLE_SMARTIRC4NETDIR)
)
dnl check for webkit-sharp dnl check for webkit-sharp
PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no) PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no)