The current code was a mix of r78302 (when edbus2 support was made
optional) and r78867 (when edbus2 support was made a required
dependency).
This patch fixes a few bugs:
o The syntax of the AC_ARG_WITH call was wrong and `dbusservicedir' was
always set to "", which meant it was always installed into
${datadir}/dbus-1/services.
o The check for the value of $dbusservicedir was wrong at the end of
configure.ac, since passing "yes" to --with-dbus-services does not
make sense.
And simplifies some checks and calls now that edbus2 is mandatory.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 79454)
+++ Makefile.am (working copy)
@@ -76,11 +76,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
-if HAVE_DBUSSERVICEDIR
servicedir = @dbusservicedir@
-else
-servicedir = $(datadir)/dbus-1/services
-endif
service_DATA = org.enlightenment.Efreet.service
EXTRA_DIST = \
Index: configure.ac
===================================================================
--- configure.ac (revision 79454)
+++ configure.ac (working copy)
@@ -126,11 +126,11 @@
#AM_CONDITIONAL(DEFAULT_VISIBILITY, test "x$enable_hidden_visibility" != "xyes")
AM_CONDITIONAL(DEFAULT_VISIBILITY, false)
+dbusservicedir="${datadir}/dbus-1/services"
AC_ARG_WITH([dbus-services],
[AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES],
[specify a directory to store dbus service files.])],
- [dbusservicedir=$withval]
- [dbusservicedir]="")
+ [dbusservicedir=$withval])
### Checks for programs
@@ -182,7 +182,6 @@
)
requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 edbus2 >= 1.7.99 ${requirement_efreet}"
PKG_CHECK_MODULES(EFREET, [${requirement_efreet}])
-AM_CONDITIONAL([HAVE_DBUSSERVICEDIR], [! test "x${dbusservicedir}" = "x"])
### Checks for header files
@@ -285,13 +284,8 @@
echo " Strict.............: ${enable_strict_spec}"
echo " Sloppy.............: ${enable_sloppy_spec}"
echo
-if test "x$dbusservicedir" = "xyes"; then
- echo " DBus services dir....: ${dbusservicedir}"
- echo
-else
- echo " DBus services dir....: ${datadir}/dbus-1/services"
- echo
-fi
+echo " DBus services dir....: ${dbusservicedir}"
+echo
echo " Tests................: ${enable_tests}"
echo " Coverage.............: ${enable_coverage}"
echo
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
