Fix dbus build.

This changeset does just enough to get the new dbus emodule built.  Please
note that this doesn't mean dbus in SXEmacs is now done.  There is more to
come.  This JUST puts a bandaid on the build chain so it will build.

	* modules/dbus/Makefile.am (module_LTLIBRARIES): Set to `dbusbind.la'

	* modules/dbus/Makefile.am (BUILT_SOURCES): Remove non-generated
	sources.

	* modules/dbus/Makefile.am (dbus_la_SOURCES): Renamed from
	`sxe_dbus_la_SOURCES'.

	* modules/dbus/Makefile.am (nodist_dbus_la_SOURCES): Renamed from
	`nodist_sxe_dbus_la_SOURCES'.

	* modules/dbus/Makefile.am (dbus_la_CFLAGS): Renamed from
	`sxe_dbus_la_CFLAGS'.

	* configure.ac: Set have_modules_dbus and have_static_modules_dbus
	accordingly.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/configure.ac b/configure.ac
index 83d9b5b..58ed81c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1796,7 +1796,17 @@ else
                AC_MSG_WARN([Sorry no bison means no cl module for you.])
        fi
 fi
+
 SXE_EMOD_STATMOD([cl])
+
+dnl D-Bus
+if test "$with_modules_dbus" = "yes"; then
+       have_modules_dbus=yes
+fi
+if test "$with_static_modules_dbus" = "yes"; then
+       have_static_modules_dbus=yes
+fi
+
 SXE_EMOD_STATMOD([dbus])
 
 AM_CONDITIONAL([AUTARKIC], [test "0" = "1"])

diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am
index b347fc6..db6f668 100644 (file)
--- a/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@ -53,19 +53,17 @@ AM_CPPFLAGS = -I$(srcdir) -I$(builddir)  -I$(top_srcdir)/src \
 AM_LDFLAGS = -module $(XCCLDFLAGS)
 
 ## mods
-module_LTLIBRARIES = 
+module_LTLIBRARIES = dbusbind.la
 
-BUILT_SOURCES = dbusbind.c dbusbind.doc.c
+BUILT_SOURCES = dbusbind.doc.c
 
 header_HEADERS =
 
-module_LTLIBRARIES += sxe-dbus.la
+dbus_la_SOURCES = dbusbind.c
 
-sxe_dbus_la_SOURCES = dbusbind.c
+nodist_dbus_la_SOURCES = dbusbind.doc.c
 
-nodist_sxe_dbus_la_SOURCES = dbusbind.doc.c
-
-sxe_dbus_la_CFLAGS = $(AM_CFLAGS) -DEMOD_SXE_DBUS
+dbus_la_CFLAGS = $(AM_CFLAGS) -DEMOD_SXE_DBUS
 
 CLEANFILES = $(BUILT_SOURCES) auto-autoloads.el{,c} libsxe-dbus.a
 
@@ -93,8 +91,4 @@ SUFFIXES = .doc.c
 .c.s:
        $(COMPILE) -S -c $(cflags) $<
 
-## all the mods
-module_LTLIBRARIES =
-
-BUILT_SOURCES =