Merge remote-tracking branch 'njsf/for-steve' into njsf-dbus

diff --cc configure.ac
Simple merge

diff --cc modules/Makefile.am
Simple merge

diff --cc modules/dbus/Makefile.am
index 6797ad6,723b877..fc6c2fa
--- 1/modules/dbus/Makefile.am
--- 2/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@@ -50,25 -50,8 +50,25 @@@ headerdir = $(includedir)/$(instvarsepd
  AM_CFLAGS = $(dll_cflags) -DIMA_MODULE -DUSE_SXEMACS_CONFIG_H
  AM_CPPFLAGS = -I$(srcdir) -I$(builddir)  -I$(top_srcdir)/src \
        -I$(top_builddir)/src $(SXEMACS_INCLUDES) $(c_switch_all)
- AM_LDFLAGS = -module
+ AM_LDFLAGS = -module $(XCCLDFLAGS)
  
 +## mods
 +module_LTLIBRARIES = 
 +
 +BUILT_SOURCES = 
 +
 +header_HEADERS =
 +
 +module_LTLIBRARIES += sxe-dbus.la
 +
 +sxe_dbus_la_SOURCES = dbusbind.c
 +
 +nodist_sxe_dbus_la_SOURCES = dbusbind.doc.c
 +
 +sxe_dbus_la_CFLAGS = $(AM_CFLAGS) -DEMOD_SXE_DBUS
 +
 +CLEANFILES = $(BUILT_SOURCES) auto-autoloads.el{,c} libsxe-dbus.a
 +
  ## custom rules
  SXEMACS = $(top_builddir)/src/sxemacs
  make_docfile = $(MAKE_DOCFILE)