[EGIT] [core/enlightenment] origin/enlightenment-0.17 02/02: Revert "s/edbus/eldbus/g"

[discomfitor]

discomfitor pushed a commit to branch origin/enlightenment-0.17.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=30a622e720f88359c41065b648d81778f4769efc

commit 30a622e720f88359c41065b648d81778f4769efc
Author: discomfitor <michael.blumenkra...@gmail.com>
Date:   Thu Sep 19 19:51:33 2013 +0100

    Revert "s/edbus/eldbus/g"
    
    This reverts commit 173918dfb579bdd339d436fc816bfac973031a3d.
---
 configure.ac | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index c262240..5153e32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,7 +347,7 @@ test "x${device_backend}" = "xeeze" || 
AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable
 
 DBUS_MOUNT_CONFIG=1
 dbus_mount="dbus-1"
-hal_mount="ehal >= $efl_version, eldbus >= $efl_version"
+hal_mount="ehal >= $efl_version, edbus >= $efl_version"
 udisks_mount="eukit >= $efl_version"
 AC_ARG_ENABLE([mount-hal],
   AS_HELP_STRING([--enable-mount-hal],[enable hal mounting support 
@<:@default=enabled@:>@]),
@@ -485,7 +485,7 @@ ecore-file >= $efl_version \
 ecore-ipc >= $efl_version \
 eet >= $efl_version \
 efreet >= $efl_version \
-eldbus >= $efl_version \
+edbus >= $efl_version \
 eina >= $efl_version"
 efm_requires="$efm_requires $eeze_mount $dbus_mount $hal_mount $udisks_mount"
 
@@ -497,7 +497,7 @@ PKG_CHECK_MODULES(E_FM_CMDLINE, [
   eina >= ${efl_version}
   ecore >= ${efl_version}
   ecore-file >= ${efl_version}
-  eldbus >= ${efl_version}
+  edbus >= ${efl_version}
   dbus-1
 ])
 
@@ -555,7 +555,7 @@ PKG_CHECK_MODULES(E, [
   efreet-trash >= ${efl_version}
   eina >= ${efl_version}
   dbus-1
-  eldbus >= ${efl_version}
+  edbus >= ${efl_version}
   eio >= ${efl_version}
   $hal_mount
   $eeze_mount
@@ -577,7 +577,7 @@ efreet-mime >= ${efl_version} \
 efreet-trash >= ${efl_version} \
 eina >= ${efl_version} \
 dbus-1 \
-eldbus >= ${efl_version} \
+edbus >= ${efl_version} \
 eio >= ${efl_version} \
 $hal_mount \
 $udisks_mount \
@@ -729,7 +729,7 @@ AC_ARG_ENABLE([enotify],
   AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
 )
 if test "x$e_cv_want_enotify" != "xno" ; then
-  AC_E_CHECK_PKG(ENOTIFY, [ eldbus >= $efl_version enotify >= $efl_version ], 
+  AC_E_CHECK_PKG(ENOTIFY, [ edbus >= $efl_version enotify >= $efl_version ], 
   [
     AC_DEFINE_UNQUOTED([HAVE_ENOTIFY], [1], [enable enotify])
   ], 
@@ -815,7 +815,7 @@ AM_CONDITIONAL(HAVE_ECONNMAN, false)
 AM_CONDITIONAL(HAVE_DUMMY, false)
 define([CHECK_MODULE_CONNMAN],
 [
-  AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false])
+  AC_E_CHECK_PKG(ECONNMAN, [ edbus >= $efl_version ], [], [CONNMAN=false])
 dnl  AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false])
 ])
 AC_SUBST(ECONNMAN_CFLAGS)

--