# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 998949389 0
# Node ID a22f18ae43c1760b9a67bb686035ddbeccee573c
# Parent  72586b12179cefec4b8c1bd90139f405fe6390cb
[gaim-migrate @ 2188]
protocols don't link against gtk

committer: Tailor Script <tailor@pidgin.im>

diff -r 72586b12179c -r a22f18ae43c1 configure.ac
--- a/configure.ac	Mon Aug 27 19:02:19 2001 +0000
+++ b/configure.ac	Mon Aug 27 21:56:29 2001 +0000
@@ -101,7 +101,7 @@
 		CFLAGS="$CFLAGS $GNOME_INCLUDEDIR"
 		AC_DEFINE(USE_APPLET)
 		AC_DEFINE(USE_GNOME)
-		LIBS="$LIBS $GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS"
+		UI_LIBS="$GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS"
 		AC_PATH_PROG(gaimpath, gaim_applet)
 	else
 		AC_PATH_PROG(gnomepath, gnome-config)
@@ -119,7 +119,7 @@
 			else
 				AC_MSG_RESULT(ok)
 				CFLAGS="$CFLAGS $GNOME_CFLAGS"
-				LIBS="$LIBS `$gnomepath gnomeui --libs 2>/dev/null`"
+				UI_LIBS="`$gnomepath gnomeui --libs 2>/dev/null`"
 				AC_DEFINE(USE_GNOME)
 				GNOME_CONFIG="$gnomepath"
 				AC_SUBST(GNOME_CONFIG)
@@ -138,7 +138,7 @@
 *** GTK+ is required to build Gaim; please make sure you have the GTK+
 *** development headers installed. The latest version of GTK+ is
 *** always available at http://www.gtk.org/.]),gthread)
-	LIBS="$LIBS $GTK_LIBS"
+	UI_LIBS="$GTK_LIBS"
 	AC_PATH_PROG(gaimpath, gaim)
 fi
 CFLAGS="$CFLAGS $GTK_CFLAGS"
@@ -154,12 +154,13 @@
 		AC_SUBST(GDK_PIXBUF_CFLAGS)
 		AC_SUBST(GDK_PIXBUF_LIBS)
 		CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
-		LIBS="$LIBS $GDK_PIXBUF_LIBS"
+		UI_LIBS="$GDK_PIXBUF_LIBS"
 		dnl We should be doing checks to see that the header files and functions exist. eh.
 		AC_DEFINE(USE_PIXBUF)
 		use_pixbuf=yes
 	fi
 fi
+AC_SUBST(UI_LIBS)
 
 dnl Check for XScreenSaver
 if test "x$enable_xss" = "xyes" ; then
@@ -215,19 +216,19 @@
 
 if test "$enable_nas" = yes ; then
 	AC_DEFINE(NAS_SOUND)
-        LIBS="$LIBS -laudio -lXt"
+        SOUND_LIBS="-laudio -lXt"
 fi
-
 if test "$enable_esd" = yes ; then
 	AM_PATH_GESD
         if test "$no_esd" != yes ; then
         	CFLAGS="$CFLAGS $ESD_CFLAGS"
 		AC_DEFINE(ESD_SOUND)
-                LDADD="$LDADD $ESD_LIBS"
+                SOUND_LIBS="$SOUND_LIBS $ESD_LIBS"
 	else
 		enable_esd=no
         fi
 fi
+AC_SUBST(SOUND_LIBS)
 
 if test "$ac_cv_cygwin" = yes ; then
 	LDADD="$LDADD -static"
diff -r 72586b12179c -r a22f18ae43c1 src/Makefile.am
--- a/src/Makefile.am	Mon Aug 27 19:02:19 2001 +0000
+++ b/src/Makefile.am	Mon Aug 27 21:56:29 2001 +0000
@@ -62,6 +62,12 @@
 gaim_LDADD = @LDADD@ @LIBOBJS@
 endif
 
+# UI stuff. We do this here so the PRPLs aren't forced to link with it
+LIBS += $(UI_LIBS)
+
+# Sound libs. Just for fun
+LIBS += $(SOUND_LIBS)
+
 # Static protocols
 LIBS += $(STATIC_LINK_LIBS)