diff libpurple/protocols/sametime/Makefile.am @ 24389:2b62300d2c19

Use libtool to build static archives when --with-static-prpls is passed to configure. Does anyone know why we weren't using libtool before? We were building old-fashioned .a files. But libtool archives (.la) can contain either static or shared libraries. I found it a lot easier to get static prpl compilation working after making this change (that is to say, it worked). Without this I got this error, which is probably fixable, but consistently using libtool seems like it makes things easier: *** Warning: Linking the shared library libpurple.la against the *** static library ../libpurple/protocols/msn/libmsn.a is not portable! /usr/bin/ld: ../libpurple/protocols/msn/libmsn.a(libmsn_a-msn.o): relocation R_X86_64_32 against `a local symbol' can not be used when making a shared object; recompile with -fPIC ../libpurple/protocols/msn/libmsn.a: could not read symbols: Bad value collect2: ld returned 1 exit status

--- a/libpurple/protocols/sametime/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/sametime/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,21 +1,22 @@
-
-EXTRA_DIST = Makefile.mingw
-
+EXTRA_DIST = \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-
 noinst_HEADERS = sametime.h
 
 SAMETIMESOURCES = sametime.c
 
+AM_CFLAGS = \
+	$(st) \
+	-DG_LOG_DOMAIN=\"sametime\"
 
 if STATIC_SAMETIME
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES   = libsametime.a
-libsametime_a_SOURCES = $(SAMETIMESOURCES)
-libsametime_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES     = libsametime.la
+libsametime_la_SOURCES = $(SAMETIMESOURCES)
+libsametime_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
@@ -23,22 +24,15 @@
 pkg_LTLIBRARIES     = libsametime.la
 libsametime_la_SOURCES = $(SAMETIMESOURCES)
 
-
 endif
 
-
 libsametime_la_LDFLAGS = -module -avoid-version
 libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
 
-
-AM_CFLAGS = \
-	$(GLIB_CFLAGS) $(MEANWHILE_CFLAGS) \
-	$(DEBUG_CFLAGS) \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
-	-I$(top_builddir)/libpurple
-
+	-I$(top_builddir)/libpurple \
+	$(DEBUG_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(MEANWHILE_CFLAGS)
 
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"sametime\" \
-	$(st)
-