Mercurial > pidgin.yaz
changeset 14217:28b1cebaa328
[gaim-migrate @ 16898]
libgaim and gaim should not link against ncursesw.
libgaim should not link against gstreamer.
committer: Tailor Script <tailor@pidgin.im>
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 20 Aug 2006 07:13:35 +0000 |
| parents | e9dd2f76e61b |
| children | c509b8b8a646 |
| files | configure.ac console/libgnt/Makefile.am libgaim/Makefile.am |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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 #######################################################################
--- 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) \
--- 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)