summaryrefslogtreecommitdiff
path: root/legacy/elementary/configure.ac
diff options
context:
space:
mode:
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>2011-10-15 09:48:42 +0000
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>2011-10-15 09:48:42 +0000
commit556929b900077f8d4b742d8e66403ee6a480575b (patch)
tree582e7889fce109fa91cec4e3b4186ef296fc644e /legacy/elementary/configure.ac
parent5597898394caa500804613e772da3593035ccf65 (diff)
Elementary: Quicklaunch support depends on dlopen, which is now non-mandatory
SVN revision: 64093
Diffstat (limited to 'legacy/elementary/configure.ac')
-rw-r--r--legacy/elementary/configure.ac11
1 files changed, 8 insertions, 3 deletions
diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac
index ab0955e..a336a77 100644
--- a/legacy/elementary/configure.ac
+++ b/legacy/elementary/configure.ac
@@ -122,6 +122,7 @@ ELM_UNIX_DEF="#undef"
122ELM_WIN32_DEF="#undef" 122ELM_WIN32_DEF="#undef"
123ELM_WINCE_DEF="#undef" 123ELM_WINCE_DEF="#undef"
124have_windows="no" 124have_windows="no"
125have_dlopen="no"
125case "$host_os" in 126case "$host_os" in
126 mingw32ce* | cegcc*) 127 mingw32ce* | cegcc*)
127 PKG_CHECK_MODULES([EVIL], [evil]) 128 PKG_CHECK_MODULES([EVIL], [evil])
@@ -131,6 +132,7 @@ case "$host_os" in
131 have_windows="yes" 132 have_windows="yes"
132dnl managed by evil 133dnl managed by evil
133 AC_DEFINE(HAVE_DLADDR) 134 AC_DEFINE(HAVE_DLADDR)
135 have_dlopen="yes"
134 dlopen_libs=-ldl 136 dlopen_libs=-ldl
135 requirement_elm="evil" 137 requirement_elm="evil"
136 have_socket="no" 138 have_socket="no"
@@ -143,6 +145,7 @@ dnl managed by evil
143 have_windows="yes" 145 have_windows="yes"
144dnl managed by evil 146dnl managed by evil
145 AC_DEFINE(HAVE_DLADDR) 147 AC_DEFINE(HAVE_DLADDR)
148 have_dlopen="yes"
146 dlopen_libs=-ldl 149 dlopen_libs=-ldl
147 requirement_elm="evil" 150 requirement_elm="evil"
148 have_socket="no" 151 have_socket="no"
@@ -150,11 +153,13 @@ dnl managed by evil
150 *solaris*) 153 *solaris*)
151 ELM_UNIX_DEF="#define" 154 ELM_UNIX_DEF="#define"
152 have_socket="yes" 155 have_socket="yes"
156 have_dlopen="yes"
153 AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) 157 AC_CHECK_LIB([socket], [connect], [], [have_socket="no"])
154 ;; 158 ;;
155 darwin*) 159 darwin*)
156 ELM_UNIX_DEF="#define" 160 ELM_UNIX_DEF="#define"
157 have_socket="yes" 161 have_socket="yes"
162 have_dlopen="yes"
158 AC_CHECK_HEADERS([crt_externs.h]) 163 AC_CHECK_HEADERS([crt_externs.h])
159 AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."]) 164 AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."])
160 ;; 165 ;;
@@ -163,13 +168,13 @@ dnl managed by evil
163 AC_CHECK_FUNCS(dlopen, res=yes, res=no) 168 AC_CHECK_FUNCS(dlopen, res=yes, res=no)
164 if test "x$res" = "xyes"; then 169 if test "x$res" = "xyes"; then
165 AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR)) 170 AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR))
171 have_dlopen="yes"
166 else 172 else
167 AC_CHECK_LIB(dl, dlopen, res=yes, res=no) 173 AC_CHECK_LIB(dl, dlopen, res=yes, res=no)
168 if test "x$res" = "xyes"; then 174 if test "x$res" = "xyes"; then
169 AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR)) 175 AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR))
170 dlopen_libs=-ldl 176 dlopen_libs=-ldl
171 else 177 have_dlopen="yes"
172 AC_MSG_ERROR(Cannot find dlopen)
173 fi 178 fi
174 fi 179 fi
175 have_socket="yes" 180 have_socket="yes"
@@ -195,7 +200,7 @@ if test "x$want_quicklaunch" != "xno"; then
195 AC_DEFINE(HAVE_FORK) 200 AC_DEFINE(HAVE_FORK)
196 ]) 201 ])
197fi 202fi
198AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes"]) 203AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes" && "x$have_dlopen" = "xyes"])
199 204
200AC_SUBST(dlopen_libs) 205AC_SUBST(dlopen_libs)
201AC_SUBST(lt_enable_auto_import) 206AC_SUBST(lt_enable_auto_import)