elementary: remove build dependencie from old e_dbus.

SVN revision: 82517

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index d65319c..c62baa9 100644 (file)
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -894,3 +894,8 @@
 2013-01-06  Jaehyun Cho <jae_hyun_cho@naver.com>
 
         * Fix omitting signal emission when customized text parts change the text.
+
+2013-01-10  Cedric Bail
+
+       * Don't link anymore with E_DBus at build time.
+

diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 590a652..73c778b 100644 (file)
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -50,6 +50,7 @@ Improvements:
    * Merged the file_entry and the path_entry in the fileselector and allowing typing the path.
    * Setting the same font size of the others widgets for the dayselector.
    * Added a separated spinner for year on calendar.
+   * Don't link anymore with E_DBus at build time.
 
 Fixes:
 

diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac
index 2601f82..39c307b 100644 (file)
--- a/legacy/elementary/configure.ac
+++ b/legacy/elementary/configure.ac
@@ -472,34 +472,6 @@ if test "x$want_elementary_wayland" = "xyes" -a "x$have_elementary_wayland" = "x
     AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.])
 fi
 
-ELM_EDBUS_DEF="#undef"
-have_elementary_edbus="no"
-want_elementary_edbus="no"
-AC_ARG_ENABLE([edbus],
-   [AC_HELP_STRING([--enable-edbus], [enable edbus (v1) support. @<:@default=no@:>@])],
-   [want_elementary_edbus=$enableval], [])
-
-if test "x$want_elementary_edbus" != "xno"; then
-    PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
-       [
-        edbus >= 1.6.99
-       ],
-       [
-        AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
-        have_elementary_edbus="yes"
-        ELM_EDBUS_DEF="#define"
-        requirement_elm="edbus >= 1.6.99 ${requirement_elm}"
-       ],
-       [have_elementary_edbus="no"]
-    )
-else
-    have_elementary_edbus="no"
-fi
-if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno"; then
-    AC_MSG_ERROR([E_DBus support requested, but no e_dbus found by pkg-config.])
-fi
-AC_SUBST(ELM_EDBUS_DEF)
-
 ELM_EDBUS2_DEF="#undef"
 have_elementary_edbus2="no"
 want_elementary_edbus2="auto"
@@ -873,7 +845,7 @@ echo
 echo "  Features:"
 echo "    Ecore_IMF..............: ${have_ecore_imf}"
 echo "    Ecore_Con..............: ${have_ecore_con}"
-echo "    EDBus..................: v1=${have_elementary_edbus}, v2=${have_elementary_edbus2}"
+echo "    EDBus..................: v2=${have_elementary_edbus2}"
 echo "    EFreet.................: ${have_elementary_efreet}"
 echo "    EWeather...............: ${have_elementary_eweather}"
 echo "    EMap...................: ${have_elementary_emap}"

diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am
index 12bf6ef..b1ae935 100644 (file)
--- a/legacy/elementary/src/bin/Makefile.am
+++ b/legacy/elementary/src/bin/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_SDL_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
@@ -145,7 +144,6 @@ endif
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
-       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EDBUS2_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
        @ELEMENTARY_ELOCATION_LIBS@ \
@@ -161,7 +159,6 @@ config.c
 
 elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
-       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EDBUS2_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
        @ELEMENTARY_ELOCATION_LIBS@ \
@@ -178,7 +175,6 @@ elementary_codegen.c
 elementary_codegen_LDADD = \
        $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
-       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EDBUS2_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
        @ELEMENTARY_ELOCATION_LIBS@ \
@@ -209,7 +205,6 @@ if BUILD_QUICKLAUNCH
 elementary_quicklaunch_SOURCES = quicklaunch.c
 elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
-       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EDBUS2_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
        @ELEMENTARY_ELOCATION_LIBS@ \
@@ -236,7 +231,6 @@ elementary_testql_LTLIBRARIES = elementary_testql.la
 elementary_testql_la_SOURCES = $(elementary_test_SOURCES)
 elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
-       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EDBUS2_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
        @ELEMENTARY_ELOCATION_LIBS@ \
@@ -251,7 +245,6 @@ elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
 elementary_testql_SOURCES = $(elementary_test_SOURCES)
 elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
-       @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EDBUS2_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
        @ELEMENTARY_ELOCATION_LIBS@ \

diff --git a/legacy/elementary/src/edje_externals/Makefile.am b/legacy/elementary/src/edje_externals/Makefile.am
index 3dfb933..eec2463 100644 (file)
--- a/legacy/elementary/src/edje_externals/Makefile.am
+++ b/legacy/elementary/src/edje_externals/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_FB_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \

diff --git a/legacy/elementary/src/examples/Makefile.am b/legacy/elementary/src/examples/Makefile.am
index 00edbd1..9f07759 100644 (file)
--- a/legacy/elementary/src/examples/Makefile.am
+++ b/legacy/elementary/src/examples/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \

diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 04b7b0b..6e4bb9a 100644 (file)
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -10,7 +10,6 @@
 @ELM_UNIX_DEF@ ELM_UNIX
 @ELM_WIN32_DEF@ ELM_WIN32
 @ELM_WINCE_DEF@ ELM_WINCE
-@ELM_EDBUS_DEF@ ELM_EDBUS
 @ELM_EDBUS2_DEF@ ELM_EDBUS2
 @ELM_EFREET_DEF@ ELM_EFREET
 @ELM_ELOCATION_DEF@ ELM_ELOCATION
@@ -75,9 +74,6 @@
 @ELEMENTARY_ECORE_CON_INC@
 #include <Edje.h>
 
-#ifdef ELM_EDBUS
-#include <E_DBus.h>
-#endif
 #ifdef ELM_EDBUS2
 #include <EDBus.h>
 #endif

diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index 6ab1f76..a09a6dd 100644 (file)
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_SDL_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
@@ -316,7 +315,6 @@ libelementary_la_LIBADD = \
 @ELEMENTARY_SDL_LIBS@ \
 @ELEMENTARY_WIN32_LIBS@ \
 @ELEMENTARY_WINCE_LIBS@ \
-@ELEMENTARY_EDBUS_LIBS@ \
 @ELEMENTARY_EDBUS2_LIBS@ \
 @ELEMENTARY_EFREET_LIBS@ \
 @ELEMENTARY_ELOCATION_LIBS@ \

diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c
index a9c1236..bb1c359 100644 (file)
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@@ -359,30 +359,38 @@ elm_app_locale_dir_get(void)
    return app_locale_dir;
 }
 
-#ifdef ELM_EDBUS
 static Eina_Bool _elm_need_e_dbus = EINA_FALSE;
-#endif
+static void *e_dbus_handle = NULL;
+
 EAPI Eina_Bool
 elm_need_e_dbus(void)
 {
-#ifdef ELM_EDBUS
+   int (*init_func)(void) = NULL;
+
    if (_elm_need_e_dbus) return EINA_TRUE;
+   /* FIXME: Maybe we should use RTLD_NOLOAD */
+   if (!e_dbus_handle) dlopen("libedbus.so", RTLD_LAZY | RTLD_GLOBAL);
+   if (!e_dbus_handle) return EINA_FALSE;
+   init_func = dlsym(e_dbus_handle, "e_dbus_init");
+   if (!init_func) return EINA_FALSE;
    _elm_need_e_dbus = EINA_TRUE;
-   e_dbus_init();
+   init_func();
    return EINA_TRUE;
-#else
-   return EINA_FALSE;
-#endif
 }
 
 static void
 _elm_unneed_e_dbus(void)
 {
-#ifdef ELM_EDBUS
+   int (*shutdown_func)(void) = NULL;
+
    if (!_elm_need_e_dbus) return;
+   shutdown_func = dlsym(e_dbus_handle, "e_dbus_shutdown");
+   if (!shutdown_func) return;
    _elm_need_e_dbus = EINA_FALSE;
-   e_dbus_shutdown();
-#endif
+   shutdown_func();
+
+   dlclose(e_dbus_handle);
+   e_dbus_handle = NULL;
 }
 
 #ifdef ELM_EDBUS2

diff --git a/legacy/elementary/src/modules/access_output/Makefile.am b/legacy/elementary/src/modules/access_output/Makefile.am
index b1c3343..04b866d 100644 (file)
--- a/legacy/elementary/src/modules/access_output/Makefile.am
+++ b/legacy/elementary/src/modules/access_output/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_SDL_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \

diff --git a/legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am b/legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am
index 12c48ac..c95fcd8 100644 (file)
--- a/legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_SDL_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \

diff --git a/legacy/elementary/src/modules/prefs/Makefile.am b/legacy/elementary/src/modules/prefs/Makefile.am
index a819e7a..7bdcfef 100644 (file)
--- a/legacy/elementary/src/modules/prefs/Makefile.am
+++ b/legacy/elementary/src/modules/prefs/Makefile.am
@@ -32,7 +32,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_SDL_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \

diff --git a/legacy/elementary/src/modules/test_entry/Makefile.am b/legacy/elementary/src/modules/test_entry/Makefile.am
index b2bbd3d..6e74d56 100644 (file)
--- a/legacy/elementary/src/modules/test_entry/Makefile.am
+++ b/legacy/elementary/src/modules/test_entry/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_SDL_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \

diff --git a/legacy/elementary/src/modules/test_map/Makefile.am b/legacy/elementary/src/modules/test_map/Makefile.am
index 35e7e3a..afff4de 100644 (file)
--- a/legacy/elementary/src/modules/test_map/Makefile.am
+++ b/legacy/elementary/src/modules/test_map/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_SDL_CFLAGS@ \
 @ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_WINCE_CFLAGS@ \
-@ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EDBUS2_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \