summaryrefslogtreecommitdiff
path: root/legacy/efreet/configure.ac
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2012-10-21 08:09:05 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2012-10-21 08:09:05 +0000
commitc204c6c2c2543574a71d7628a5aac37bb555c237 (patch)
tree29578c313146e99b9526d8865191106d1402b350 /legacy/efreet/configure.ac
parentcacd9955abdfad6a5542c7812d85ca0b237b0ae3 (diff)
efreet: Fixed build break without edbus2. Patch by vtorri.
Thanks a lot vtorri! I tested this with/without edbus2. SVN revision: 78302
Diffstat (limited to 'legacy/efreet/configure.ac')
-rw-r--r--legacy/efreet/configure.ac45
1 files changed, 26 insertions, 19 deletions
diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac
index fb11f00ecd..3a2b5470ec 100644
--- a/legacy/efreet/configure.ac
+++ b/legacy/efreet/configure.ac
@@ -126,6 +126,12 @@ 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
129AC_ARG_WITH([dbus-services],
130 [AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES],
131 [specify a directory to store dbus service files.])],
132 [dbusservicedir=$withval]
133 [dbusservicedir]="")
134
129 135
130### Checks for programs 136### Checks for programs
131AC_PROG_CC 137AC_PROG_CC
@@ -168,25 +174,21 @@ AC_SUBST(EFL_EFREET_TRASH_BUILD)
168 174
169service="" 175service=""
170have_efreetd="" 176have_efreetd=""
171dbusservicedir="" 177PKG_CHECK_MODULES([EFREETD],
172PKG_CHECK_MODULES(EFREETD, [ 178 [
173 eina >= 1.7.99 179 eina >= 1.7.99
174 ecore >= 1.7.99 180 ecore >= 1.7.99
175 ecore-file >= 1.7.99 181 ecore-file >= 1.7.99
176 edbus2 >= 1.7.99 182 edbus2 >= 1.7.99
177], [ 183 ],
184 [
178 have_efreetd="yes" 185 have_efreetd="yes"
179 service="org.enlightenment.Efreet.service" 186 service="org.enlightenment.Efreet.service"
180 requirement_efreet="edbus2 ${requirement_efreet}" 187 requirement_efreet="edbus2 ${requirement_efreet}"
181 dbusservicedir=${datadir}/dbus-1/services 188 ],
182 AC_ARG_WITH([dbus-services], 189 [have_efreetd="no"])
183 AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES], [specify a directory to store dbus service files.]), 190
184 [ dbusservicedir=$withval ] 191AM_CONDITIONAL([HAVE_DBUSSERVICEDIR], [! test "x${dbusservicedir}" = "x"])
185 )
186
187 ], [
188 have_efreetd="no"
189])
190AM_CONDITIONAL([HAVE_EFREETD], [test "x${have_efreetd}" = "xyes"]) 192AM_CONDITIONAL([HAVE_EFREETD], [test "x${have_efreetd}" = "xyes"])
191 193
192requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 ${requirement_efreet}" 194requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 ${requirement_efreet}"
@@ -294,9 +296,14 @@ echo " Specification compliance:"
294echo " Strict.............: ${enable_strict_spec}" 296echo " Strict.............: ${enable_strict_spec}"
295echo " Sloppy.............: ${enable_sloppy_spec}" 297echo " Sloppy.............: ${enable_sloppy_spec}"
296echo 298echo
297if test "x$have_efreetd" = "xyes"; then 299if test "x${have_efreetd}" = "xyes"; then
298 echo " DBus services dir....: ${dbusservicedir}" 300 if test "x$dbusservicedir" = "xyes"; then
299 echo 301 echo " DBus services dir....: ${dbusservicedir}"
302 echo
303 else
304 echo " DBus services dir....: $(datadir)/dbus-1/services"
305 echo
306 fi
300fi 307fi
301echo " Tests................: ${enable_tests}" 308echo " Tests................: ${enable_tests}"
302echo " Coverage.............: ${enable_coverage}" 309echo " Coverage.............: ${enable_coverage}"