summaryrefslogtreecommitdiff
path: root/legacy/efreet/configure.ac
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2012-11-20 08:50:54 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2012-11-20 08:50:54 +0000
commit6824e47c4b850eac9aa589061a6daed533eee6b2 (patch)
treee0395a2406212faadc356aab72cbafb674f7d4bc /legacy/efreet/configure.ac
parent3a9784e8e22908fdfa5a452d6c2de0f82f1384d5 (diff)
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
Diffstat (limited to 'legacy/efreet/configure.ac')
-rw-r--r--legacy/efreet/configure.ac14
1 files changed, 4 insertions, 10 deletions
diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac
index 2b1d59397e..bf326507f9 100644
--- a/legacy/efreet/configure.ac
+++ b/legacy/efreet/configure.ac
@@ -126,11 +126,11 @@ fi
126#AM_CONDITIONAL(DEFAULT_VISIBILITY, test "x$enable_hidden_visibility" != "xyes") 126#AM_CONDITIONAL(DEFAULT_VISIBILITY, test "x$enable_hidden_visibility" != "xyes")
127AM_CONDITIONAL(DEFAULT_VISIBILITY, false) 127AM_CONDITIONAL(DEFAULT_VISIBILITY, false)
128 128
129dbusservicedir="${datadir}/dbus-1/services"
129AC_ARG_WITH([dbus-services], 130AC_ARG_WITH([dbus-services],
130 [AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES], 131 [AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES],
131 [specify a directory to store dbus service files.])], 132 [specify a directory to store dbus service files.])],
132 [dbusservicedir=$withval] 133 [dbusservicedir=$withval])
133 [dbusservicedir]="")
134 134
135 135
136### Checks for programs 136### Checks for programs
@@ -182,7 +182,6 @@ PKG_CHECK_MODULES([EFREETD],
182) 182)
183requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 edbus2 >= 1.7.99 ${requirement_efreet}" 183requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 edbus2 >= 1.7.99 ${requirement_efreet}"
184PKG_CHECK_MODULES(EFREET, [${requirement_efreet}]) 184PKG_CHECK_MODULES(EFREET, [${requirement_efreet}])
185AM_CONDITIONAL([HAVE_DBUSSERVICEDIR], [! test "x${dbusservicedir}" = "x"])
186 185
187### Checks for header files 186### Checks for header files
188 187
@@ -285,13 +284,8 @@ echo " Specification compliance:"
285echo " Strict.............: ${enable_strict_spec}" 284echo " Strict.............: ${enable_strict_spec}"
286echo " Sloppy.............: ${enable_sloppy_spec}" 285echo " Sloppy.............: ${enable_sloppy_spec}"
287echo 286echo
288if test "x$dbusservicedir" = "xyes"; then 287echo " DBus services dir....: ${dbusservicedir}"
289 echo " DBus services dir....: ${dbusservicedir}" 288echo
290 echo
291else
292 echo " DBus services dir....: ${datadir}/dbus-1/services"
293 echo
294fi
295echo " Tests................: ${enable_tests}" 289echo " Tests................: ${enable_tests}"
296echo " Coverage.............: ${enable_coverage}" 290echo " Coverage.............: ${enable_coverage}"
297echo 291echo