kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Elementary: Quicklaunch support depends on dlopen, which is now non-mandatory 

SVN revision: 64093
This commit is contained in:
Youness Alaoui 2011-10-15 09:48:42 +00:00
parent 5597898394
commit 556929b900
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/elementary/configure.ac
View File

@ -122,6 +122,7 @@ ELM_UNIX_DEF="#undef"
ELM_WIN32_DEF="#undef" ELM_WIN32_DEF="#undef"
ELM_WINCE_DEF="#undef" ELM_WINCE_DEF="#undef"
have_windows="no" have_windows="no"
have_dlopen="no"
case "$host_os" in case "$host_os" in
mingw32ce* | cegcc*) mingw32ce* | cegcc*)
PKG_CHECK_MODULES([EVIL], [evil]) PKG_CHECK_MODULES([EVIL], [evil])
@ -131,6 +132,7 @@ case "$host_os" in
have_windows="yes" have_windows="yes"
dnl managed by evil dnl managed by evil
AC_DEFINE(HAVE_DLADDR) AC_DEFINE(HAVE_DLADDR)
have_dlopen="yes"
dlopen_libs=-ldl dlopen_libs=-ldl
requirement_elm="evil" requirement_elm="evil"
have_socket="no" have_socket="no"
@ -143,6 +145,7 @@ dnl managed by evil
have_windows="yes" have_windows="yes"
dnl managed by evil dnl managed by evil
AC_DEFINE(HAVE_DLADDR) AC_DEFINE(HAVE_DLADDR)
have_dlopen="yes"
dlopen_libs=-ldl dlopen_libs=-ldl
requirement_elm="evil" requirement_elm="evil"
have_socket="no" have_socket="no"
@ -150,11 +153,13 @@ dnl managed by evil
*solaris*) *solaris*)
ELM_UNIX_DEF="#define" ELM_UNIX_DEF="#define"
have_socket="yes" have_socket="yes"
have_dlopen="yes"
AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) AC_CHECK_LIB([socket], [connect], [], [have_socket="no"])
;; ;;
darwin*) darwin*)
ELM_UNIX_DEF="#define" ELM_UNIX_DEF="#define"
have_socket="yes" have_socket="yes"
have_dlopen="yes"
AC_CHECK_HEADERS([crt_externs.h]) AC_CHECK_HEADERS([crt_externs.h])
AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."]) AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."])
;; ;;
@ -163,13 +168,13 @@ dnl managed by evil
AC_CHECK_FUNCS(dlopen, res=yes, res=no) AC_CHECK_FUNCS(dlopen, res=yes, res=no)
if test "x$res" = "xyes"; then if test "x$res" = "xyes"; then
AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR)) AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR))
have_dlopen="yes"
else else
AC_CHECK_LIB(dl, dlopen, res=yes, res=no) AC_CHECK_LIB(dl, dlopen, res=yes, res=no)
if test "x$res" = "xyes"; then if test "x$res" = "xyes"; then
AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR)) AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR))
dlopen_libs=-ldl dlopen_libs=-ldl
else have_dlopen="yes"
AC_MSG_ERROR(Cannot find dlopen)
fi fi
fi fi
have_socket="yes" have_socket="yes"
@ -195,7 +200,7 @@ if test "x$want_quicklaunch" != "xno"; then
AC_DEFINE(HAVE_FORK) AC_DEFINE(HAVE_FORK)
]) ])
fi fi
AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes"]) AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes" && "x$have_dlopen" = "xyes"])
AC_SUBST(dlopen_libs) AC_SUBST(dlopen_libs)
AC_SUBST(lt_enable_auto_import) AC_SUBST(lt_enable_auto_import)

2
legacy/elementary/src/lib/elm_main.c
View File

@ -2,7 +2,9 @@
# include "elementary_config.h" # include "elementary_config.h"
#endif #endif
#ifdef HAVE_FORK
#include <dlfcn.h> /* dlopen,dlclose,etc */ #include <dlfcn.h> /* dlopen,dlclose,etc */
#endif
#ifdef HAVE_CRT_EXTERNS_H #ifdef HAVE_CRT_EXTERNS_H
# include <crt_externs.h> # include <crt_externs.h>