merge: add escape ecore, fix several bugs

SVN revision: 79995

6 files changed, 139 insertions, 20 deletions

diff --git a/m4/ecore_check_c_extension.m4 b/m4/ecore_check_c_extension.m4
new file mode 100644
index 0000000..1ef3bd2
--- /dev/null
+++ b/m4/ecore_check_c_extension.m4
@@ -0,0 +1,42 @@
+dnl use: ECORE_CHECK_X_EXTENSION(Foo, header, lib, func, want)
+AC_DEFUN([ECORE_CHECK_X_EXTENSION],
+[
+pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
+pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
+
+UP[]_CFLAGS=""
+UP[]_LIBS=""
+use_[]DOWN="no"
+
+if test "x$5" != "xno"; then
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$x_cflags $x_includes"
+  AC_CHECK_HEADER(X11/extensions/$2,
+    [
+     AC_CHECK_LIB($3, $4,
+       [
+        AC_DEFINE(ECORE_[]UP, 1, [Build support for $1])
+        UP[]_LIBS="-l$3"
+        use_[]DOWN="yes"
+       ],
+       [use_[]DOWN="no"],
+       [$x_libs]
+     )
+    ],
+    [ use_[]DOWN="no" ],
+    [ #include <X11/Xlib.h> ]
+  )
+  CFLAGS=$SAVE_CFLAGS
+else
+  use_[]DOWN="no"
+  AC_MSG_NOTICE([$1 support disabled])
+fi
+
+ECORE_X_LIBS="${ECORE_X_LIBS} ${UP[]_LIBS}"
+
+AC_SUBST(UP[]_CFLAGS)
+AC_SUBST(UP[]_LIBS)
+
+popdef([UP])
+popdef([DOWN])
+])
diff --git a/m4/ecore_check_module.m4 b/m4/ecore_check_module.m4
new file mode 100644
index 0000000..8d0d76b
--- /dev/null
+++ b/m4/ecore_check_module.m4
@@ -0,0 +1,95 @@
+dnl use: ECORE_CHECK_MODULE(Foo, default-enabled, description[, dependency[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
+AC_DEFUN([ECORE_CHECK_MODULE],
+[
+m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
+
+have_ecore_[]m4_defn([DOWN])=no
+ecore_[]m4_defn([DOWN])[]_cflags=
+ecore_[]m4_defn([DOWN])[]_libs=
+want_module=$2
+
+AC_ARG_ENABLE(ecore-$1,
+   [AC_HELP_STRING(
+       [--enable-ecore-$1],
+       [enable the ecore_]m4_defn([DOWN])[ module])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_module="yes"
+    else
+       want_module="no"
+    fi
+   ],
+   [])
+
+AC_MSG_CHECKING([whether Ecore_$3 module is to be built])
+
+if test "x${want_module}" = "xyes" ; then
+   if test "x$4" = "x" || test "x$4" = "xyes" ; then
+      AC_DEFINE([BUILD_ECORE_]m4_defn([UP]), [1], [Build Ecore_$3 Module])
+      have_ecore_[]m4_defn([DOWN])="yes"
+      ecore_[]m4_defn([DOWN])[]_libs="-lecore_[]m4_defn([DOWN])"
+      AC_MSG_RESULT([yes])
+   else
+      AC_MSG_RESULT([no (dependency failed)])
+   fi
+else
+   AC_MSG_RESULT([no])
+fi
+
+AM_CONDITIONAL([BUILD_ECORE_]UP, [test "x$have_ecore_]DOWN[" = "xyes"])
+
+AS_IF([test "x$have_ecore_[]m4_defn([DOWN])" = "xyes"], [$5], [$6])
+
+AC_SUBST(ecore_[]m4_defn([DOWN])[]_cflags)
+AC_SUBST(ecore_[]m4_defn([DOWN])[]_libs)
+
+m4_popdef([UP])
+m4_popdef([DOWN])
+])
+
+dnl use: ECORE_EVAS_CHECK_MODULE_FULL(foo-bar, evas-module, want, description, backend[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([ECORE_EVAS_CHECK_MODULE_FULL],
+[
+m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
+
+have_ecore_evas_[]m4_defn([DOWN])="no"
+want_module="$3"
+
+AC_ARG_ENABLE(ecore-evas-$1,
+   [AC_HELP_STRING(
+       [--enable-ecore-evas-$1],
+       [enable $4 support in the ecore_evas module.])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_module="yes"
+    else
+       want_module="no"
+    fi
+   ],
+   [])
+
+AC_MSG_CHECKING([whether ecore_evas $4 support is to be built])
+AC_MSG_RESULT([${want_module}])
+
+if test "x$2" = "xyes" && \
+   test "x$5" = "xyes" && \
+   test "x$have_ecore_evas" = "xyes" && \
+   test "x$want_module" = "xyes" ; then
+      AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $4 Engine in Ecore_Evas])
+      have_ecore_evas_[]m4_defn([DOWN])="yes"
+fi
+
+AC_MSG_CHECKING([whether ecore_evas $4 support is built])
+AC_MSG_RESULT([$have_ecore_evas_]m4_defn([DOWN]))
+
+AS_IF([test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes"], [$6], [$7])
+
+m4_popdef([UP])
+m4_popdef([DOWN])
+])
+
+dnl use: ECORE_EVAS_CHECK_MODULE(foo-bar, want, description, backend[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([ECORE_EVAS_CHECK_MODULE],
+[ECORE_EVAS_CHECK_MODULE_FULL([$1], [$1], [$2], [$3], [$4], [$5], [$6])])
diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
index cbdb11b..c43e8d0 100644
--- a/m4/efl_check_libs.m4
+++ b/m4/efl_check_libs.m4
@@ -26,7 +26,6 @@ if test "x${have_dep}" = "xyes" ; then
       [
        have_dep="yes"
        requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg"
-       requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -ljpeg"
       ],
       [
        AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file")
@@ -66,7 +65,6 @@ else
          [
           _efl_have_lib="yes"
           requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz"
-          requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -lz"
          ],
          [
           AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"])
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4
index bba617f..a657500 100644
--- a/m4/efl_threads.m4
+++ b/m4/efl_threads.m4
@@ -28,15 +28,10 @@ case "$host_os" in
       AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported])
       AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported])
       ;;
-   solaris*)
-      _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-mt"
-      _efl_threads_libs="-mt"
-      ;;
    *)
       _efl_enable_posix_threads="yes"
-      _efl_threads_cflags="-pthread"
-      _efl_threads_libs="-pthread"
+      _efl_threads_cflags="-D_REENTRANT"
+      _efl_threads_libs="-lpthread"
       ;;
 esac
 
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index b380394..599cb33 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -51,7 +51,6 @@ fi
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -174,7 +173,6 @@ fi
 
 if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -346,7 +344,6 @@ fi
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
    requirements_pc_evas="${requirement} ${requirements_pc_evas}"
    requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
 fi
@@ -376,7 +373,6 @@ AC_CHECK_HEADER([windows.h],
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -403,7 +399,6 @@ AC_CHECK_HEADER([ddraw.h],
 
 if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -430,7 +425,6 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h],
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
@@ -479,7 +473,6 @@ AC_LANG_POP([Objective C])
 
 if test "x$3" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_engine_$1_cflags])
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 66cb980..5dc01d2 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -84,7 +84,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])
@@ -149,7 +148,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])
@@ -350,7 +348,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])
@@ -399,7 +396,6 @@ fi
 
 if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
    requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
-   requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
 fi
 
 AC_SUBST([evas_image_loader_$1_cflags])