changeset 17800:6f54b1e84610

This started off as a patch from OpenSolaris to fix compiling with static protocols outside of the source directory, but then I found I had to fix static compilation of jabber & oscar too.
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 09 Jun 2007 14:10:21 +0000
parents 3bc25e19ce1c
children 44393d3e0c3b
files configure.ac libpurple/protocols/jabber/Makefile.am libpurple/protocols/oscar/Makefile.am
diffstat 3 files changed, 19 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sat Jun 09 08:01:17 2007 +0000
+++ b/configure.ac	Sat Jun 09 14:10:21 2007 +0000
@@ -803,13 +803,22 @@
 load_proto=
 for i in $STATIC_PRPLS ; do
 	dnl Ugly special case for "libsilcpurple.a":
-	if test "x$i" = "xsilc"; then
-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}purple.a"
+	dnl ... and Ugly special case for multi-protocol oscar
+	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.a"
+		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+		load_proto="$load_proto purple_init_aim_plugin();"
+		load_proto="$load_proto purple_init_icq_plugin();"
 	else
-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
+		if test "x$i" = "xsilc"; then
+			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.a"
+		else
+			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.a"
+		fi
+		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+		load_proto="$load_proto purple_init_${i}_plugin();"
 	fi
-	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
-	load_proto="$load_proto purple_init_${i}_plugin();"
 	case $i in
 		bonjour)	static_bonjour=yes ;;
 		gg)			static_gg=yes ;;
--- a/libpurple/protocols/jabber/Makefile.am	Sat Jun 09 08:01:17 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Sat Jun 09 14:10:21 2007 +0000
@@ -43,15 +43,12 @@
 if STATIC_JABBER
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libjabber.a libxmpp.a
+noinst_LIBRARIES = libjabber.a
 pkg_LTLIBRARIES =
 
-libjabber_a_SOURCES = $(JABBERSOURCES)
+libjabber_a_SOURCES = $(JABBERSOURCES) libxmpp.c
 libjabber_a_CFLAGS  = $(AM_CFLAGS)
 
-libxmpp_a_SOURCES = libxmpp.c
-libxmpp_a_CFLAGS = $(AM_CFLAGS)
-
 else
 
 st =
--- a/libpurple/protocols/oscar/Makefile.am	Sat Jun 09 08:01:17 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.am	Sat Jun 09 14:10:21 2007 +0000
@@ -52,15 +52,10 @@
 if STATIC_OSCAR
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES   = liboscar.a libaim.a libicq.a
-liboscar_a_SOURCES = $(OSCARSOURCES)
-liboscar_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LIBRARIES   = liboscar.a
 
-libaim_a_CFLAGS = $(AM_CFLAGS)
-libaim_a_SOURCES = libaim.c
-
-libicq_a_CFLAGS = $(AM_CFLAGS)
-libicq_a_SOURCES = libicq.c
+liboscar_a_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
+liboscar_a_CFLAGS  = $(AM_CFLAGS)
 
 else