# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1220568986 0
# Node ID 5a96b250b36dc31e1a1f061a68ab005713478b06
# Parent  85bed17fe5c134f93b2d73ca1aea36a5966df7ab# Parent  635b7cd191100c83543e72247b565b6b86c04e46
merge of '44df11dd9d1db0245be1ab1ac5410821b1c9f2af'
     and '47119315e21668ee63084a57c70abbbba5400cb4'

diff -r 85bed17fe5c1 -r 5a96b250b36d configure.ac
--- 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 #######################################################################
diff -r 85bed17fe5c1 -r 5a96b250b36d finch/libgnt/wms/Makefile.am
--- 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 =