diff libpurple/protocols/irc/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/irc/Makefile.am	Wed Nov 12 09:40:05 2008 +0000
+++ b/libpurple/protocols/irc/Makefile.am	Wed Nov 12 11:30:51 2008 +0000
@@ -1,8 +1,15 @@
-EXTRA_DIST = Makefile.mingw
+EXTRA_DIST = \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-IRCSOURCES = irc.c parse.c cmds.c msgs.c irc.h dcc_send.c
+IRCSOURCES = \
+	cmds.c \
+	dcc_send.c \
+	irc.c \
+	irc.h \
+	msgs.c \
+	parse.c
 
 AM_CFLAGS = $(st)
 
@@ -11,18 +18,14 @@
 if STATIC_IRC
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LIBRARIES = libirc.a
-pkg_LTLIBRARIES =
-
-libirc_a_SOURCES = $(IRCSOURCES)
-libirc_a_CFLAGS  = $(AM_CFLAGS)
+noinst_LTLIBRARIES = libirc.la
+libirc_la_SOURCES  = $(IRCSOURCES)
+libirc_la_CFLAGS   = $(AM_CFLAGS)
 
 else
 
 st =
-pkg_LTLIBRARIES = libirc.la
-noinst_LIBRARIES =
-
+pkg_LTLIBRARIES   = libirc.la
 libirc_la_SOURCES = $(IRCSOURCES)
 libirc_la_LIBADD  = $(GLIB_LIBS)