muine r1225 - in trunk: . deps

[lmedinas svn gnome org]

Author: lmedinas
Date: Sun Sep 28 16:06:54 2008
New Revision: 1225
URL: http://svn.gnome.org/viewvc/muine?rev=1225&view=rev

Log:
2008-09-28  Luis Medinas  <lmedinas gnome org>

        * configure.in:
        * Makefile.am:

        Remove internal NDesk-DBus-sharp. Fixes bgo #553292.


Removed:
   trunk/deps/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Sep 28 16:06:54 2008
@@ -3,7 +3,6 @@
 SUBDIRS = 		\
 	data		\
 	libmuine	\
-	deps		\
 	PluginLib	\
 	DBusLib		\
 	src		\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Sep 28 16:06:54 2008
@@ -67,14 +67,13 @@
 		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED \
 		  gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED)
 
-dnl external ndesk-dbus
-
+dnl ndesk-dbus
 PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 \
-	ndesk-dbus-glib-1.0 >= 0.3, have_external_dbus="yes", have_external_dbus="no")
-if test "x$have_external_dbus" != "xyes"; then
-	AC_MSG_RESULT([using internal copy])
+	ndesk-dbus-glib-1.0 >= 0.3, have_dbus="yes", have_dbus="no")
+if test "x$have_dbus" != "xyes"; then
+	AC_MSG_ERROR([You need NDESK-DBUS)])
 fi
-AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
+AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_dbus" = "xyes")
 
 dnl inotify
 
@@ -221,10 +220,6 @@
 DBusLib/Makefile
 src/Makefile
 plugins/Makefile
-deps/Makefile
-deps/dbus-sharp/Makefile
-deps/dbus-sharp-glib/Makefile
-deps/dbus-sharp-glib/NDesk.DBus.GLib.dll.config
 doc/Makefile
 m4/Makefile
 po/Makefile.in