[Gaim-commits] SF.net SVN: gaim: [16898] trunk

[<sa...@us...>]

Revision: 16898
Author:   sadrul
Date:     2006-08-20 00:13:35 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16898&view=rev

Log Message:
-----------
libgaim and gaim should not link against ncursesw.
libgaim should not link against gstreamer.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/console/libgnt/Makefile.am
    trunk/libgaim/Makefile.am
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-20 07:11:09 UTC (rev 16897)
+++ trunk/configure.ac	2006-08-20 07:13:35 UTC (rev 16898)
@@ -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 #######################################################################

Modified: trunk/console/libgnt/Makefile.am
===================================================================
--- trunk/console/libgnt/Makefile.am	2006-08-20 07:11:09 UTC (rev 16897)
+++ trunk/console/libgnt/Makefile.am	2006-08-20 07:13:35 UTC (rev 16898)
@@ -48,7 +48,7 @@
 libgnt_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(STATIC_LINK_LIBS) \
-	-lncursesw -lpanelw
+	$(GNT_LIBS)
 
 AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \

Modified: trunk/libgaim/Makefile.am
===================================================================
--- trunk/libgaim/Makefile.am	2006-08-20 07:11:09 UTC (rev 16897)
+++ trunk/libgaim/Makefile.am	2006-08-20 07:13:35 UTC (rev 16898)
@@ -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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.