efreet: Fix and clean up the way dbusservicedir is set in the build system

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.

Patch by Raphael Kubo da Costa

SVN revision: 79464

diff --git a/legacy/efreet/Makefile.am b/legacy/efreet/Makefile.am
index 6f5993e..f76e870 100644 (file)
--- a/legacy/efreet/Makefile.am
+++ b/legacy/efreet/Makefile.am
@@ -76,11 +76,7 @@ endif
 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 = \

diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac
index 2b1d593..bf32650 100644 (file)
--- a/legacy/efreet/configure.ac
+++ b/legacy/efreet/configure.ac
@@ -126,11 +126,11 @@ fi
 #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 @@ PKG_CHECK_MODULES([EFREETD],
 )
 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 "  Specification compliance:"
 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