# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1156058015 0
# Node ID 28b1cebaa32832ad555125188e6a9d2658c01ede
# Parent  e9dd2f76e61bcfc8f1f04d9ff317f696707e7622
[gaim-migrate @ 16898]
libgaim and gaim should not link against ncursesw.
libgaim should not link against gstreamer.

committer: Tailor Script <tailor@pidgin.im>

diff -r e9dd2f76e61b -r 28b1cebaa328 configure.ac
--- a/configure.ac	Sun Aug 20 07:11:09 2006 +0000
+++ b/configure.ac	Sun Aug 20 07:13:35 2006 +0000
@@ -808,12 +808,14 @@
 dnl #######################################################################
 dnl # GNT Gaim
 dnl #######################################################################
+GNT_LIBS=
 if test "x$enable_gnt" = "xyes"; then
-	AC_CHECK_LIB(ncursesw, initscr, , [enable_gnt=no])
-	AC_CHECK_LIB(panelw, update_panels, , [enable_gnt=no])
+	AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no])
+	AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no])
 else
 	enable_gnt=no
 fi
+AC_SUBST(GNT_LIBS)
 AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes")
 
 dnl #######################################################################
diff -r e9dd2f76e61b -r 28b1cebaa328 console/libgnt/Makefile.am
--- a/console/libgnt/Makefile.am	Sun Aug 20 07:11:09 2006 +0000
+++ b/console/libgnt/Makefile.am	Sun Aug 20 07:13:35 2006 +0000
@@ -48,7 +48,7 @@
 libgnt_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(STATIC_LINK_LIBS) \
-	-lncursesw -lpanelw
+	$(GNT_LIBS)
 
 AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
diff -r e9dd2f76e61b -r 28b1cebaa328 libgaim/Makefile.am
--- a/libgaim/Makefile.am	Sun Aug 20 07:11:09 2006 +0000
+++ b/libgaim/Makefile.am	Sun Aug 20 07:13:35 2006 +0000
@@ -256,9 +256,7 @@
 	@LIBOBJS@ \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GOBJECT_LIBS) \
-	$(GSTREAMER_LIBS) \
+	$(LIBXML_LIBS) \
 	$(STATIC_LINK_LIBS) \
 	$(INTLLIBS) \
 	-lm
@@ -270,7 +268,7 @@
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-I$(top_srcdir)/plugins \
-	$(GSTREAMER_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(LIBXML_CFLAGS)