Mercurial > pidgin.yaz
changeset 23996:5a96b250b36d
merge of '44df11dd9d1db0245be1ab1ac5410821b1c9f2af'
and '47119315e21668ee63084a57c70abbbba5400cb4'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Thu, 04 Sep 2008 22:56:26 +0000 |
| parents | 85bed17fe5c1 (current diff) 635b7cd19110 (diff) |
| children | de712dc6fecd bb99ee66120e |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Sep 04 18:04:29 2008 +0000 +++ b/configure.ac Thu Sep 04 22:56:26 2008 +0000 @@ -1240,6 +1240,7 @@ AC_SUBST(DBUS_LIBS) enable_dbus=yes ], [ + enable_dbus=no if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ D-Bus development headers not found. @@ -1256,6 +1257,7 @@ AC_SUBST(NETWORKMANAGER_LIBS) AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) ], [ + enable_nm=no if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ NetworkManager development headers not found. @@ -1263,6 +1265,8 @@ ]) fi]) fi +else + enable_nm=no fi dnl #######################################################################
--- a/finch/libgnt/wms/Makefile.am Thu Sep 04 18:04:29 2008 +0000 +++ b/finch/libgnt/wms/Makefile.am Thu Sep 04 22:56:26 2008 +0000 @@ -1,6 +1,7 @@ +wms = irssi.la if PURPLE_AVAILABLE # These custom wms depend on libpurple -purple_wms = s.la irssi.la +purple_wms = s.la else purple_wms = endif @@ -9,6 +10,7 @@ irssi_la_LDFLAGS = -module -avoid-version plugin_LTLIBRARIES = \ + $(wms) \ $(purple_wms) plugindir = $(libdir)/gnt @@ -16,12 +18,12 @@ irssi_la_SOURCES = irssi.c irssi_la_LIBADD = \ $(GLIB_LIBS) \ - $(top_builddir)/finch/libgnt/libgnt.la + ../libgnt.la s_la_SOURCES = s.c s_la_LIBADD = \ $(GLIB_LIBS) \ - $(top_builddir)/finch/libgnt/libgnt.la \ + ../libgnt.la \ $(top_builddir)/libpurple/libpurple.la EXTRA_DIST =