From: cedric <cedric@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 9 Aug 2011 08:39:39 +0000 (+0000)
Subject: eina: make dlopen optional.
X-Git-Tag: 2.0_alpha~64^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfe181ff2a4277d5ce705cca709c702213b56f73;p=framework%2Fuifw%2Feina.git

eina: make dlopen optional.


git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@62236 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/configure.ac b/configure.ac
index 1a25f68..86cae0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,13 +463,13 @@ case "$host_os" in
       AC_CHECK_FUNCS([dlopen], [res="yes"], [res="no"])
       if test "x${res}" = "xyes" ; then
          AC_CHECK_FUNCS([dladdr], [AC_DEFINE(HAVE_DLADDR)])
+	 AC_DEFINE(HAVE_DLOPEN)
       else
          AC_CHECK_LIB([dl], [dlopen], [res="yes"], [res="no"])
          if test "x${res}" = "xyes" ; then
             AC_CHECK_LIB([dl], [dladdr], [AC_DEFINE(HAVE_DLADDR)])
+	    AC_DEFINE(HAVE_DLOPEN)
             dlopen_libs="-ldl"
-         else
-            AC_MSG_ERROR([Cannot find dlopen])
          fi
       fi
       ;;
diff --git a/src/lib/eina_module.c b/src/lib/eina_module.c
index 16ff18b..d3d3f70 100644
--- a/src/lib/eina_module.c
+++ b/src/lib/eina_module.c
@@ -46,7 +46,9 @@ void *alloca (size_t);
 # include <libgen.h>
 #endif
 
-#include <dlfcn.h>
+#ifdef HAVE_DLOPEN
+# include <dlfcn.h>
+#endif
 
 #ifdef HAVE_EVIL
 # include <Evil.h>
@@ -313,6 +315,7 @@ EAPI Eina_Bool eina_module_free(Eina_Module *m)
 
 EAPI Eina_Bool eina_module_load(Eina_Module *m)
 {
+#ifdef HAVE_DLOPEN
    void *dl_handle;
    Eina_Module_Init *initcall;
 
@@ -352,10 +355,14 @@ loaded:
 
    eina_error_set(0);
    return EINA_TRUE;
+#else
+   return EINA_FALSE;
+#endif
 }
 
 EAPI Eina_Bool eina_module_unload(Eina_Module *m)
 {
+#ifdef HAVE_DLOPEN
    Eina_Module_Shutdown *shut;
    EINA_SAFETY_ON_NULL_RETURN_VAL(m, EINA_FALSE);
 
@@ -375,13 +382,20 @@ EAPI Eina_Bool eina_module_unload(Eina_Module *m)
      }
 
    return EINA_FALSE;
+#else
+   return EINA_FALSE;
+#endif
 }
 
 EAPI void *eina_module_symbol_get(const Eina_Module *m, const char *symbol)
 {
+#ifdef HAVE_DLOPEN
    EINA_SAFETY_ON_NULL_RETURN_VAL(m,         NULL);
    EINA_SAFETY_ON_NULL_RETURN_VAL(m->handle, NULL);
    return dlsym(m->handle, symbol);
+#else
+   return NULL;
+#endif
 }
 
 EAPI const char *eina_module_file_get(const Eina_Module *m)