* configure.in: No need for DBUS_INFO anymore.

* configure: Regenerate.

* Makefile.in (INFO_FILES): Use dbus unconditionally.

diff --git a/ChangeLog b/ChangeLog
index 233567fa5b360cabd176ddbe6452872c8b4042b9..75014df3b33081fc31e985a3c995813bdcbcbc8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-03  Michael Albinus  <michael.albinus@gmx.de>
+
+       * configure.in: No need for DBUS_INFO anymore.
+
+       * configure: Regenerate.
+
+       * Makefile.in (INFO_FILES): Use dbus unconditionally.
+
 2007-12-02  Michael Albinus  <michael.albinus@gmx.de>
 
        * configure.in: Add D-Bus checks.  D-Bus is disabled by default.

diff --git a/Makefile.in b/Makefile.in
index a7a8ee54b32499bfa15e8157c24cbd6b01ea18c6..b3de304491a4f8c43590f13e0b7715619d188ea7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -138,11 +138,11 @@ man1dir=$(mandir)/man1
 # since there are now many packages documented with the texinfo
 # system, it is inappropriate to imply that it is part of Emacs.
 infodir=@infodir@
-INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \
-           eintr elisp emacs emacs-mime erc eshell eudc flymake forms  \
-           gnus idlwave info message mh-e newsticker nxml-mode org     \
-           pcl-cvs pgg rcirc reftex remember sc ses sieve speedbar     \
-           tramp vip viper widget woman smtpmail url @DBUS_INFO@
+INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
+           efaq eintr elisp emacs emacs-mime erc eshell eudc flymake   \
+           forms gnus idlwave info message mh-e newsticker nxml-mode   \
+           org pcl-cvs pgg rcirc reftex remember sc ses sieve speedbar \
+           tramp vip viper widget woman smtpmail url
 
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@

diff --git a/configure b/configure
index 64ee12f83f757a02cbf8a0ccffdc43f7919d0749..122bddb939feb20d0071d0c79e04a460a260b1c6 100755 (executable)
--- a/configure
+++ b/configure
@@ -694,7 +694,6 @@ GTK_CFLAGS
 GTK_LIBS
 DBUS_CFLAGS
 DBUS_LIBS
-DBUS_INFO
 XFT_CFLAGS
 XFT_LIBS
 ALLOCA
@@ -12080,11 +12079,9 @@ _ACEOF
 
       DBUS_LIBS="-ldbus-1"
 
-      DBUS_INFO="dbus"
    fi
 fi
 
-
 ### Link with -lXft if available to work around a bug.
 HAVE_XFT=maybe
 if test "${HAVE_GTK}" = "yes"; then
@@ -24668,7 +24665,6 @@ GTK_CFLAGS!$GTK_CFLAGS$ac_delim
 GTK_LIBS!$GTK_LIBS$ac_delim
 DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
 DBUS_LIBS!$DBUS_LIBS$ac_delim
-DBUS_INFO!$DBUS_INFO$ac_delim
 XFT_CFLAGS!$XFT_CFLAGS$ac_delim
 XFT_LIBS!$XFT_LIBS$ac_delim
 ALLOCA!$ALLOCA$ac_delim
@@ -24687,6 +24683,7 @@ lispdir!$lispdir$ac_delim
 locallisppath!$locallisppath$ac_delim
 lisppath!$lisppath$ac_delim
 x_default_search_path!$x_default_search_path$ac_delim
+etcdir!$etcdir$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -24728,7 +24725,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-etcdir!$etcdir$ac_delim
 archlibdir!$archlibdir$ac_delim
 bitmapdir!$bitmapdir$ac_delim
 gamedir!$gamedir$ac_delim
@@ -24745,7 +24741,7 @@ carbon_appdir!$carbon_appdir$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/configure.in b/configure.in
index c372f5c209f3f1e75fa2088e8732b1420d7e998b..9ddc30fdafc9dae6472984881444aeb8026a9cae 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2271,12 +2271,8 @@ if test "${with_dbus}" = "yes"; then
       AC_SUBST(DBUS_CFLAGS)
       DBUS_LIBS="-ldbus-1"
       AC_SUBST(DBUS_LIBS)
-      DBUS_INFO="dbus"
    fi
 fi
-dnl This must be substituted always, because the top level Makefile
-dnl cannot check for $HAVE_DBUS.
-AC_SUBST(DBUS_INFO)
 
 ### Link with -lXft if available to work around a bug.
 HAVE_XFT=maybe