summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2013-01-10 07:50:14 +0000
committerCedric BAIL <cedric.bail@free.fr>2013-01-10 07:50:14 +0000
commit426f4de6b74e310a7e2ac1755b4cf6d6f94c2c0d (patch)
tree16d9104c0f513c6b3c16617e47f60c7deb14824e /configure.ac
parent8f2ab5c7cbdd9431f51b7989de9fd73472dcb642 (diff)
elementary: remove build dependencie from old e_dbus.
SVN revision: 82517
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac30
1 files changed, 1 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index 2601f820d..39c307bae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,34 +472,6 @@ if test "x$want_elementary_wayland" = "xyes" -a "x$have_elementary_wayland" = "x
472 AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.]) 472 AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.])
473fi 473fi
474 474
475ELM_EDBUS_DEF="#undef"
476have_elementary_edbus="no"
477want_elementary_edbus="no"
478AC_ARG_ENABLE([edbus],
479 [AC_HELP_STRING([--enable-edbus], [enable edbus (v1) support. @<:@default=no@:>@])],
480 [want_elementary_edbus=$enableval], [])
481
482if test "x$want_elementary_edbus" != "xno"; then
483 PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
484 [
485 edbus >= 1.6.99
486 ],
487 [
488 AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
489 have_elementary_edbus="yes"
490 ELM_EDBUS_DEF="#define"
491 requirement_elm="edbus >= 1.6.99 ${requirement_elm}"
492 ],
493 [have_elementary_edbus="no"]
494 )
495else
496 have_elementary_edbus="no"
497fi
498if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno"; then
499 AC_MSG_ERROR([E_DBus support requested, but no e_dbus found by pkg-config.])
500fi
501AC_SUBST(ELM_EDBUS_DEF)
502
503ELM_EDBUS2_DEF="#undef" 475ELM_EDBUS2_DEF="#undef"
504have_elementary_edbus2="no" 476have_elementary_edbus2="no"
505want_elementary_edbus2="auto" 477want_elementary_edbus2="auto"
@@ -873,7 +845,7 @@ echo
873echo " Features:" 845echo " Features:"
874echo " Ecore_IMF..............: ${have_ecore_imf}" 846echo " Ecore_IMF..............: ${have_ecore_imf}"
875echo " Ecore_Con..............: ${have_ecore_con}" 847echo " Ecore_Con..............: ${have_ecore_con}"
876echo " EDBus..................: v1=${have_elementary_edbus}, v2=${have_elementary_edbus2}" 848echo " EDBus..................: v2=${have_elementary_edbus2}"
877echo " EFreet.................: ${have_elementary_efreet}" 849echo " EFreet.................: ${have_elementary_efreet}"
878echo " EWeather...............: ${have_elementary_eweather}" 850echo " EWeather...............: ${have_elementary_eweather}"
879echo " EMap...................: ${have_elementary_emap}" 851echo " EMap...................: ${have_elementary_emap}"