X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=6e1ddae7950e8f8f6aee5917cf0e6e10216af1f0;hb=308146a7e5115dd324000c516dc6ecae801885e5;hp=aa69cc57ec45226ed670f1f5d068280fe108541d;hpb=8b97ea4ed65f1ade7e5b18b38389ff8223cb4164;p=framework%2Fuifw%2Felementary.git diff --git a/configure.ac b/configure.ac index aa69cc5..6e1ddae 100755 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,7 @@ ELM_UNIX_DEF="#undef" ELM_WIN32_DEF="#undef" ELM_WINCE_DEF="#undef" have_windows="no" +have_dlopen="no" case "$host_os" in mingw32ce* | cegcc*) PKG_CHECK_MODULES([EVIL], [evil]) @@ -131,6 +132,7 @@ case "$host_os" in have_windows="yes" dnl managed by evil AC_DEFINE(HAVE_DLADDR) + have_dlopen="yes" dlopen_libs=-ldl requirement_elm="evil" have_socket="no" @@ -143,6 +145,7 @@ dnl managed by evil have_windows="yes" dnl managed by evil AC_DEFINE(HAVE_DLADDR) + have_dlopen="yes" dlopen_libs=-ldl requirement_elm="evil" have_socket="no" @@ -150,11 +153,13 @@ dnl managed by evil *solaris*) ELM_UNIX_DEF="#define" have_socket="yes" + have_dlopen="yes" AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) ;; darwin*) ELM_UNIX_DEF="#define" have_socket="yes" + have_dlopen="yes" AC_CHECK_HEADERS([crt_externs.h]) 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) if test "x$res" = "xyes"; then AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR)) + have_dlopen="yes" 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)) dlopen_libs=-ldl - else - AC_MSG_ERROR(Cannot find dlopen) + have_dlopen="yes" fi fi have_socket="yes" @@ -177,6 +182,7 @@ dnl managed by evil esac AC_CHECK_FUNCS(strcasestr, AC_DEFINE(HAVE_STRCASESTR)) AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) +AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) m4_ifdef([v_mic], [ @@ -195,7 +201,7 @@ if test "x$want_quicklaunch" != "xno"; then AC_DEFINE(HAVE_FORK) ]) 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(lt_enable_auto_import) @@ -210,23 +216,15 @@ PKG_CHECK_MODULES([ELEMENTARY], eina >= 1.0.999 eet >= 1.4.0 evas >= 1.0.999 - ecore >= 1.0.0 - ecore-evas >= 1.0.0 - ecore-file >= 1.0.0 - ecore-imf >= 1.0.0 + ecore >= 1.0.999 + ecore-evas >= 1.0.999 + ecore-file >= 1.0.999 + ecore-imf >= 1.0.999 + ecore-con >= 1.0.999 edje >= 1.0.999 ] ) -PKG_CHECK_MODULES([ECORE_CON], - [ecore-con], - [ - have_ecore_con="yes" - AC_DEFINE(HAVE_ECORE_CON, 1, [Use Ecore_Con for downloding files]) - requirement_elm="ecore-con ${requirement_elm}" - ], - [have_ecore_con="no"]) - PKG_CHECK_MODULES([EIO], [eio], [ @@ -238,7 +236,14 @@ PKG_CHECK_MODULES([EIO], AM_CONDITIONAL([HAVE_EIO], [test "x${have_eio}" = "xyes"]) -PKG_CHECK_MODULES([EMOTION], +have_emotion="no" +want_elementary_emotion="yes" +AC_ARG_ENABLE([emotion], + [AC_HELP_STRING([--disable-emotion], [disable emotion support. @<:@default=enabled@:>@])], + [want_elementary_emotion=$enableval], []) + +if test "x$want_elementary_emotion" != "xno"; then + PKG_CHECK_MODULES([EMOTION], [emotion], [ have_emotion="yes" @@ -246,6 +251,7 @@ PKG_CHECK_MODULES([EMOTION], requirement_elm="emotion ${requirement_elm}" ], [have_emotion="no"]) +fi AM_CONDITIONAL([HAVE_EMOTION], [test "x${have_emotion}" = "xyes"]) @@ -533,6 +539,41 @@ if test "x$want_elementary_ethumb" = "xyes" -a "x$have_elementary_ethumb" = "xno fi AC_SUBST(ELM_ETHUMB_DEF) +ELM_WEB_DEF="#undef" +have_elementary_web="no" +want_elementary_web="auto" +AC_ARG_ENABLE([web], + [AC_HELP_STRING([--disable-web], [disable web (WebKit) support. @<:@default=detect@:>@])], + [want_elementary_web=$enableval], []) + +if test "x$want_elementary_web" != "xno"; then + PKG_CHECK_MODULES([ELEMENTARY_WEB], + [ + ewebkit + ], + [ + AC_DEFINE(HAVE_ELEMENTARY_WEB, 1, [Web support for Elementary]) + webkit_datadir=$($PKG_CONFIG ewebkit --variable=datadir) + AC_DEFINE_UNQUOTED(WEBKIT_DATADIR, + "$webkit_datadir", + "WebKit's data dir") + have_elementary_web="yes" + ELM_WEB_DEF="#define" +## web_client? how about ewebkit? at least in current upstreak webkit +## there is no web_client.pc +# requirement_elm="web_client ${requirement_elm}" + requirement_elm="ewebkit ${requirement_elm}" + ], + [have_elementary_web="no"] + ) +else + have_elementary_web="no" +fi +if test "x$want_elementary_web" = "xyes" -a "x$have_elementary_web" = "xno"; then + AC_MSG_ERROR([Web support requested, but no ewebkit found by pkg-config.]) +fi +AC_SUBST(ELM_WEB_DEF) + ELM_DEBUG_DEF="#undef" want_elementary_debug="no" AC_ARG_ENABLE([debug], @@ -575,7 +616,7 @@ EFL_ENABLE_BIN([elementary-test]) EFL_ENABLE_BIN([elementary-config]) m4_ifdef([AM_GNU_GETTEXT_VERSION], [ -AM_GNU_GETTEXT_VERSION([0.12.1]) +AM_GNU_GETTEXT_VERSION([0.17]) ]) m4_ifdef([AM_GNU_GETTEXT], [ @@ -586,6 +627,8 @@ AM_CONDITIONAL([HAVE_PO], [true]) AM_CONDITIONAL([HAVE_PO], [false]) ]) AC_SUBST(LTLIBINTL) +EFL_CHECK_PATH_MAX + ### Build and install examples EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) @@ -596,7 +639,6 @@ AC_OUTPUT([ Makefile elementary.spec elementary.pc -doc/elementary.dox doc/Makefile doc/Doxyfile doc/widgets/Makefile @@ -605,6 +647,7 @@ src/lib/Makefile src/lib/Elementary.h src/bin/Makefile src/modules/Makefile +src/modules/access_output/Makefile src/modules/test_entry/Makefile src/modules/test_map/Makefile src/modules/ctxpopup_copypasteUI/Makefile @@ -651,6 +694,7 @@ echo " EFreet.................: ${have_elementary_efreet}" echo " EWeather...............: ${have_elementary_eweather}" echo " EMap...................: ${have_elementary_emap}" echo " Ethumb.................: ${have_elementary_ethumb}" +echo " Web (WebKit)...........: ${have_elementary_web}" echo " Quick Launch...........: ${have_fork}" echo " EIO....................: ${have_eio}" echo " Emotion................: ${have_emotion}" @@ -659,8 +703,8 @@ echo " eet......................: ${eet_eet}" echo " edje_cc..................: ${edje_cc}" echo echo " Build elementary_test....: ${have_elementary_test}" -echo " Examples.............: ${enable_build_examples}" -echo " Examples installed...: ${enable_install_examples}" +echo " Examples.................: ${enable_build_examples}" +echo " Examples installed.......: ${enable_install_examples}" echo " Build elementary_config..: ${have_elementary_config}" echo echo "Compilation................: make (or gmake)"