pidgin: b1fa9aff: Chad Harp noticed that a define got mess...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: b1fa9aff4c34ce047c572504619d09fd47c9d6be
Ancestor: 223c176b6a2db3f928afc1e5cebc7a735461ae26
Author: datallah at pidgin.im
Date: 2009-01-07T04:12:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b1fa9aff4c34ce047c572504619d09fd47c9d6be

Modified files:
        libpurple/protocols/sametime/Makefile.am

ChangeLog: 

Chad Harp noticed that a define got messed up in 2.5.3, resulting in sametime
debugging issues.
Fixes #8014

-------------- next part --------------
============================================================
--- libpurple/protocols/sametime/Makefile.am	f4678eaa367453b46072478a8352656c4aa21c1d
+++ libpurple/protocols/sametime/Makefile.am	4a7ac04622d68956e3c7f4843beae612690a9a43
@@ -8,24 +8,22 @@ AM_CFLAGS = \
 SAMETIMESOURCES = sametime.c
 
 AM_CFLAGS = \
-	$(st) \
-	-DG_LOG_DOMAIN=\"sametime\"
+	$(st)
 
 if STATIC_SAMETIME
 
 st = -DPURPLE_STATIC_PRPL
 noinst_LTLIBRARIES     = libsametime.la
-libsametime_la_SOURCES = $(SAMETIMESOURCES)
 libsametime_la_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
 pkg_LTLIBRARIES     = libsametime.la
-libsametime_la_SOURCES = $(SAMETIMESOURCES)
 
 endif
 
+libsametime_la_SOURCES = $(SAMETIMESOURCES)
 libsametime_la_LDFLAGS = -module -avoid-version
 libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
 
@@ -34,5 +32,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(MEANWHILE_CFLAGS)
+	$(MEANWHILE_CFLAGS) \
+	-DG_LOG_DOMAIN=\"sametime\"