diff options
author | Cedric BAIL <cedric.bail@free.fr> | 2013-01-10 07:50:14 +0000 |
---|---|---|
committer | Cedric BAIL <cedric.bail@free.fr> | 2013-01-10 07:50:14 +0000 |
commit | 426f4de6b74e310a7e2ac1755b4cf6d6f94c2c0d (patch) | |
tree | 16d9104c0f513c6b3c16617e47f60c7deb14824e /configure.ac | |
parent | 8f2ab5c7cbdd9431f51b7989de9fd73472dcb642 (diff) |
elementary: remove build dependencie from old e_dbus.
SVN revision: 82517
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 30 |
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.]) |
473 | fi | 473 | fi |
474 | 474 | ||
475 | ELM_EDBUS_DEF="#undef" | ||
476 | have_elementary_edbus="no" | ||
477 | want_elementary_edbus="no" | ||
478 | AC_ARG_ENABLE([edbus], | ||
479 | [AC_HELP_STRING([--enable-edbus], [enable edbus (v1) support. @<:@default=no@:>@])], | ||
480 | [want_elementary_edbus=$enableval], []) | ||
481 | |||
482 | if 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 | ) | ||
495 | else | ||
496 | have_elementary_edbus="no" | ||
497 | fi | ||
498 | if 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.]) | ||
500 | fi | ||
501 | AC_SUBST(ELM_EDBUS_DEF) | ||
502 | |||
503 | ELM_EDBUS2_DEF="#undef" | 475 | ELM_EDBUS2_DEF="#undef" |
504 | have_elementary_edbus2="no" | 476 | have_elementary_edbus2="no" |
505 | want_elementary_edbus2="auto" | 477 | want_elementary_edbus2="auto" |
@@ -873,7 +845,7 @@ echo | |||
873 | echo " Features:" | 845 | echo " Features:" |
874 | echo " Ecore_IMF..............: ${have_ecore_imf}" | 846 | echo " Ecore_IMF..............: ${have_ecore_imf}" |
875 | echo " Ecore_Con..............: ${have_ecore_con}" | 847 | echo " Ecore_Con..............: ${have_ecore_con}" |
876 | echo " EDBus..................: v1=${have_elementary_edbus}, v2=${have_elementary_edbus2}" | 848 | echo " EDBus..................: v2=${have_elementary_edbus2}" |
877 | echo " EFreet.................: ${have_elementary_efreet}" | 849 | echo " EFreet.................: ${have_elementary_efreet}" |
878 | echo " EWeather...............: ${have_elementary_eweather}" | 850 | echo " EWeather...............: ${have_elementary_eweather}" |
879 | echo " EMap...................: ${have_elementary_emap}" | 851 | echo " EMap...................: ${have_elementary_emap}" |