diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2007-12-03 06:54:20 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2007-12-03 06:54:20 +0000 |
| commit | 868641ccd0e885f0be144851991660cd65333013 (patch) | |
| tree | fc96238fedb3d06275d0ae5d5f0302329a81a615 /configure | |
| parent | 7b13a0f20c0a3b4084d25d1dd6175159405c3218 (diff) | |
| download | emacs-868641ccd0e885f0be144851991660cd65333013.tar.gz | |
* configure.in: No need for DBUS_INFO anymore.
* configure: Regenerate.
* Makefile.in (INFO_FILES): Use dbus unconditionally.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure b/configure index 64ee12f83f7..122bddb939f 100755 --- 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 |