[accessability] Initial merge

[framework/uifw/elementary.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 45c83ab..363ec94 100755 (executable)
--- 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,11 +182,11 @@ 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],
    [
     EFL_COMPILER_FLAG([-Wall])
-    EFL_COMPILER_FLAG([-W])
    ])
 
 have_fork="no"
@@ -196,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)
@@ -534,6 +539,38 @@ 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"
+        requirement_elm="web_client ${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],
@@ -600,11 +637,13 @@ elementary.pc
 doc/elementary.dox
 doc/Makefile
 doc/Doxyfile
+doc/widgets/Makefile
 src/Makefile
 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 +690,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}"