2 files changed, 1916 insertions, 1724 deletions
diff --git a/libraries/ecore/configure b/libraries/ecore/configure
index 2ea7dd2..1b2ed41 100755
--- a/libraries/ecore/configure
+++ b/libraries/ecore/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for ecore 1.1.99.67344.
+# Generated by GNU Autoconf 2.67 for ecore 1.2.0-alpha.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Inc.
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
      test -d "$as_dir" && break
    done
    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 } # as_fn_mkdir_p
@@ -359,19 +359,19 @@ else
 fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ---------------------------------
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
+  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
+  if test "$4"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
  as_fn_exit $as_status
 } # as_fn_error
@@ -682,7 +682,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ecore'
 PACKAGE_TARNAME='ecore'
-PACKAGE_VERSION='1.1.99.67344'
+PACKAGE_VERSION='1.2.0-alpha'
-PACKAGE_STRING='ecore 1.1.99.67344'
+PACKAGE_STRING='ecore 1.2.0-alpha'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
@@ -772,6 +772,10 @@ EFL_INSTALL_EXAMPLES_FALSE
 EFL_INSTALL_EXAMPLES_TRUE
 EFL_BUILD_EXAMPLES_FALSE
 EFL_BUILD_EXAMPLES_TRUE
+EFL_ENABLE_TESTS_FALSE
+EFL_ENABLE_TESTS_TRUE
+CHECK_LIBS
+CHECK_CFLAGS
 WAYLAND_EGL_LIBS
 WAYLAND_EGL_CFLAGS
 ecore_wayland_libs
@@ -875,6 +879,7 @@ ecore_con_libs
 ecore_con_cflags
 BUILD_ECORE_CON_FALSE
 BUILD_ECORE_CON_TRUE
+SHM_OPEN_LIBS
 ALLOCA
 lt_enable_auto_import
 WIN32_CFLAGS
@@ -992,11 +997,18 @@ EFL_ECORE_FILE_BUILD
 EFL_ECORE_EVAS_BUILD
 EFL_ECORE_CON_BUILD
 EFL_ECORE_BUILD
+ECORE_HAVE_EXOTIC_FALSE
+ECORE_HAVE_EXOTIC_TRUE
+EXOTIC_LIBS
+EXOTIC_CFLAGS
 ESCAPE_LIBS
 ESCAPE_CFLAGS
 EVIL_LIBS
 EVIL_CFLAGS
 pkgconfig_requires_private
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 EFL_BUILD_DOC_FALSE
 EFL_BUILD_DOC_TRUE
 efl_doxygen
@@ -1014,11 +1026,6 @@ OBJCDEPMODE
 ac_ct_OBJC
 OBJCFLAGS
 OBJC
-EFL_ENABLE_TESTS_FALSE
-EFL_ENABLE_TESTS_TRUE
-CHECK_LIBS
-CHECK_CFLAGS
-PKG_CONFIG
 HAVE_PO_FALSE
 HAVE_PO_TRUE
 POSUB
@@ -1172,7 +1179,6 @@ enable_local_sockets
 enable_abstract_sockets
 enable_simple_x11
 enable_xim
-enable_tests
 enable_doc
 with_doxygen
 enable_ecore_timer_dump
@@ -1243,7 +1249,6 @@ enable_ecore_evas_software_ddraw
 enable_ecore_evas_direct3d
 enable_ecore_evas_opengl_glew
 enable_ecore_evas_software_16_ddraw
-enable_ecore_evas_software_sdl
 enable_ecore_evas_opengl_sdl
 enable_ecore_evas_opengl_cocoa
 enable_ecore_evas_directfb
@@ -1254,6 +1259,7 @@ enable_ecore_evas_psl1ght
 enable_ecore_wayland
 enable_ecore_evas_wayland_shm
 enable_ecore_evas_wayland_egl
+enable_tests
 enable_build_examples
 enable_install_examples
 '
@@ -1266,19 +1272,21 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-PKG_CONFIG
-CHECK_CFLAGS
-CHECK_LIBS
 OBJC
 OBJCFLAGS
 CXX
 CXXFLAGS
 CCC
 CXXCPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 EVIL_CFLAGS
 EVIL_LIBS
 ESCAPE_CFLAGS
 ESCAPE_LIBS
+EXOTIC_CFLAGS
+EXOTIC_LIBS
 EINA_CFLAGS
 EINA_LIBS
 GLIB_CFLAGS
@@ -1343,7 +1351,9 @@ XCB_X11_LIBS
 WAYLAND_CFLAGS
 WAYLAND_LIBS
 WAYLAND_EGL_CFLAGS
-WAYLAND_EGL_LIBS'
+WAYLAND_EGL_LIBS
+CHECK_CFLAGS
+CHECK_LIBS'
 # Initialize some variables set by options.
@@ -1406,8 +1416,9 @@ do
  fi
  case $ac_option in
-  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)    ac_optarg=yes ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
  esac
  # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1452,7 +1463,7 @@ do
    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
    # Reject names that are not valid shell variable names.
    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
    ac_useropt_orig=$ac_useropt
    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    case $ac_user_opts in
@@ -1478,7 +1489,7 @@ do
    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
    # Reject names that are not valid shell variable names.
    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
    ac_useropt_orig=$ac_useropt
    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    case $ac_user_opts in
@@ -1682,7 +1693,7 @@ do
    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
    # Reject names that are not valid shell variable names.
    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
    ac_useropt_orig=$ac_useropt
    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    case $ac_user_opts in
@@ -1698,7 +1709,7 @@ do
    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
    # Reject names that are not valid shell variable names.
    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
    ac_useropt_orig=$ac_useropt
    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    case $ac_user_opts in
@@ -1728,8 +1739,8 @@ do
  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
    x_libraries=$ac_optarg ;;
-  -*) as_fn_error "unrecognized option: \`$ac_option'
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+Try \`$0 --help' for more information"
    ;;
  *=*)
@@ -1737,7 +1748,7 @@ Try \`$0 --help' for more information."
    # Reject names that are not valid shell variable names.
    case $ac_envvar in #(
      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
    esac
    eval $ac_envvar=\$ac_optarg
    export $ac_envvar ;;
@@ -1755,13 +1766,13 @@ done
 if test -n "$ac_prev"; then
  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 if test -n "$ac_unrecognized_opts"; then
  case $enable_option_checking in
    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
  esac
 fi
@@ -1784,7 +1795,7 @@ do
    [\\/$]* | ?:[\\/]* )  continue;;
    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 # There might be people who depend on the old broken behavior: `$host'
@@ -1798,8 +1809,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
  if test "x$build_alias" = x; then
    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    If a cross compiler is detected then cross compile mode will be used" >&2
  elif test "x$build_alias" != "x$host_alias"; then
    cross_compiling=yes
  fi
@@ -1814,9 +1825,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 # Find the source files, if location was not specified.
@@ -1855,11 +1866,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+        cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
        pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1885,7 +1896,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures ecore 1.1.99.67344 to adapt to many kinds of systems.
+\`configure' configures ecore 1.2.0-alpha to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1899,7 +1910,7 @@ Configuration:
      --help=short        display options specific to this package
      --help=recursive    display the short help of all the included packages
  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
      --cache-file=FILE   cache test results in FILE [disabled]
  -C, --config-cache      alias for \`--cache-file=config.cache'
  -n, --no-create         do not create output files
@@ -1959,7 +1970,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of ecore 1.1.99.67344:";;
+     short | recursive ) echo "Configuration of ecore 1.2.0-alpha:";;
   esac
  cat <<\_ACEOF
@@ -1987,7 +1998,6 @@ Optional Features:
                          disable abstract sockets.
  --enable-simple-x11     enable simple x11 linking
  --disable-xim           disable X Input Method.
-  --enable-tests          enable tests [default=disabled]
  --disable-doc           Disable documentation build [default=enabled]
  --disable-ecore-timer-dump
                          disable tracking of timer allocation.
@@ -2102,9 +2112,6 @@ Optional Features:
  --enable-ecore-evas-software-16-ddraw
                          enable 16 bpp Software DirectDraw support in the
                          ecore_evas module.
-  --enable-ecore-evas-software-sdl
-                          enable Software SDL support in the ecore_evas
-                          module.
  --enable-ecore-evas-opengl-sdl
                          enable OpenGL SDL support in the ecore_evas module.
  --enable-ecore-evas-opengl-cocoa
@@ -2126,6 +2133,7 @@ Optional Features:
                          enable Wayland Shm support in the ecore_evas module.
  --enable-ecore-evas-wayland-egl
                          enable Wayland Egl support in the ecore_evas module.
+  --enable-tests          enable tests [default=disabled]
  --enable-build-examples enable building examples [default=disabled]
  --enable-install-examples
                          enable installing example source files
@@ -2164,20 +2172,24 @@ Some influential environment variables:
  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
              you have headers in a nonstandard directory <include dir>
  CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  CHECK_CFLAGS
-              C compiler flags for CHECK, overriding pkg-config
-  CHECK_LIBS  linker flags for CHECK, overriding pkg-config
  OBJC        Objective C compiler command
  OBJCFLAGS   Objective C compiler flags
  CXX         C++ compiler command
  CXXFLAGS    C++ compiler flags
  CXXCPP      C++ preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
  EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config
  EVIL_LIBS   linker flags for EVIL, overriding pkg-config
  ESCAPE_CFLAGS
              C compiler flags for ESCAPE, overriding pkg-config
  ESCAPE_LIBS linker flags for ESCAPE, overriding pkg-config
+  EXOTIC_CFLAGS
+              C compiler flags for EXOTIC, overriding pkg-config
+  EXOTIC_LIBS linker flags for EXOTIC, overriding pkg-config
  EINA_CFLAGS C compiler flags for EINA, overriding pkg-config
  EINA_LIBS   linker flags for EINA, overriding pkg-config
  GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
@@ -2286,6 +2298,9 @@ Some influential environment variables:
              C compiler flags for WAYLAND_EGL, overriding pkg-config
  WAYLAND_EGL_LIBS
              linker flags for WAYLAND_EGL, overriding pkg-config
+  CHECK_CFLAGS
+              C compiler flags for CHECK, overriding pkg-config
+  CHECK_LIBS  linker flags for CHECK, overriding pkg-config
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2353,10 +2368,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-ecore configure 1.1.99.67344
+ecore configure 1.2.0-alpha
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.67
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2426,7 +2441,7 @@ $as_echo "$ac_try_echo"; } >&5
    mv -f conftest.er1 conftest.err
  fi
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
         test ! -s conftest.err
       }; then :
@@ -2450,10 +2465,10 @@ fi
 ac_fn_c_check_header_mongrel ()
 {
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval "test \"\${$3+set}\"" = set; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2489,7 +2504,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
  ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
@@ -2512,17 +2527,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
+( $as_echo "## -------------------------------------------------------- ##
-## -------------------------------------------------------- ##
 ## Report this to enlightenment-devel@lists.sourceforge.net ##
-## -------------------------------------------------------- ##
+## -------------------------------------------------------- ##"
-_ASBOX
     ) | sed "s/^/$as_me: WARNING:     /" >&2
    ;;
 esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  eval "$3=\$ac_header_compiler"
@@ -2586,7 +2599,7 @@ ac_fn_c_check_header_compile ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2662,7 +2675,7 @@ ac_fn_c_check_func ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2721,45 +2734,6 @@ $as_echo "$ac_res" >&6; }
 } # ac_fn_c_check_func
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $2
-  (void) $2;
-#endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-} # ac_fn_c_check_decl
 # ac_fn_objc_try_compile LINENO
 # -----------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -2857,7 +2831,7 @@ $as_echo "$ac_try_echo"; } >&5
    mv -f conftest.er1 conftest.err
  fi
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
         test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
         test ! -s conftest.err
       }; then :
@@ -2919,6 +2893,52 @@ fi
 } # ac_fn_cxx_try_link
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+} # ac_fn_c_check_decl
 # ac_fn_objc_try_link LINENO
 # --------------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -3152,7 +3172,7 @@ ac_fn_c_check_type ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  eval "$3=no"
@@ -3200,8 +3220,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by ecore $as_me 1.1.99.67344, which was
+It was created by ecore $as_me 1.2.0-alpha, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
  $ $0 $@
@@ -3311,11 +3331,9 @@ trap 'exit_status=$?
  {
    echo
-    cat <<\_ASBOX
+    $as_echo "## ---------------- ##
-## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
+## ---------------- ##"
-_ASBOX
    echo
    # The following way of writing the cache mishandles newlines in values,
 (
@@ -3349,11 +3367,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
    echo
-    cat <<\_ASBOX
+    $as_echo "## ----------------- ##
-## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
+## ----------------- ##"
-_ASBOX
    echo
    for ac_var in $ac_subst_vars
    do
@@ -3366,11 +3382,9 @@ _ASBOX
    echo
    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
+      $as_echo "## ------------------- ##
-## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
+## ------------------- ##"
-_ASBOX
      echo
      for ac_var in $ac_subst_files
      do
@@ -3384,11 +3398,9 @@ _ASBOX
    fi
    if test -s confdefs.h; then
-      cat <<\_ASBOX
+      $as_echo "## ----------- ##
-## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
+## ----------- ##"
-_ASBOX
      echo
      cat confdefs.h
      echo
@@ -3443,7 +3455,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
  ac_site_file1=$prefix/share/config.site
  ac_site_file2=$prefix/etc/config.site
@@ -3458,7 +3475,11 @@ do
    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
  fi
 done
@@ -3535,7 +3556,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -3561,16 +3582,22 @@ am__api_version='1.11'
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
+  if test -f "$ac_dir/install-sh"; then
-    if test -f "$ac_dir/$ac_t"; then
+    ac_aux_dir=$ac_dir
-      ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+    break
-      break 2
+  elif test -f "$ac_dir/install.sh"; then
-    fi
+    ac_aux_dir=$ac_dir
-  done
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 # These three variables are undocumented and unsupported,
@@ -3686,11 +3713,11 @@ am_lf='
 '
 case `pwd` in
  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
  *[\\\"\#\$\&\'\`$am_lf\ \     ]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -3712,7 +3739,7 @@ if (
      # if, for instance, CONFIG_SHELL is bash and it inherits a
      # broken ls alias from the environment.  This has actually
      # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
   fi
@@ -3722,7 +3749,7 @@ then
   # Ok.
   :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3960,7 +3987,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat >conftest.make <<\_ACEOF
@@ -3968,7 +3995,7 @@ SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
  *@@@%%%=?*=@@@%%%*)
    eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -4002,7 +4029,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
  am__isrc=' -I$(srcdir)'
  # test to see if srcdir already configured
  if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
  fi
 fi
@@ -4018,7 +4045,7 @@ fi
 # Define the identity of the package.
 PACKAGE='ecore'
- VERSION='1.1.99.67344'
+ VERSION='1.2.0-alpha'
 cat >>confdefs.h <<_ACEOF
@@ -4433,8 +4460,8 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4548,9 +4575,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "C compiler cannot create executables
-as_fn_error "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -4592,8 +4618,8 @@ done
 else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4650,9 +4676,9 @@ $as_echo "$ac_try_echo"; } >&5
    else
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
    fi
  fi
 fi
@@ -4703,8 +4729,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
+as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -5094,7 +5120,7 @@ else
  # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
  # OK, works on sane cases.  Now check whether nonexistent headers
  # can be detected and how.
@@ -5110,11 +5136,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
  break
 fi
@@ -5153,7 +5179,7 @@ else
  # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
  # OK, works on sane cases.  Now check whether nonexistent headers
  # can be detected and how.
@@ -5169,18 +5195,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 ac_ext=c
@@ -5241,7 +5267,7 @@ esac
  done
 IFS=$as_save_IFS
  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  fi
 else
  ac_cv_path_GREP=$GREP
@@ -5307,7 +5333,7 @@ esac
  done
 IFS=$as_save_IFS
  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  fi
 else
  ac_cv_path_EGREP=$EGREP
@@ -5439,8 +5465,7 @@ do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -5515,7 +5540,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -5526,16 +5551,16 @@ else
 test "x$ac_build_alias" = x &&
  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5560,7 +5585,7 @@ else
  ac_cv_host=$ac_cv_build
 else
  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 fi
@@ -5568,7 +5593,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5969,7 +5994,7 @@ esac
  done
 IFS=$as_save_IFS
  if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
  fi
 else
  ac_cv_path_SED=$SED
@@ -6048,7 +6073,7 @@ esac
  done
 IFS=$as_save_IFS
  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  fi
 else
  ac_cv_path_FGREP=$FGREP
@@ -6164,7 +6189,7 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -6366,13 +6391,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
  lt_cv_nm_interface="BSD nm"
  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6369: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6394: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:6372: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6397: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:6375: output\"" >&5)
+  (eval echo "\"\$as_me:6400: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -7574,7 +7599,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 7577 "configure"' > conftest.$ac_ext
+  echo '#line 7602 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -8834,11 +8859,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8837: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8862: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:8841: \$? = $ac_status" >&5
+   echo "$as_me:8866: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -9173,11 +9198,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9176: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9201: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:9180: \$? = $ac_status" >&5
+   echo "$as_me:9205: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -9278,11 +9303,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9281: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9306: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:9285: \$? = $ac_status" >&5
+   echo "$as_me:9310: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -9333,11 +9358,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9336: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9361: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:9340: \$? = $ac_status" >&5
+   echo "$as_me:9365: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -11717,7 +11742,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 11720 "configure"
+#line 11745 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -11813,7 +11838,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 11816 "configure"
+#line 11841 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -12052,20 +12077,20 @@ _ACEOF
 cat >>confdefs.h <<_ACEOF
-#define VERS_MIN 1
+#define VERS_MIN 2
 _ACEOF
 cat >>confdefs.h <<_ACEOF
-#define VERS_MIC 99
+#define VERS_MIC 0
 _ACEOF
 cat >>confdefs.h <<_ACEOF
-#define VERS_REV 67344
+#define VERS_REV 0
 _ACEOF
-version_info="2:99:1"
+version_info="3:0:2"
 release_info=""
@@ -12489,7 +12514,7 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${acl_cv_prog_gnu_ld+set}" = set; then :
@@ -13136,7 +13161,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13807,7 +13832,7 @@ fi
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  gt_save_CPPFLAGS="$CPPFLAGS"
@@ -14016,7 +14041,7 @@ _ACEOF
          with_max_log_level="${withval}"
       else
-          as_fn_error "--with-internal-maximum-log-level takes a decimal number, got \"${withval}\" instead." "$LINENO" 5
+          as_fn_error $? "--with-internal-maximum-log-level takes a decimal number, got \"${withval}\" instead." "$LINENO" 5
       fi
    fi
@@ -14106,6 +14131,7 @@ want_ecore_evas_directfb="no"
 want_ecore_evas_fb="no"
 want_ecore_evas_software_16_wince="no"
 want_ecore_evas_ews="yes"
+want_ecore_evas_extn="yes"
 want_ecore_evas_wayland_shm="no"
 want_ecore_evas_wayland_egl="no"
@@ -14114,11 +14140,12 @@ want_ecore_imf_xim="no"
 want_ecore_imf_scim="no"
 case "$host_os" in
-   mingw32ce* | cegcc*)
+   mingw32ce*)
      want_ecore_con="no"
      want_ecore_ipc="no"
      want_ecore_wince="yes"
      want_ecore_evas_software_16_wince="yes"
+      want_ecore_evas_extn="no"
      ;;
   mingw*)
      want_notify_win32="yes"
@@ -14205,60 +14232,6 @@ requirements_ecore_imf_xim=""
 requirements_ecore_imf_scim=""
 requirements_ecore_wayland=""
-ac_fn_c_check_decl "$LINENO" "MAXHOSTNAMELEN" "ac_cv_have_decl_MAXHOSTNAMELEN" "$ac_includes_default"
-if test "x$ac_cv_have_decl_MAXHOSTNAMELEN" = x""yes; then :
-  FOUND_MAXHOSTNAMELEN=yes
-fi
-if test x$FOUND_MAXHOSTNAMELEN != xyes ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for header that defines MAXHOSTNAMELEN" >&5
-$as_echo_n "checking for header that defines MAXHOSTNAMELEN... " >&6; }
-  FOUND_MAXHOSTNAMELEN='not found'
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/param.h>
-int
-main ()
-{
-int h = MAXHOSTNAMELEN;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  FOUND_MAXHOSTNAMELEN='sys/param.h'
-$as_echo "#define NEED_SYS_PARAM_H 1" >>confdefs.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <netdb.h>
-int
-main ()
-{
-int h = MAXHOSTNAMELEN;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  FOUND_MAXHOSTNAMELEN='netdb.h'
-$as_echo "#define NEED_NETDB_H 1" >>confdefs.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_MAXHOSTNAMELEN" >&5
-$as_echo "$FOUND_MAXHOSTNAMELEN" >&6; }
-fi
 ### Additional options to configure
 want_glib_integration_always=no
@@ -14290,7 +14263,7 @@ $as_echo "#define USE_G_MAIN_LOOP 1" >>confdefs.h
 fi
 if test "x${want_glib_integration_always}" = "xyes" -a "x${want_g_main_loop}" = "xyes"; then
-  as_fn_error "--enable-glib-integration-always and --enable-glib-main-loop are mutually exclusive" "$LINENO" 5
+  as_fn_error $? "--enable-glib-integration-always and --enable-glib-main-loop are mutually exclusive" "$LINENO" 5
 fi
 # local sockets (ecore_con.c)
@@ -14364,238 +14337,6 @@ $as_echo "#define ENABLE_XIM 1" >>confdefs.h
 fi
-# Unit tests
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-        if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-fi
-if test -n "$PKG_CONFIG"; then
-        _pkg_min_version=0.9.0
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        else
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                PKG_CONFIG=""
-        fi
-fi
-# Check whether --enable-tests was given.
-if test "${enable_tests+set}" = set; then :
-  enableval=$enable_tests;
-    if test "x${enableval}" = "xyes" ; then
-       _efl_enable_tests="yes"
-    else
-       _efl_enable_tests="no"
-    fi
-else
-  _efl_enable_tests="no"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tests are built" >&5
-$as_echo_n "checking whether tests are built... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_efl_enable_tests}" >&5
-$as_echo "${_efl_enable_tests}" >&6; }
-if test "x${_efl_enable_tests}" = "xyes" ; then
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
-$as_echo_n "checking for CHECK... " >&6; }
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CHECK_CFLAGS"; then
-        pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-        pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CHECK_LIBS"; then
-        pkg_cv_CHECK_LIBS="$CHECK_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-        pkg_failed=untried
-fi
-if test $pkg_failed = yes; then
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-                CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.5"`
-        else
-                CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.5"`
-        fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$CHECK_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                _efl_enable_tests="no"
-elif test $pkg_failed = untried; then
-        _efl_enable_tests="no"
-else
-        CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
-        CHECK_LIBS=$pkg_cv_CHECK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-        dummy="yes"
-fi
-fi
- if test "x${_efl_enable_tests}" = "xyes"; then
-  EFL_ENABLE_TESTS_TRUE=
-  EFL_ENABLE_TESTS_FALSE='#'
-else
-  EFL_ENABLE_TESTS_TRUE='#'
-  EFL_ENABLE_TESTS_FALSE=
-fi
-if test "x$_efl_enable_tests" = "xyes"; then :
-  enable_tests="yes"
-else
-  enable_tests="no"
-fi
 ### Checks for programs
@@ -15923,7 +15664,7 @@ else
  # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
  # OK, works on sane cases.  Now check whether nonexistent headers
  # can be detected and how.
@@ -15939,11 +15680,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
  break
 fi
@@ -15982,7 +15723,7 @@ else
  # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
  # OK, works on sane cases.  Now check whether nonexistent headers
  # can be detected and how.
@@ -15998,11 +15739,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 else
@@ -16231,7 +15972,7 @@ else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -17772,11 +17513,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17775: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17516: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:17779: \$? = $ac_status" >&5
+   echo "$as_me:17520: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -17871,11 +17612,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17874: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17615: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:17878: \$? = $ac_status" >&5
+   echo "$as_me:17619: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -17923,11 +17664,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17926: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17667: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:17930: \$? = $ac_status" >&5
+   echo "$as_me:17671: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -19171,8 +18912,8 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -19798,6 +19539,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # so we should include this here:
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        if test -n "$ac_tool_prefix"; then
  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -19910,7 +19655,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
                PKG_CONFIG=""
        fi
 fi
 # Check whether pkg-config supports Requires.private
@@ -19960,11 +19704,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5
 $as_echo_n "checking for EVIL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EVIL_CFLAGS"; then
-    if test -n "$EVIL_CFLAGS"; then
+    pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
-        pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
  ac_status=$?
@@ -19974,15 +19717,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$EVIL_LIBS"; then
-    if test -n "$EVIL_LIBS"; then
+    pkg_cv_EVIL_LIBS="$EVIL_LIBS"
-        pkg_cv_EVIL_LIBS="$EVIL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
  ac_status=$?
@@ -19992,14 +19733,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -20007,14 +19749,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evil >= 1.0.0"`
+                EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.0.0" 2>&1`
        else
-                EVIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evil >= 1.0.0"`
+                EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EVIL_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (evil >= 1.0.0) were not met:
+        as_fn_error $? "Package requirements (evil >= 1.0.0) were not met:
 $EVIL_PKG_ERRORS
@@ -20023,12 +19765,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EVIL_CFLAGS
 and EVIL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+See the pkg-config man page for more details." "$LINENO" 5
-" "$LINENO" 5
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -20037,13 +19780,13 @@ and EVIL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
        EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
        EVIL_LIBS=$pkg_cv_EVIL_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
 $as_echo "#define HAVE_EVIL 1" >>confdefs.h
@@ -20091,11 +19834,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ESCAPE" >&5
 $as_echo_n "checking for ESCAPE... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$ESCAPE_CFLAGS"; then
-    if test -n "$ESCAPE_CFLAGS"; then
+    pkg_cv_ESCAPE_CFLAGS="$ESCAPE_CFLAGS"
-        pkg_cv_ESCAPE_CFLAGS="$ESCAPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"escape\""; } >&5
  ($PKG_CONFIG --exists --print-errors "escape") 2>&5
  ac_status=$?
@@ -20105,15 +19847,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$ESCAPE_LIBS"; then
-    if test -n "$ESCAPE_LIBS"; then
+    pkg_cv_ESCAPE_LIBS="$ESCAPE_LIBS"
-        pkg_cv_ESCAPE_LIBS="$ESCAPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"escape\""; } >&5
  ($PKG_CONFIG --exists --print-errors "escape") 2>&5
  ac_status=$?
@@ -20123,14 +19863,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -20138,14 +19879,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                ESCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "escape"`
+                ESCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "escape" 2>&1`
        else
-                ESCAPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "escape"`
+                ESCAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "escape" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$ESCAPE_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (escape) were not met:
+        as_fn_error $? "Package requirements (escape) were not met:
 $ESCAPE_PKG_ERRORS
@@ -20154,12 +19895,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables ESCAPE_CFLAGS
 and ESCAPE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+See the pkg-config man page for more details." "$LINENO" 5
-" "$LINENO" 5
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -20168,13 +19910,13 @@ and ESCAPE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
        ESCAPE_CFLAGS=$pkg_cv_ESCAPE_CFLAGS
        ESCAPE_LIBS=$pkg_cv_ESCAPE_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
      CFLAGS="$CFLAGS $ESCAPE_CFLAGS"
@@ -20193,6 +19935,95 @@ $as_echo "#define HAVE_ESCAPE 1" >>confdefs.h
 esac
+### Checks for portability layer
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXOTIC" >&5
+$as_echo_n "checking for EXOTIC... " >&6; }
+if test -n "$EXOTIC_CFLAGS"; then
+    pkg_cv_EXOTIC_CFLAGS="$EXOTIC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exotic\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "exotic") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EXOTIC_CFLAGS=`$PKG_CONFIG --cflags "exotic" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$EXOTIC_LIBS"; then
+    pkg_cv_EXOTIC_LIBS="$EXOTIC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exotic\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "exotic") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_EXOTIC_LIBS=`$PKG_CONFIG --libs "exotic" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exotic" 2>&1`
+        else
+                EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors "exotic" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$EXOTIC_PKG_ERRORS" >&5
+        enable_exotic="no"
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        enable_exotic="no"
+else
+        EXOTIC_CFLAGS=$pkg_cv_EXOTIC_CFLAGS
+        EXOTIC_LIBS=$pkg_cv_EXOTIC_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        enable_exotic="yes"
+fi
+if test "x${enable_exotic}" = "xyes"; then
+    requirements_ecore="exotic ${requirements_ecore}"
+$as_echo "#define HAVE_EXOTIC 1" >>confdefs.h
+fi
+ if test "x${enable_exotic}" = "xyes"; then
+  ECORE_HAVE_EXOTIC_TRUE=
+  ECORE_HAVE_EXOTIC_FALSE='#'
+else
+  ECORE_HAVE_EXOTIC_TRUE='#'
+  ECORE_HAVE_EXOTIC_FALSE=
+fi
@@ -20431,46 +20262,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EINA" >&5
 $as_echo_n "checking for EINA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EINA_CFLAGS"; then
-    if test -n "$EINA_CFLAGS"; then
+    pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
-        pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.2.0" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$EINA_LIBS"; then
-    if test -n "$EINA_LIBS"; then
+    pkg_cv_EINA_LIBS="$EINA_LIBS"
-        pkg_cv_EINA_LIBS="$EINA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.2.0" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -20478,14 +20307,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "eina >= 1.1.0"`
+                EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina >= 1.2.0" 2>&1`
        else
-                EINA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "eina >= 1.1.0"`
+                EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EINA_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (eina >= 1.1.0) were not met:
+        as_fn_error $? "Package requirements (eina >= 1.2.0) were not met:
 $EINA_PKG_ERRORS
@@ -20494,12 +20323,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EINA_CFLAGS
 and EINA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+See the pkg-config man page for more details." "$LINENO" 5
-" "$LINENO" 5
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -20508,33 +20338,33 @@ and EINA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
        EINA_CFLAGS=$pkg_cv_EINA_CFLAGS
        EINA_LIBS=$pkg_cv_EINA_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
 #FIXME check all the requirements when the eina move will be finished
-requirements_ecore="eina >= 1.1.0 ${requirements_ecore}"
+requirements_ecore="eina >= 1.2.0 ${requirements_ecore}"
-requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}"
+requirements_ecore_con="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_con}"
-#requirements_ecore_config="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_config}"
+#requirements_ecore_config="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_config}"
-requirements_ecore_directfb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_directfb}"
+requirements_ecore_directfb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_directfb}"
-requirements_ecore_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_evas}"
+requirements_ecore_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_evas}"
-requirements_ecore_fb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_fb}"
+requirements_ecore_fb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_fb}"
-requirements_ecore_file="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_file}"
+requirements_ecore_file="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_file}"
-requirements_ecore_imf="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf}"
+requirements_ecore_imf="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf}"
-requirements_ecore_imf_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf_evas}"
+requirements_ecore_imf_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf_evas}"
-requirements_ecore_input="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input}"
+requirements_ecore_input="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input}"
-requirements_ecore_input_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input_evas}"
+requirements_ecore_input_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input_evas}"
-requirements_ecore_ipc="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_ipc}"
+requirements_ecore_ipc="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_ipc}"
-requirements_ecore_cocoa="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_cocoa}"
+requirements_ecore_cocoa="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_cocoa}"
-requirements_ecore_sdl="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}"
+requirements_ecore_sdl="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}"
-requirements_ecore_psl1ght="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}"
+requirements_ecore_psl1ght="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}"
-requirements_ecore_win32="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_win32}"
+requirements_ecore_win32="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_win32}"
-requirements_ecore_wince="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_wince}"
+requirements_ecore_wince="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_wince}"
-requirements_ecore_x="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_x}"
+requirements_ecore_x="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_x}"
 # glib support (main loop integration)
@@ -20550,11 +20380,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
 $as_echo_n "checking for GLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$GLIB_CFLAGS"; then
-    if test -n "$GLIB_CFLAGS"; then
+    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
  ac_status=$?
@@ -20564,15 +20393,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$GLIB_LIBS"; then
-    if test -n "$GLIB_LIBS"; then
+    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
  ac_status=$?
@@ -20582,14 +20409,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -20597,17 +20425,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`
+                GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1`
        else
-                GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
+                GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$GLIB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_glib="no"
-$as_echo "no" >&6; }
-                have_glib="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_glib="no"
 else
        GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
@@ -20620,7 +20448,7 @@ else
   have_glib="no"
 fi
 if test "x$want_glib" = "xyes" -a "x$have_glib" = "xno"; then
-   as_fn_error "GLib support requested, but no GLib found by pkg-config." "$LINENO" 5
+   as_fn_error $? "GLib support requested, but no GLib found by pkg-config." "$LINENO" 5
 elif test "x$have_glib" = "xyes"; then
 $as_echo "#define HAVE_GLIB 1" >>confdefs.h
@@ -20637,11 +20465,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
 $as_echo_n "checking for SDL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$SDL_CFLAGS"; then
-    if test -n "$SDL_CFLAGS"; then
+    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
-        pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5
  ac_status=$?
@@ -20651,15 +20478,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$SDL_LIBS"; then
-    if test -n "$SDL_LIBS"; then
+    pkg_cv_SDL_LIBS="$SDL_LIBS"
-        pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5
  ac_status=$?
@@ -20669,14 +20494,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -20684,17 +20510,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl >= 1.2.0"`
+                SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1`
        else
-                SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl >= 1.2.0"`
+                SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$SDL_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_sdl="no"
-$as_echo "no" >&6; }
-                have_sdl="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_sdl="no"
 else
        SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
@@ -20788,11 +20614,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
 $as_echo_n "checking for DIRECTFB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$DIRECTFB_CFLAGS"; then
-    if test -n "$DIRECTFB_CFLAGS"; then
+    pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
-        pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.16\""; } >&5
  ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.16") 2>&5
  ac_status=$?
@@ -20802,15 +20627,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$DIRECTFB_LIBS"; then
-    if test -n "$DIRECTFB_LIBS"; then
+    pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
-        pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.16\""; } >&5
  ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.16") 2>&5
  ac_status=$?
@@ -20820,14 +20643,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -20835,17 +20659,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= 0.9.16"`
+                DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= 0.9.16" 2>&1`
        else
-                DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= 0.9.16"`
+                DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= 0.9.16" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$DIRECTFB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_directfb="no"
-$as_echo "no" >&6; }
-                have_directfb="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_directfb="no"
 else
        DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
@@ -20866,6 +20690,75 @@ fi
 # Xlib and XCB (ecore_x)
+ac_fn_c_check_decl "$LINENO" "MAXHOSTNAMELEN" "ac_cv_have_decl_MAXHOSTNAMELEN" "$ac_includes_default"
+if test "x$ac_cv_have_decl_MAXHOSTNAMELEN" = x""yes; then :
+  FOUND_MAXHOSTNAMELEN=yes
+fi
+if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for header that defines MAXHOSTNAMELEN" >&5
+$as_echo_n "checking for header that defines MAXHOSTNAMELEN... " >&6; }
+   FOUND_MAXHOSTNAMELEN="not found"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/param.h>
+int
+main ()
+{
+int h = MAXHOSTNAMELEN;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+       FOUND_MAXHOSTNAMELEN="sys/param.h"
+$as_echo "#define NEED_SYS_PARAM_H 1" >>confdefs.h
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+int h = MAXHOSTNAMELEN;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+       FOUND_MAXHOSTNAMELEN="netdb.h"
+$as_echo "#define NEED_NETDB_H 1" >>confdefs.h
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_MAXHOSTNAMELEN" >&5
+$as_echo "$FOUND_MAXHOSTNAMELEN" >&6; }
+fi
 have_x="no"
 have_ecore_x="no"
 have_ecore_x_xlib="no"
@@ -20995,7 +20888,7 @@ $as_echo_n "checking keysym definitions... " >&6; }
      if test -f "$KEYSYMDEFDIR/$i"; then
        KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
      elif test "x$i" = "xkeysymdef.h"; then
-        as_fn_error "Cannot find keysymdef.h" "$LINENO" 5
+        as_fn_error $? "Cannot find keysymdef.h" "$LINENO" 5
      fi
  done
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5
@@ -21159,11 +21052,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5
 $as_echo_n "checking for ECORE_XCB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_XCB_CFLAGS"; then
-    if test -n "$ECORE_XCB_CFLAGS"; then
+    pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS"
-        pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8") 2>&5
  ac_status=$?
@@ -21173,15 +21065,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_XCB_LIBS"; then
-    if test -n "$ECORE_XCB_LIBS"; then
+    pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS"
-        pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8") 2>&5
  ac_status=$?
@@ -21191,14 +21081,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21206,26 +21097,23 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"`
+                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8" 2>&1`
        else
-                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"`
+                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$ECORE_XCB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5
 $as_echo_n "checking for ECORE_XCB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_XCB_CFLAGS"; then
-    if test -n "$ECORE_XCB_CFLAGS"; then
+    pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS"
-        pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5
  ac_status=$?
@@ -21235,15 +21123,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_XCB_LIBS"; then
-    if test -n "$ECORE_XCB_LIBS"; then
+    pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS"
-        pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5
  ac_status=$?
@@ -21253,14 +21139,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21268,17 +21155,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"`
+                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1`
        else
-                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"`
+                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$ECORE_XCB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb="no"
 else
        ECORE_XCB_CFLAGS=$pkg_cv_ECORE_XCB_CFLAGS
@@ -21293,17 +21180,18 @@ $as_echo "#define OLD_XCB_VERSION 1" >>confdefs.h
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5
 $as_echo_n "checking for ECORE_XCB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_XCB_CFLAGS"; then
-    if test -n "$ECORE_XCB_CFLAGS"; then
+    pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS"
-        pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5
  ac_status=$?
@@ -21313,15 +21201,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_XCB_LIBS"; then
-    if test -n "$ECORE_XCB_LIBS"; then
+    pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS"
-        pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5
  ac_status=$?
@@ -21331,14 +21217,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21346,17 +21233,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"`
+                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1`
        else
-                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"`
+                ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$ECORE_XCB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb="no"
 else
        ECORE_XCB_CFLAGS=$pkg_cv_ECORE_XCB_CFLAGS
@@ -21387,11 +21274,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PIXMAN" >&5
 $as_echo_n "checking for PIXMAN... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$PIXMAN_CFLAGS"; then
-    if test -n "$PIXMAN_CFLAGS"; then
+    pkg_cv_PIXMAN_CFLAGS="$PIXMAN_CFLAGS"
-        pkg_cv_PIXMAN_CFLAGS="$PIXMAN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5
  ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5
  ac_status=$?
@@ -21401,15 +21287,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$PIXMAN_LIBS"; then
-    if test -n "$PIXMAN_LIBS"; then
+    pkg_cv_PIXMAN_LIBS="$PIXMAN_LIBS"
-        pkg_cv_PIXMAN_LIBS="$PIXMAN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5
  ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5
  ac_status=$?
@@ -21419,14 +21303,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21434,24 +21319,24 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pixman-1"`
+                PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pixman-1" 2>&1`
        else
-                PIXMAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pixman-1"`
+                PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "pixman-1" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$PIXMAN_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
       if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then
-          as_fn_error "Pixman not found (strict dependencies checking)" "$LINENO" 5
+          as_fn_error $? "Pixman not found (strict dependencies checking)" "$LINENO" 5
       fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then
-          as_fn_error "Pixman not found (strict dependencies checking)" "$LINENO" 5
+          as_fn_error $? "Pixman not found (strict dependencies checking)" "$LINENO" 5
       fi
 else
@@ -21474,11 +21359,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_COMPOSITE" >&5
 $as_echo_n "checking for XCB_COMPOSITE... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_COMPOSITE_CFLAGS"; then
-    if test -n "$XCB_COMPOSITE_CFLAGS"; then
+    pkg_cv_XCB_COMPOSITE_CFLAGS="$XCB_COMPOSITE_CFLAGS"
-        pkg_cv_XCB_COMPOSITE_CFLAGS="$XCB_COMPOSITE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5
  ac_status=$?
@@ -21488,15 +21372,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_COMPOSITE_LIBS"; then
-    if test -n "$XCB_COMPOSITE_LIBS"; then
+    pkg_cv_XCB_COMPOSITE_LIBS="$XCB_COMPOSITE_LIBS"
-        pkg_cv_XCB_COMPOSITE_LIBS="$XCB_COMPOSITE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5
  ac_status=$?
@@ -21506,14 +21388,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21521,17 +21404,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-composite"`
+                XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-composite" 2>&1`
        else
-                XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-composite"`
+                XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-composite" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_COMPOSITE_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_composite="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_composite="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_composite="no"
 else
        XCB_COMPOSITE_CFLAGS=$pkg_cv_XCB_COMPOSITE_CFLAGS
@@ -21556,11 +21439,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DAMAGE" >&5
 $as_echo_n "checking for XCB_DAMAGE... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_DAMAGE_CFLAGS"; then
-    if test -n "$XCB_DAMAGE_CFLAGS"; then
+    pkg_cv_XCB_DAMAGE_CFLAGS="$XCB_DAMAGE_CFLAGS"
-        pkg_cv_XCB_DAMAGE_CFLAGS="$XCB_DAMAGE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-damage\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-damage") 2>&5
  ac_status=$?
@@ -21570,15 +21452,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_DAMAGE_LIBS"; then
-    if test -n "$XCB_DAMAGE_LIBS"; then
+    pkg_cv_XCB_DAMAGE_LIBS="$XCB_DAMAGE_LIBS"
-        pkg_cv_XCB_DAMAGE_LIBS="$XCB_DAMAGE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-damage\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-damage") 2>&5
  ac_status=$?
@@ -21588,14 +21468,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21603,17 +21484,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-damage"`
+                XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-damage" 2>&1`
        else
-                XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-damage"`
+                XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-damage" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_DAMAGE_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_damage="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_damage="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_damage="no"
 else
        XCB_DAMAGE_CFLAGS=$pkg_cv_XCB_DAMAGE_CFLAGS
@@ -21638,11 +21519,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DPMS" >&5
 $as_echo_n "checking for XCB_DPMS... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_DPMS_CFLAGS"; then
-    if test -n "$XCB_DPMS_CFLAGS"; then
+    pkg_cv_XCB_DPMS_CFLAGS="$XCB_DPMS_CFLAGS"
-        pkg_cv_XCB_DPMS_CFLAGS="$XCB_DPMS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-dpms\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-dpms") 2>&5
  ac_status=$?
@@ -21652,15 +21532,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_DPMS_LIBS"; then
-    if test -n "$XCB_DPMS_LIBS"; then
+    pkg_cv_XCB_DPMS_LIBS="$XCB_DPMS_LIBS"
-        pkg_cv_XCB_DPMS_LIBS="$XCB_DPMS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-dpms\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-dpms") 2>&5
  ac_status=$?
@@ -21670,14 +21548,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21685,17 +21564,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-dpms"`
+                XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-dpms" 2>&1`
        else
-                XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-dpms"`
+                XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-dpms" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_DPMS_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_dpms="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_dpms="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_dpms="no"
 else
        XCB_DPMS_CFLAGS=$pkg_cv_XCB_DPMS_CFLAGS
@@ -21720,11 +21599,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RANDR" >&5
 $as_echo_n "checking for XCB_RANDR... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_RANDR_CFLAGS"; then
-    if test -n "$XCB_RANDR_CFLAGS"; then
+    pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS"
-        pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-randr") 2>&5
  ac_status=$?
@@ -21734,15 +21612,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_RANDR_LIBS"; then
-    if test -n "$XCB_RANDR_LIBS"; then
+    pkg_cv_XCB_RANDR_LIBS="$XCB_RANDR_LIBS"
-        pkg_cv_XCB_RANDR_LIBS="$XCB_RANDR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-randr") 2>&5
  ac_status=$?
@@ -21752,14 +21628,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21767,17 +21644,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-randr"`
+                XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-randr" 2>&1`
        else
-                XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-randr"`
+                XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-randr" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_RANDR_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_randr="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_randr="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_randr="no"
 else
        XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS
@@ -21802,11 +21679,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RENDER" >&5
 $as_echo_n "checking for XCB_RENDER... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_RENDER_CFLAGS"; then
-    if test -n "$XCB_RENDER_CFLAGS"; then
+    pkg_cv_XCB_RENDER_CFLAGS="$XCB_RENDER_CFLAGS"
-        pkg_cv_XCB_RENDER_CFLAGS="$XCB_RENDER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5
  ac_status=$?
@@ -21816,15 +21692,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_RENDER_LIBS"; then
-    if test -n "$XCB_RENDER_LIBS"; then
+    pkg_cv_XCB_RENDER_LIBS="$XCB_RENDER_LIBS"
-        pkg_cv_XCB_RENDER_LIBS="$XCB_RENDER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5
  ac_status=$?
@@ -21834,14 +21708,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21849,17 +21724,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-render xcb-renderutil"`
+                XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-render xcb-renderutil" 2>&1`
        else
-                XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-render xcb-renderutil"`
+                XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-render xcb-renderutil" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_RENDER_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_render="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_render="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_render="no"
 else
        XCB_RENDER_CFLAGS=$pkg_cv_XCB_RENDER_CFLAGS
@@ -21884,11 +21759,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SCREENSAVER" >&5
 $as_echo_n "checking for XCB_SCREENSAVER... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_SCREENSAVER_CFLAGS"; then
-    if test -n "$XCB_SCREENSAVER_CFLAGS"; then
+    pkg_cv_XCB_SCREENSAVER_CFLAGS="$XCB_SCREENSAVER_CFLAGS"
-        pkg_cv_XCB_SCREENSAVER_CFLAGS="$XCB_SCREENSAVER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-screensaver\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-screensaver") 2>&5
  ac_status=$?
@@ -21898,15 +21772,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_SCREENSAVER_LIBS"; then
-    if test -n "$XCB_SCREENSAVER_LIBS"; then
+    pkg_cv_XCB_SCREENSAVER_LIBS="$XCB_SCREENSAVER_LIBS"
-        pkg_cv_XCB_SCREENSAVER_LIBS="$XCB_SCREENSAVER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-screensaver\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-screensaver") 2>&5
  ac_status=$?
@@ -21916,14 +21788,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -21931,17 +21804,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-screensaver"`
+                XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-screensaver" 2>&1`
        else
-                XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-screensaver"`
+                XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-screensaver" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_SCREENSAVER_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_screensaver="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_screensaver="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_screensaver="no"
 else
        XCB_SCREENSAVER_CFLAGS=$pkg_cv_XCB_SCREENSAVER_CFLAGS
@@ -21966,11 +21839,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SHAPE" >&5
 $as_echo_n "checking for XCB_SHAPE... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_SHAPE_CFLAGS"; then
-    if test -n "$XCB_SHAPE_CFLAGS"; then
+    pkg_cv_XCB_SHAPE_CFLAGS="$XCB_SHAPE_CFLAGS"
-        pkg_cv_XCB_SHAPE_CFLAGS="$XCB_SHAPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shape\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-shape") 2>&5
  ac_status=$?
@@ -21980,15 +21852,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_SHAPE_LIBS"; then
-    if test -n "$XCB_SHAPE_LIBS"; then
+    pkg_cv_XCB_SHAPE_LIBS="$XCB_SHAPE_LIBS"
-        pkg_cv_XCB_SHAPE_LIBS="$XCB_SHAPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shape\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-shape") 2>&5
  ac_status=$?
@@ -21998,14 +21868,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22013,17 +21884,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-shape"`
+                XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-shape" 2>&1`
        else
-                XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-shape"`
+                XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-shape" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_SHAPE_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_shape="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_shape="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_shape="no"
 else
        XCB_SHAPE_CFLAGS=$pkg_cv_XCB_SHAPE_CFLAGS
@@ -22048,11 +21919,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XGESTURE" >&5
 $as_echo_n "checking for XCB_XGESTURE... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XGESTURE_CFLAGS"; then
-    if test -n "$XCB_XGESTURE_CFLAGS"; then
+    pkg_cv_XCB_XGESTURE_CFLAGS="$XCB_XGESTURE_CFLAGS"
-        pkg_cv_XCB_XGESTURE_CFLAGS="$XCB_XGESTURE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-gesture\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-gesture") 2>&5
  ac_status=$?
@@ -22062,15 +21932,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XGESTURE_LIBS"; then
-    if test -n "$XCB_XGESTURE_LIBS"; then
+    pkg_cv_XCB_XGESTURE_LIBS="$XCB_XGESTURE_LIBS"
-        pkg_cv_XCB_XGESTURE_LIBS="$XCB_XGESTURE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-gesture\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-gesture") 2>&5
  ac_status=$?
@@ -22080,14 +21948,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22095,17 +21964,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-gesture"`
+                XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-gesture" 2>&1`
        else
-                XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-gesture"`
+                XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-gesture" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_XGESTURE_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_gesture="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_gesture="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_gesture="no"
 else
        XCB_XGESTURE_CFLAGS=$pkg_cv_XCB_XGESTURE_CFLAGS
@@ -22130,11 +21999,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SYNC" >&5
 $as_echo_n "checking for XCB_SYNC... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_SYNC_CFLAGS"; then
-    if test -n "$XCB_SYNC_CFLAGS"; then
+    pkg_cv_XCB_SYNC_CFLAGS="$XCB_SYNC_CFLAGS"
-        pkg_cv_XCB_SYNC_CFLAGS="$XCB_SYNC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-sync\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-sync") 2>&5
  ac_status=$?
@@ -22144,15 +22012,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_SYNC_LIBS"; then
-    if test -n "$XCB_SYNC_LIBS"; then
+    pkg_cv_XCB_SYNC_LIBS="$XCB_SYNC_LIBS"
-        pkg_cv_XCB_SYNC_LIBS="$XCB_SYNC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-sync\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-sync") 2>&5
  ac_status=$?
@@ -22162,14 +22028,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22177,17 +22044,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-sync"`
+                XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-sync" 2>&1`
        else
-                XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-sync"`
+                XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-sync" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_SYNC_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_sync="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_sync="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_sync="no"
 else
        XCB_SYNC_CFLAGS=$pkg_cv_XCB_SYNC_CFLAGS
@@ -22212,11 +22079,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XFIXES" >&5
 $as_echo_n "checking for XCB_XFIXES... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XFIXES_CFLAGS"; then
-    if test -n "$XCB_XFIXES_CFLAGS"; then
+    pkg_cv_XCB_XFIXES_CFLAGS="$XCB_XFIXES_CFLAGS"
-        pkg_cv_XCB_XFIXES_CFLAGS="$XCB_XFIXES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xfixes\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xfixes") 2>&5
  ac_status=$?
@@ -22226,15 +22092,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XFIXES_LIBS"; then
-    if test -n "$XCB_XFIXES_LIBS"; then
+    pkg_cv_XCB_XFIXES_LIBS="$XCB_XFIXES_LIBS"
-        pkg_cv_XCB_XFIXES_LIBS="$XCB_XFIXES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xfixes\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xfixes") 2>&5
  ac_status=$?
@@ -22244,14 +22108,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22259,17 +22124,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xfixes"`
+                XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xfixes" 2>&1`
        else
-                XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xfixes"`
+                XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xfixes" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_XFIXES_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_xfixes="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_xfixes="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_xfixes="no"
 else
        XCB_XFIXES_CFLAGS=$pkg_cv_XCB_XFIXES_CFLAGS
@@ -22294,11 +22159,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XINERAMA" >&5
 $as_echo_n "checking for XCB_XINERAMA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XINERAMA_CFLAGS"; then
-    if test -n "$XCB_XINERAMA_CFLAGS"; then
+    pkg_cv_XCB_XINERAMA_CFLAGS="$XCB_XINERAMA_CFLAGS"
-        pkg_cv_XCB_XINERAMA_CFLAGS="$XCB_XINERAMA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinerama\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xinerama") 2>&5
  ac_status=$?
@@ -22308,15 +22172,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XINERAMA_LIBS"; then
-    if test -n "$XCB_XINERAMA_LIBS"; then
+    pkg_cv_XCB_XINERAMA_LIBS="$XCB_XINERAMA_LIBS"
-        pkg_cv_XCB_XINERAMA_LIBS="$XCB_XINERAMA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinerama\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xinerama") 2>&5
  ac_status=$?
@@ -22326,14 +22188,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22341,17 +22204,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xinerama"`
+                XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xinerama" 2>&1`
        else
-                XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xinerama"`
+                XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xinerama" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_XINERAMA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_xinerama="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_xinerama="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_xinerama="no"
 else
        XCB_XINERAMA_CFLAGS=$pkg_cv_XCB_XINERAMA_CFLAGS
@@ -22376,11 +22239,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XPRINT" >&5
 $as_echo_n "checking for XCB_XPRINT... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XPRINT_CFLAGS"; then
-    if test -n "$XCB_XPRINT_CFLAGS"; then
+    pkg_cv_XCB_XPRINT_CFLAGS="$XCB_XPRINT_CFLAGS"
-        pkg_cv_XCB_XPRINT_CFLAGS="$XCB_XPRINT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xprint\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xprint") 2>&5
  ac_status=$?
@@ -22390,15 +22252,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XPRINT_LIBS"; then
-    if test -n "$XCB_XPRINT_LIBS"; then
+    pkg_cv_XCB_XPRINT_LIBS="$XCB_XPRINT_LIBS"
-        pkg_cv_XCB_XPRINT_LIBS="$XCB_XPRINT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xprint\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xprint") 2>&5
  ac_status=$?
@@ -22408,14 +22268,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22423,17 +22284,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xprint"`
+                XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xprint" 2>&1`
        else
-                XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xprint"`
+                XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xprint" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_XPRINT_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_xprint="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_xprint="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_xprint="no"
 else
        XCB_XPRINT_CFLAGS=$pkg_cv_XCB_XPRINT_CFLAGS
@@ -22458,11 +22319,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XTEST" >&5
 $as_echo_n "checking for XCB_XTEST... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XTEST_CFLAGS"; then
-    if test -n "$XCB_XTEST_CFLAGS"; then
+    pkg_cv_XCB_XTEST_CFLAGS="$XCB_XTEST_CFLAGS"
-        pkg_cv_XCB_XTEST_CFLAGS="$XCB_XTEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xtest\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xtest") 2>&5
  ac_status=$?
@@ -22472,15 +22332,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XTEST_LIBS"; then
-    if test -n "$XCB_XTEST_LIBS"; then
+    pkg_cv_XCB_XTEST_LIBS="$XCB_XTEST_LIBS"
-        pkg_cv_XCB_XTEST_LIBS="$XCB_XTEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xtest\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xtest") 2>&5
  ac_status=$?
@@ -22490,14 +22348,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22505,17 +22364,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xtest"`
+                XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xtest" 2>&1`
        else
-                XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xtest"`
+                XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xtest" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_XTEST_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_xtest="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_xtest="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_xtest="no"
 else
        XCB_XTEST_CFLAGS=$pkg_cv_XCB_XTEST_CFLAGS
@@ -22542,11 +22401,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XINPUT" >&5
 $as_echo_n "checking for XCB_XINPUT... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XINPUT_CFLAGS"; then
-    if test -n "$XCB_XINPUT_CFLAGS"; then
+    pkg_cv_XCB_XINPUT_CFLAGS="$XCB_XINPUT_CFLAGS"
-        pkg_cv_XCB_XINPUT_CFLAGS="$XCB_XINPUT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinput\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xinput") 2>&5
  ac_status=$?
@@ -22556,15 +22414,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_XINPUT_LIBS"; then
-    if test -n "$XCB_XINPUT_LIBS"; then
+    pkg_cv_XCB_XINPUT_LIBS="$XCB_XINPUT_LIBS"
-        pkg_cv_XCB_XINPUT_LIBS="$XCB_XINPUT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinput\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-xinput") 2>&5
  ac_status=$?
@@ -22574,14 +22430,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22589,17 +22446,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xinput"`
+                XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xinput" 2>&1`
        else
-                XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xinput"`
+                XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xinput" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_XINPUT_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_xinput="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_xinput="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_xinput="no"
 else
        XCB_XINPUT_CFLAGS=$pkg_cv_XCB_XINPUT_CFLAGS
@@ -22624,11 +22481,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_CURSOR" >&5
 $as_echo_n "checking for XCB_CURSOR... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_CURSOR_CFLAGS"; then
-    if test -n "$XCB_CURSOR_CFLAGS"; then
+    pkg_cv_XCB_CURSOR_CFLAGS="$XCB_CURSOR_CFLAGS"
-        pkg_cv_XCB_CURSOR_CFLAGS="$XCB_CURSOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5
  ac_status=$?
@@ -22638,15 +22494,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_CURSOR_LIBS"; then
-    if test -n "$XCB_CURSOR_LIBS"; then
+    pkg_cv_XCB_CURSOR_LIBS="$XCB_CURSOR_LIBS"
-        pkg_cv_XCB_CURSOR_LIBS="$XCB_CURSOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5
  ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5
  ac_status=$?
@@ -22656,14 +22510,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -22671,17 +22526,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-render xcb-renderutil"`
+                XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-render xcb-renderutil" 2>&1`
        else
-                XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-render xcb-renderutil"`
+                XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-render xcb-renderutil" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_CURSOR_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_xcb_cursor="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_xcb_cursor="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_xcb_cursor="no"
 else
        XCB_CURSOR_CFLAGS=$pkg_cv_XCB_CURSOR_CFLAGS
@@ -22740,7 +22595,7 @@ if test "x$with_x" = xno; then
  have_x=disabled
 else
  case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -22758,7 +22613,7 @@ libdir:
        @echo libdir='${LIBDIR}'
 _ACEOF
  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
    for ac_var in incroot usrlibdir libdir; do
      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
    done
@@ -22844,7 +22699,7 @@ else
  fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 if test "$ac_x_libraries" = no; then
@@ -24710,46 +24565,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVAS" >&5
 $as_echo_n "checking for EVAS... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EVAS_CFLAGS"; then
-    if test -n "$EVAS_CFLAGS"; then
+    pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS"
-        pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.1.99\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evas >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "evas >= 1.1.99") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.1.99" 2>/dev/null`
+  pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.2.0" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$EVAS_LIBS"; then
-    if test -n "$EVAS_LIBS"; then
+    pkg_cv_EVAS_LIBS="$EVAS_LIBS"
-        pkg_cv_EVAS_LIBS="$EVAS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.1.99\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evas >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "evas >= 1.1.99") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.1.99" 2>/dev/null`
+  pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.2.0" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -24757,17 +24610,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evas >= 1.1.99"`
+                EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evas >= 1.2.0" 2>&1`
        else
-                EVAS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evas >= 1.1.99"`
+                EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "evas >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EVAS_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_evas="no"
-$as_echo "no" >&6; }
-                have_evas="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_evas="no"
 else
        EVAS_CFLAGS=$pkg_cv_EVAS_CFLAGS
@@ -24784,8 +24637,7 @@ for ac_header in sys/select.h sys/prctl.h
 do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -25106,8 +24958,7 @@ $as_echo "#define HAVE_SYS_TIME_H 1" >>confdefs.h
 do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -25121,12 +24972,49 @@ esac
 # ecore_con
-for ac_header in arpa/inet.h arpa/nameser.h netinet/tcp.h net/if.h netinet/in.h sys/socket.h sys/un.h ws2tcpip.h netdb.h
+for ac_header in sys/socket.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_socket_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SOCKET_H 1
+_ACEOF
+fi
+done
+for ac_header in net/if.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
+#include <stdio.h>
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+"
+if test "x$ac_cv_header_net_if_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NET_IF_H 1
+_ACEOF
+fi
+done
+for ac_header in sys/un.h arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h
 do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -25326,7 +25214,7 @@ if  test "x${_efl_enable_win32_threads}" = "xyes" ; then
      mingw*)
         ;;
      *)
-         as_fn_error "Win32 threads support requested but non Windows system found." "$LINENO" 5
+         as_fn_error $? "Win32 threads support requested but non Windows system found." "$LINENO" 5
         ;;
   esac
 fi
@@ -25334,7 +25222,7 @@ fi
 if  test "x${_efl_enable_posix_threads}" = "xyes" ; then
   case "$host_os" in
      mingw*)
-         as_fn_error "POSIX threads support requested but Windows system found." "$LINENO" 5
+         as_fn_error $? "POSIX threads support requested but Windows system found." "$LINENO" 5
         ;;
      *)
         ;;
@@ -25397,7 +25285,7 @@ $as_echo_n "checking whether system support POSIX threads... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_efl_have_posix_threads}" >&5
 $as_echo "${_efl_have_posix_threads}" >&6; }
 if test "$x{_efl_enable_posix_threads}" = "xyes" && test "x${_efl_have_posix_threads}" = "xno"; then
-   as_fn_error "POSIX threads support requested but not found." "$LINENO" 5
+   as_fn_error $? "POSIX threads support requested but not found." "$LINENO" 5
 fi
 EFL_PTHREAD_CFLAGS=""
@@ -25497,9 +25385,8 @@ else
  if test "$ac_cv_type_int" = yes; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (int)
-as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5 ; }
-See \`config.log' for more details." "$LINENO" 5; }; }
   else
     ac_cv_sizeof_int=0
   fi
@@ -25531,9 +25418,8 @@ else
  if test "$ac_cv_type_long" = yes; then
     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (long)
-as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5 ; }
-See \`config.log' for more details." "$LINENO" 5; }; }
   else
     ac_cv_sizeof_long=0
   fi
@@ -26149,8 +26035,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
     ;; #(
   *)
-     as_fn_error "unknown endianness
+     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
@@ -26351,14 +26237,12 @@ esac
 ### Checks for library functions
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
-$as_echo_n "checking for strerror in -lcposix... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then :
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
+  ac_func_search_save_LIBS=$LIBS
-LIBS="-lcposix  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -26377,22 +26261,37 @@ return strerror ();
  return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+for ac_lib in '' cposix; do
-  ac_cv_lib_cposix_strerror=yes
+  if test -z "$ac_lib"; then
-else
+    ac_res="none required"
-  ac_cv_lib_cposix_strerror=no
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_strerror=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext
-LIBS=$ac_check_lib_save_LIBS
+  if test "${ac_cv_search_strerror+set}" = set; then :
-fi
+  break
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
-$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
-if test "x$ac_cv_lib_cposix_strerror" = x""yes; then :
-  LIBS="$LIBS -lcposix"
 fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then :
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
@@ -26521,8 +26420,7 @@ if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -26588,8 +26486,7 @@ for ac_func in gettimeofday strlcpy execvp
 do :
  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -26661,7 +26558,7 @@ $as_echo "#define HAVE_ATFILE_SOURCE 1" >>confdefs.h
 else
       if test "x${have_atfile_source}" = "xyes" ; then
-          as_fn_error "required atfile-source but no mkdirat()" "$LINENO" 5
+          as_fn_error $? "required atfile-source but no mkdirat()" "$LINENO" 5
       fi
       have_atfile_source="no"
@@ -26670,6 +26567,94 @@ done
 fi
+SHM_OPEN_LIBS=""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shm_open is in libc" >&5
+$as_echo_n "checking whether shm_open is in libc... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+int
+main ()
+{
+int fd;
+fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+shm_unlink("/");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+    have_shm_open="yes"
+$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
+else
+  have_shm_open="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS="${LIBS_save}"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_shm_open}" >&5
+$as_echo "${have_shm_open}" >&6; }
+if ! test "x${have_shm_open}" = "xyes" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shm_open is in librt" >&5
+$as_echo_n "checking whether shm_open is in librt... " >&6; }
+   LIBS_save="${LIBS}"
+   LIBS="${LIBS} -lrt"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+int
+main ()
+{
+int fd;
+fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+shm_unlink("/");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+       have_shm_open="yes"
+$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
+       SHM_OPEN_LIBS="-lrt"
+else
+  have_shm_open="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+   LIBS="${LIBS_save}"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_shm_open}" >&5
+$as_echo "${have_shm_open}" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shm_open is available" >&5
+$as_echo_n "checking whether shm_open is available... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_shm_open}" >&5
+$as_echo "${have_shm_open}" >&6; }
 ### Checks for optionnal feature
 ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"
 if test "x$ac_cv_func_mallinfo" = x""yes; then :
@@ -26823,11 +26808,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
 $as_echo_n "checking for CURL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$CURL_CFLAGS"; then
-    if test -n "$CURL_CFLAGS"; then
+    pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
-        pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
  ac_status=$?
@@ -26837,15 +26821,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$CURL_LIBS"; then
-    if test -n "$CURL_LIBS"; then
+    pkg_cv_CURL_LIBS="$CURL_LIBS"
-        pkg_cv_CURL_LIBS="$CURL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
  ac_status=$?
@@ -26855,14 +26837,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -26870,17 +26853,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl"`
+                CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcurl" 2>&1`
        else
-                CURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl"`
+                CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcurl" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$CURL_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        _ecore_have_curl="no"
-$as_echo "no" >&6; }
-                _ecore_have_curl="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        _ecore_have_curl="no"
 else
        CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
@@ -26928,11 +26911,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS" >&5
 $as_echo_n "checking for TLS... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$TLS_CFLAGS"; then
-    if test -n "$TLS_CFLAGS"; then
+    pkg_cv_TLS_CFLAGS="$TLS_CFLAGS"
-        pkg_cv_TLS_CFLAGS="$TLS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5
  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5
  ac_status=$?
@@ -26942,15 +26924,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$TLS_LIBS"; then
-    if test -n "$TLS_LIBS"; then
+    pkg_cv_TLS_LIBS="$TLS_LIBS"
-        pkg_cv_TLS_LIBS="$TLS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5
  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5
  ac_status=$?
@@ -26960,14 +26940,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -26975,17 +26956,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 2.10.2"`
+                TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.10.2" 2>&1`
        else
-                TLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.10.2"`
+                TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.10.2" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$TLS_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        _ecore_have_gnutls="no"
-$as_echo "no" >&6; }
-                _ecore_have_gnutls="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        _ecore_have_gnutls="no"
 else
        TLS_CFLAGS=$pkg_cv_TLS_CFLAGS
@@ -27005,11 +26986,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS2" >&5
 $as_echo_n "checking for TLS2... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$TLS2_CFLAGS"; then
-    if test -n "$TLS2_CFLAGS"; then
+    pkg_cv_TLS2_CFLAGS="$TLS2_CFLAGS"
-        pkg_cv_TLS2_CFLAGS="$TLS2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5
  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5
  ac_status=$?
@@ -27019,15 +26999,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$TLS2_LIBS"; then
-    if test -n "$TLS2_LIBS"; then
+    pkg_cv_TLS2_LIBS="$TLS2_LIBS"
-        pkg_cv_TLS2_LIBS="$TLS2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5
  ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5
  ac_status=$?
@@ -27037,14 +27015,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -27052,17 +27031,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                TLS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 2.10.2"`
+                TLS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.10.2" 2>&1`
        else
-                TLS2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.10.2"`
+                TLS2_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.10.2" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$TLS2_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        dummy="no"
-$as_echo "no" >&6; }
-                dummy="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        dummy="no"
 else
        TLS2_CFLAGS=$pkg_cv_TLS2_CFLAGS
@@ -27220,11 +27199,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL" >&5
 $as_echo_n "checking for SSL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$SSL_CFLAGS"; then
-    if test -n "$SSL_CFLAGS"; then
+    pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
-        pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
  ac_status=$?
@@ -27234,15 +27212,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$SSL_LIBS"; then
-    if test -n "$SSL_LIBS"; then
+    pkg_cv_SSL_LIBS="$SSL_LIBS"
-        pkg_cv_SSL_LIBS="$SSL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
  ac_status=$?
@@ -27252,14 +27228,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -27267,17 +27244,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
+                SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
        else
-                SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
+                SSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$SSL_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        _ecore_have_openssl="no"
-$as_echo "no" >&6; }
-                _ecore_have_openssl="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        _ecore_have_openssl="no"
 else
        SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
@@ -27334,46 +27311,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5
 $as_echo_n "checking for CARES... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$CARES_CFLAGS"; then
-    if test -n "$CARES_CFLAGS"; then
+    pkg_cv_CARES_CFLAGS="$CARES_CFLAGS"
-        pkg_cv_CARES_CFLAGS="$CARES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1 libcares != 1.7.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1") 2>&5
-  ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1 libcares != 1.7.5") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_CARES_CFLAGS=`$PKG_CONFIG --cflags "libcares >= 1.6.1 libcares != 1.7.5" 2>/dev/null`
+  pkg_cv_CARES_CFLAGS=`$PKG_CONFIG --cflags "libcares >= 1.6.1" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$CARES_LIBS"; then
-    if test -n "$CARES_LIBS"; then
+    pkg_cv_CARES_LIBS="$CARES_LIBS"
-        pkg_cv_CARES_LIBS="$CARES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1 libcares != 1.7.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1") 2>&5
-  ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1 libcares != 1.7.5") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_CARES_LIBS=`$PKG_CONFIG --libs "libcares >= 1.6.1 libcares != 1.7.5" 2>/dev/null`
+  pkg_cv_CARES_LIBS=`$PKG_CONFIG --libs "libcares >= 1.6.1" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -27381,17 +27356,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcares >= 1.6.1 libcares != 1.7.5"`
+                CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcares >= 1.6.1" 2>&1`
        else
-                CARES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcares >= 1.6.1 libcares != 1.7.5"`
+                CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcares >= 1.6.1" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$CARES_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        _ecore_have_cares="no"
-$as_echo "no" >&6; }
-                _ecore_have_cares="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        _ecore_have_cares="no"
 else
        CARES_CFLAGS=$pkg_cv_CARES_CFLAGS
@@ -27481,8 +27456,8 @@ fi
 if test "x$have_ecore_ipc" = "xyes"; then :
-     requirements_ecore_ipc="ecore-con >= 1.1.99 ${requirements_ecore_ipc}"
+     requirements_ecore_ipc="ecore-con >= 1.2.0 ${requirements_ecore_ipc}"
-     requirements_ecore_evas="ecore-ipc >= 1.1.99 ${requirements_ecore_evas}"
+     requirements_ecore_evas="ecore-ipc >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -27736,7 +27711,7 @@ fi
   if test "x${have_ecore_con}" = "xyes" ; then
-      requirements_ecore_file="ecore-con >= 1.1.99 ${requirements_ecore_file}"
+      requirements_ecore_file="ecore-con >= 1.2.0 ${requirements_ecore_file}"
   else
 _ecore_want_curl=${want_curl}
@@ -27760,11 +27735,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
 $as_echo_n "checking for CURL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$CURL_CFLAGS"; then
-    if test -n "$CURL_CFLAGS"; then
+    pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
-        pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
  ac_status=$?
@@ -27774,15 +27748,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$CURL_LIBS"; then
-    if test -n "$CURL_LIBS"; then
+    pkg_cv_CURL_LIBS="$CURL_LIBS"
-        pkg_cv_CURL_LIBS="$CURL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
  ac_status=$?
@@ -27792,14 +27764,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -27807,17 +27780,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl"`
+                CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcurl" 2>&1`
        else
-                CURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl"`
+                CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcurl" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$CURL_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        _ecore_have_curl="no"
-$as_echo "no" >&6; }
-                _ecore_have_curl="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        _ecore_have_curl="no"
 else
        CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
@@ -27853,7 +27826,7 @@ fi
 #fi
 #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}],
-#   [requirements_ecore_config="ecore-ipc >= 1.1.99 evas >= 1.1.99 eet >= 1.5.0 ${requirements_ecore_config}"])
+#   [requirements_ecore_config="ecore-ipc >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 ${requirements_ecore_config}"])
 if false; then
  BUILD_ECORE_CONFIG_TRUE=
@@ -27983,7 +27956,7 @@ fi
 if test "x$have_ecore_imf_evas" = "xyes"; then :
-  requirements_ecore_imf_evas="ecore-imf >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_imf_evas}"
+  requirements_ecore_imf_evas="ecore-imf >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_imf_evas}"
 fi
@@ -28103,7 +28076,7 @@ fi
 if test "x$have_ecore_input_evas" = "xyes"; then :
-  requirements_ecore_input_evas="ecore-input >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_input}"
+  requirements_ecore_input_evas="ecore-input >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_input}"
 fi
@@ -28183,7 +28156,7 @@ fi
 if test "x$have_ecore_imf_xim" = "xyes"; then :
-  requirements_ecore_imf_xim="ecore-imf >= 1.1.99 ecore-x >= 1.1.99 ecore-input >= 1.1.99 ${requirements_ecore_imf_xim}"
+  requirements_ecore_imf_xim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_xim}"
 fi
@@ -28199,11 +28172,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCIM" >&5
 $as_echo_n "checking for SCIM... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$SCIM_CFLAGS"; then
-    if test -n "$SCIM_CFLAGS"; then
+    pkg_cv_SCIM_CFLAGS="$SCIM_CFLAGS"
-        pkg_cv_SCIM_CFLAGS="$SCIM_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"scim\""; } >&5
  ($PKG_CONFIG --exists --print-errors "scim") 2>&5
  ac_status=$?
@@ -28213,15 +28185,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$SCIM_LIBS"; then
-    if test -n "$SCIM_LIBS"; then
+    pkg_cv_SCIM_LIBS="$SCIM_LIBS"
-        pkg_cv_SCIM_LIBS="$SCIM_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"scim\""; } >&5
  ($PKG_CONFIG --exists --print-errors "scim") 2>&5
  ac_status=$?
@@ -28231,14 +28201,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -28246,17 +28217,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                SCIM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "scim"`
+                SCIM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "scim" 2>&1`
        else
-                SCIM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "scim"`
+                SCIM_PKG_ERRORS=`$PKG_CONFIG --print-errors "scim" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$SCIM_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_scim="no"
-$as_echo "no" >&6; }
-                have_scim="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_scim="no"
 else
        SCIM_CFLAGS=$pkg_cv_SCIM_CFLAGS
@@ -28335,7 +28306,7 @@ fi
 if test "x$have_ecore_imf_scim" = "xyes"; then :
-  requirements_ecore_imf_scim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_scim}"
+  requirements_ecore_imf_scim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_scim}"
 fi
@@ -28407,7 +28378,7 @@ fi
 if test "x$have_ecore_x" = "xyes"; then :
   ecore_x_libs="$ecore_x_libs $x_libs"
-   requirements_ecore_x="ecore-input >= 1.1.99 ${requirements_ecore_x}"
+   requirements_ecore_x="ecore-input >= 1.2.0 ${requirements_ecore_x}"
 fi
@@ -28472,7 +28443,7 @@ fi
 if test "x$have_ecore_win32" = "xyes"; then :
    ecore_win32_libs="-lole32 -lgdi32"
-    requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"
+    requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}"
 fi
@@ -28541,7 +28512,7 @@ fi
 if test "x$have_ecore_cocoa" = "xyes"; then :
-  requirements_ecore_cocoa="ecore-input >= 1.1.99 ${requirements_ecore_cocoa}"
+  requirements_ecore_cocoa="ecore-input >= 1.2.0 ${requirements_ecore_cocoa}"
 fi
@@ -28608,7 +28579,7 @@ fi
 if test "x$have_ecore_sdl" = "xyes"; then :
-  requirements_ecore_sdl="ecore-input >= 1.1.99 ${requirements_ecore_sdl}"
+  requirements_ecore_sdl="ecore-input >= 1.2.0 ${requirements_ecore_sdl}"
 fi
@@ -28668,7 +28639,7 @@ fi
 if test "x$have_ecore_psl1ght" = "xyes"; then :
-  requirements_ecore_psl1ght="ecore-input >= 1.1.99 ${requirements_ecore_psl1ght}"
+  requirements_ecore_psl1ght="ecore-input >= 1.2.0 ${requirements_ecore_psl1ght}"
 fi
@@ -28765,11 +28736,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5
 $as_echo_n "checking for TSLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$TSLIB_CFLAGS"; then
-    if test -n "$TSLIB_CFLAGS"; then
+    pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
-        pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5
  ac_status=$?
@@ -28779,15 +28749,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$TSLIB_LIBS"; then
-    if test -n "$TSLIB_LIBS"; then
+    pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
-        pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5
  ac_status=$?
@@ -28797,14 +28765,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -28812,26 +28781,23 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-1.0"`
+                TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-1.0" 2>&1`
        else
-                TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-1.0"`
+                TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$TSLIB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5
 $as_echo_n "checking for TSLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$TSLIB_CFLAGS"; then
-    if test -n "$TSLIB_CFLAGS"; then
+    pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
-        pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5
  ($PKG_CONFIG --exists --print-errors "tslib") 2>&5
  ac_status=$?
@@ -28841,15 +28807,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$TSLIB_LIBS"; then
-    if test -n "$TSLIB_LIBS"; then
+    pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
-        pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5
  ($PKG_CONFIG --exists --print-errors "tslib") 2>&5
  ac_status=$?
@@ -28859,14 +28823,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -28874,15 +28839,13 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib"`
+                TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib" 2>&1`
        else
-                TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib"`
+                TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$TSLIB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
         ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default"
 if test "x$ac_cv_header_tslib_h" = x""yes; then :
@@ -28994,6 +28957,8 @@ fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default"
 if test "x$ac_cv_header_tslib_h" = x""yes; then :
@@ -29119,17 +29084,18 @@ $as_echo "#define HAVE_TSLIB 1" >>confdefs.h
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5
 $as_echo_n "checking for TSLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$TSLIB_CFLAGS"; then
-    if test -n "$TSLIB_CFLAGS"; then
+    pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
-        pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5
  ($PKG_CONFIG --exists --print-errors "tslib") 2>&5
  ac_status=$?
@@ -29139,15 +29105,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$TSLIB_LIBS"; then
-    if test -n "$TSLIB_LIBS"; then
+    pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
-        pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5
  ($PKG_CONFIG --exists --print-errors "tslib") 2>&5
  ac_status=$?
@@ -29157,14 +29121,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -29172,15 +29137,13 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib"`
+                TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib" 2>&1`
        else
-                TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib"`
+                TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$TSLIB_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
         ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default"
 if test "x$ac_cv_header_tslib_h" = x""yes; then :
@@ -29292,6 +29255,8 @@ fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default"
 if test "x$ac_cv_header_tslib_h" = x""yes; then :
@@ -29559,7 +29524,7 @@ fi
 if test "x$have_ecore_wince" = "xyes"; then :
-  requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"
+  requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}"
 fi
@@ -29574,7 +29539,7 @@ fi
 # ecore_evas
 ecore_evas_deps="no"
-if test "x${have_evas}" = "xyes" -a "x${have_ecore_input}" = "xyes" -a "x${have_ecore_input_evas}" = "xyes" ; then
+if test "x${have_evas}" = "xyes" && test "x${have_ecore_input}" = "xyes" && test "x${have_ecore_input_evas}" = "xyes" ; then
   ecore_evas_deps="yes"
 fi
@@ -29628,7 +29593,7 @@ fi
 if test "x$have_ecore_evas" = "xyes"; then :
-  requirements_ecore_evas="ecore-input >= 1.1.99 ecore-input-evas >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_evas}"
+  requirements_ecore_evas="ecore-input >= 1.2.0 ecore-input-evas >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -29662,9 +29627,9 @@ $as_echo_n "checking whether ecore_evas Software Buffer support is to be built..
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "xyes" = "xyes" -a \
+if test "xyes" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-buffer\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-buffer") 2>&5
@@ -29719,9 +29684,9 @@ $as_echo_n "checking whether ecore_evas Software X11 support is to be built... "
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_x}" = "xyes" -a \
+if test "x${have_ecore_x}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-x11\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-x11") 2>&5
@@ -29797,9 +29762,9 @@ $as_echo_n "checking whether ecore_evas OpenGL Xlib support is to be built... "
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_x}" = "xyes" -a \
+if test "x${have_ecore_x}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-x11\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-opengl-x11") 2>&5
@@ -29849,11 +29814,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_X11" >&5
 $as_echo_n "checking for XCB_X11... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_X11_CFLAGS"; then
-    if test -n "$XCB_X11_CFLAGS"; then
+    pkg_cv_XCB_X11_CFLAGS="$XCB_X11_CFLAGS"
-        pkg_cv_XCB_X11_CFLAGS="$XCB_X11_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5
  ac_status=$?
@@ -29863,15 +29827,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$XCB_X11_LIBS"; then
-    if test -n "$XCB_X11_LIBS"; then
+    pkg_cv_XCB_X11_LIBS="$XCB_X11_LIBS"
-        pkg_cv_XCB_X11_LIBS="$XCB_X11_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5
  ($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5
  ac_status=$?
@@ -29881,14 +29843,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -29896,17 +29859,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                XCB_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb"`
+                XCB_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb" 2>&1`
        else
-                XCB_X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb"`
+                XCB_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$XCB_X11_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+         have_ecore_x_opengl_xcb="no"
-$as_echo "no" >&6; }
-                 have_ecore_x_opengl_xcb="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_ecore_x_opengl_xcb="no"
 else
        XCB_X11_CFLAGS=$pkg_cv_XCB_X11_CFLAGS
@@ -29954,9 +29917,9 @@ $as_echo_n "checking whether ecore_evas Software Xlib 16 bits support is to be b
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_x_xlib}" = "xyes" -a \
+if test "x${have_ecore_x_xlib}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-x11\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-16-x11") 2>&5
@@ -30007,9 +29970,9 @@ $as_echo_n "checking whether ecore_evas Software 8bit X11 support is to be built
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x$have_ecore_x_xcb" = "xyes" -a \
+if test "x$have_ecore_x_xcb" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-8-x11\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-8-x11") 2>&5
@@ -30047,7 +30010,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \
 $as_echo "#define BUILD_ECORE_EVAS_X11 1" >>confdefs.h
-   requirements_ecore_evas="ecore-x >= 1.1.99 ${requirements_ecore_evas}"
+   requirements_ecore_evas="ecore-x >= 1.2.0 ${requirements_ecore_evas}"
 fi
 # ecore_evas_win32
@@ -30074,9 +30037,9 @@ $as_echo_n "checking whether ecore_evas Software GDI support is to be built... "
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_win32}" = "xyes" -a \
+if test "x${have_ecore_win32}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-gdi\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-gdi") 2>&5
@@ -30127,9 +30090,9 @@ $as_echo_n "checking whether ecore_evas Software DirectDraw support is to be bui
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_win32}" = "xyes" -a \
+if test "x${have_ecore_win32}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-ddraw\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-ddraw") 2>&5
@@ -30180,9 +30143,9 @@ $as_echo_n "checking whether ecore_evas Direct3d support is to be built... " >&6
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_win32}" = "xyes" -a \
+if test "x${have_ecore_win32}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-direct3d\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-direct3d") 2>&5
@@ -30233,9 +30196,9 @@ $as_echo_n "checking whether ecore_evas Glew OpenGL support is to be built... "
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_win32}" = "xyes" -a \
+if test "x${have_ecore_win32}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-glew\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-opengl-glew") 2>&5
@@ -30286,9 +30249,9 @@ $as_echo_n "checking whether ecore_evas 16 bpp Software DirectDraw support is to
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_win32}" = "xyes" -a \
+if test "x${have_ecore_win32}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-ddraw\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-16-ddraw") 2>&5
@@ -30325,64 +30288,21 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \
 $as_echo "#define BUILD_ECORE_EVAS_WIN32 1" >>confdefs.h
-   requirements_ecore_evas="ecore-win32 >= 1.1.99 ${requirements_ecore_evas}"
+   requirements_ecore_evas="ecore-win32 >= 1.2.0 ${requirements_ecore_evas}"
 fi
 # ecore_evas_software_sdl
 have_ecore_evas_software_sdl="no"
-want_module="${want_ecore_evas_software_sdl}"
+if test "x${have_ecore_sdl}" = "xyes"; then
+   requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"
-# Check whether --enable-ecore-evas-software-sdl was given.
+   have_ecore_evas_software_sdl="yes"
-if test "${enable_ecore_evas_software_sdl+set}" = set; then :
-  enableval=$enable_ecore_evas_software_sdl;
-    if test "x${enableval}" = "xyes" ; then
-       want_module="yes"
-    else
-       want_module="no"
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ecore_evas Software SDL support is to be built" >&5
-$as_echo_n "checking whether ecore_evas Software SDL support is to be built... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
-$as_echo "${want_module}" >&6; }
-if test "x${have_ecore_sdl}" = "xyes" -a \
-        "x$have_ecore_evas" = "xyes" -a \
-        "x$want_module" = "xyes" ; then
-   if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-sdl\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-sdl") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
 $as_echo "#define BUILD_ECORE_EVAS_SOFTWARE_SDL 1" >>confdefs.h
-       have_ecore_evas_software_sdl="yes"
+   requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ecore_evas Software SDL support is built" >&5
-$as_echo_n "checking whether ecore_evas Software SDL support is built... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ecore_evas_software_sdl" >&5
-$as_echo "$have_ecore_evas_software_sdl" >&6; }
-if test "x$have_ecore_evas_software_sdl" = "xyes"; then :
-  requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"
 fi
 # ecore_evas_gl_sdl
@@ -30407,9 +30327,9 @@ $as_echo_n "checking whether ecore_evas OpenGL SDL support is to be built... " >
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_sdl}" = "xyes" -a \
+if test "x${have_ecore_sdl}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-sdl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-opengl-sdl") 2>&5
@@ -30431,7 +30351,7 @@ $as_echo_n "checking whether ecore_evas OpenGL SDL support is built... " >&6; }
 $as_echo "$have_ecore_evas_opengl_sdl" >&6; }
 if test "x$have_ecore_evas_opengl_sdl" = "xyes"; then :
-  requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"
+  requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -30462,9 +30382,9 @@ $as_echo_n "checking whether ecore_evas OpenGL Cocoa support is to be built... "
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_cocoa}" = "xyes" -a \
+if test "x${have_ecore_cocoa}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-cocoa\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-opengl-cocoa") 2>&5
@@ -30486,7 +30406,7 @@ $as_echo_n "checking whether ecore_evas OpenGL Cocoa support is built... " >&6;
 $as_echo "$have_ecore_evas_opengl_cocoa" >&6; }
 if test "x$have_ecore_evas_opengl_cocoa" = "xyes"; then :
-  requirements_ecore_evas="ecore-cocoa >= 1.1.99 ${requirements_ecore_evas}"
+  requirements_ecore_evas="ecore-cocoa >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -30517,9 +30437,9 @@ $as_echo_n "checking whether ecore_evas DirectFB support is to be built... " >&6
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_directfb}" = "xyes" -a \
+if test "x${have_ecore_directfb}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-directfb\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-directfb") 2>&5
@@ -30541,7 +30461,7 @@ $as_echo_n "checking whether ecore_evas DirectFB support is built... " >&6; }
 $as_echo "$have_ecore_evas_directfb" >&6; }
 if test "x$have_ecore_evas_directfb" = "xyes"; then :
-  requirements_ecore_evas="ecore-directfb >= 1.1.99 ${requirements_ecore_evas}"
+  requirements_ecore_evas="ecore-directfb >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -30572,9 +30492,9 @@ $as_echo_n "checking whether ecore_evas Linux Framebuffer support is to be built
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_fb}" = "xyes" -a \
+if test "x${have_ecore_fb}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-fb\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-fb") 2>&5
@@ -30596,7 +30516,7 @@ $as_echo_n "checking whether ecore_evas Linux Framebuffer support is built... "
 $as_echo "$have_ecore_evas_fb" >&6; }
 if test "x$have_ecore_evas_fb" = "xyes"; then :
-  requirements_ecore_evas="ecore-fb >= 1.1.99 ${requirements_ecore_evas}"
+  requirements_ecore_evas="ecore-fb >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -30627,9 +30547,9 @@ $as_echo_n "checking whether ecore_evas 16 bpp Software Windows CE support is to
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_wince}" = "xyes" -a \
+if test "x${have_ecore_wince}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-wince\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-16-wince") 2>&5
@@ -30651,7 +30571,7 @@ $as_echo_n "checking whether ecore_evas 16 bpp Software Windows CE support is bu
 $as_echo "$have_ecore_evas_software_16_wince" >&6; }
 if test "x$have_ecore_evas_software_16_wince" = "xyes"; then :
-  requirements_ecore_evas="ecore-wince >= 1.1.99 ${requirements_ecore_evas}"
+  requirements_ecore_evas="ecore-wince >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -30682,9 +30602,9 @@ $as_echo_n "checking whether ecore_evas Ecore Evas Single Process Windowing Syst
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "xyes" = "xyes" -a \
+if test "xyes" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-buffer\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-software-buffer") 2>&5
@@ -30713,6 +30633,25 @@ fi
+# ecore_evas_extn
+have_extn="yes"
+if test "x${have_ecore_ipc}" = "xno" || \
+   test "x${have_ecore_evas_software_buffer}" = "xno" || \
+   test "x${have_shm_open}" = "xno" ; then
+   have_extn="no"
+fi
+have_ecore_evas_extn="no"
+if test "x${want_ecore_evas_extn}" = "xyes" && \
+   test "x${have_extn}" = "xyes" && \
+   test "x${have_ecore_evas}" = "xyes"; then
+$as_echo "#define BUILD_ECORE_EVAS_EXTN 1" >>confdefs.h
+   have_ecore_evas_extn="yes"
+fi
 # ecore_evas_psl1ght
@@ -30737,9 +30676,9 @@ $as_echo_n "checking whether ecore_evas PSL1GHT support is to be built... " >&6;
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_psl1ght}" = "xyes" -a \
+if test "x${have_ecore_psl1ght}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-psl1ght\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-psl1ght") 2>&5
@@ -30761,7 +30700,7 @@ $as_echo_n "checking whether ecore_evas PSL1GHT support is built... " >&6; }
 $as_echo "$have_ecore_evas_psl1ght" >&6; }
 if test "x$have_ecore_evas_psl1ght" = "xyes"; then :
-  requirements_ecore_evas="ecore-psl1ght >= 1.1.99 ${requirements_ecore_evas}"
+  requirements_ecore_evas="ecore-psl1ght >= 1.2.0 ${requirements_ecore_evas}"
 fi
@@ -30778,46 +30717,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND" >&5
 $as_echo_n "checking for WAYLAND... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$WAYLAND_CFLAGS"; then
-    if test -n "$WAYLAND_CFLAGS"; then
+    pkg_cv_WAYLAND_CFLAGS="$WAYLAND_CFLAGS"
-        pkg_cv_WAYLAND_CFLAGS="$WAYLAND_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl wayland-egl wayland-client xkbcommon\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client xkbcommon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "egl wayland-egl wayland-client xkbcommon") 2>&5
-  ($PKG_CONFIG --exists --print-errors "wayland-client xkbcommon") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "wayland-client xkbcommon" 2>/dev/null`
+  pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "egl wayland-egl wayland-client xkbcommon" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$WAYLAND_LIBS"; then
-    if test -n "$WAYLAND_LIBS"; then
+    pkg_cv_WAYLAND_LIBS="$WAYLAND_LIBS"
-        pkg_cv_WAYLAND_LIBS="$WAYLAND_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl wayland-egl wayland-client xkbcommon\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client xkbcommon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "egl wayland-egl wayland-client xkbcommon") 2>&5
-  ($PKG_CONFIG --exists --print-errors "wayland-client xkbcommon") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "wayland-client xkbcommon" 2>/dev/null`
+  pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "egl wayland-egl wayland-client xkbcommon" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -30825,17 +30762,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "wayland-client xkbcommon"`
+                WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "egl wayland-egl wayland-client xkbcommon" 2>&1`
        else
-                WAYLAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "wayland-client xkbcommon"`
+                WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors "egl wayland-egl wayland-client xkbcommon" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$WAYLAND_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_wayland="no"
-$as_echo "no" >&6; }
-                have_wayland="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_wayland="no"
 else
        WAYLAND_CFLAGS=$pkg_cv_WAYLAND_CFLAGS
@@ -30909,7 +30846,7 @@ fi
 if test "x${have_ecore_wayland}" = "xyes" ; then
-  requirements_ecore_wayland="ecore-input >= 1.1.0 wayland-client xkbcommon ${requirements_ecore_wayland}"
+  requirements_ecore_wayland="ecore-input >= 1.2.0 egl wayland-egl wayland-client xkbcommon ${requirements_ecore_wayland}"
 fi
@@ -30934,9 +30871,9 @@ $as_echo_n "checking whether ecore_evas Wayland Shm support is to be built... "
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_wayland}" = "xyes" -a \
+if test "x${have_ecore_wayland}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-wayland-shm\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evas-wayland-shm") 2>&5
@@ -30987,12 +30924,12 @@ $as_echo_n "checking whether ecore_evas Wayland Egl support is to be built... "
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5
 $as_echo "${want_module}" >&6; }
-if test "x${have_ecore_wayland}" = "xyes" -a \
+if test "x${have_ecore_wayland}" = "xyes" && \
-        "x$have_ecore_evas" = "xyes" -a \
+   test "x$have_ecore_evas" = "xyes" && \
-        "x$want_module" = "xyes" ; then
+   test "x$want_module" = "xyes" ; then
   if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-wayland-egl\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-wayland-egl egl\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "evas-wayland-egl") 2>&5
+  ($PKG_CONFIG --exists --print-errors "evas-wayland-egl egl") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
@@ -31017,11 +30954,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGL" >&5
 $as_echo_n "checking for WAYLAND_EGL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$WAYLAND_EGL_CFLAGS"; then
-    if test -n "$WAYLAND_EGL_CFLAGS"; then
+    pkg_cv_WAYLAND_EGL_CFLAGS="$WAYLAND_EGL_CFLAGS"
-        pkg_cv_WAYLAND_EGL_CFLAGS="$WAYLAND_EGL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5
  ac_status=$?
@@ -31031,15 +30967,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$WAYLAND_EGL_LIBS"; then
-    if test -n "$WAYLAND_EGL_LIBS"; then
+    pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS"
-        pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5
  ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5
  ac_status=$?
@@ -31049,14 +30983,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -31064,17 +30999,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "wayland-egl"`
+                WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "wayland-egl" 2>&1`
        else
-                WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "wayland-egl"`
+                WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors "wayland-egl" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$WAYLAND_EGL_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_wayland_egl="no"
-$as_echo "no" >&6; }
-                have_wayland_egl="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_wayland_egl="no"
 else
        WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS
@@ -31093,6 +31028,120 @@ fi
+### Unit tests
+# Check whether --enable-tests was given.
+if test "${enable_tests+set}" = set; then :
+  enableval=$enable_tests;
+    if test "x${enableval}" = "xyes" ; then
+       _efl_enable_tests="yes"
+    else
+       _efl_enable_tests="no"
+    fi
+else
+  _efl_enable_tests="no"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tests are built" >&5
+$as_echo_n "checking whether tests are built... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_efl_enable_tests}" >&5
+$as_echo "${_efl_enable_tests}" >&6; }
+if test "x${_efl_enable_tests}" = "xyes" ; then
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
+$as_echo_n "checking for CHECK... " >&6; }
+if test -n "$CHECK_CFLAGS"; then
+    pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CHECK_LIBS"; then
+    pkg_cv_CHECK_LIBS="$CHECK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1`
+        else
+                CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$CHECK_PKG_ERRORS" >&5
+        _efl_enable_tests="no"
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        _efl_enable_tests="no"
+else
+        CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
+        CHECK_LIBS=$pkg_cv_CHECK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        dummy="yes"
+fi
+fi
+ if test "x${_efl_enable_tests}" = "xyes"; then
+  EFL_ENABLE_TESTS_TRUE=
+  EFL_ENABLE_TESTS_FALSE='#'
+else
+  EFL_ENABLE_TESTS_TRUE='#'
+  EFL_ENABLE_TESTS_FALSE=
+fi
+if test "x$_efl_enable_tests" = "xyes"; then :
+  enable_tests="yes"
+else
+  enable_tests="no"
+fi
 ### install and build examples
@@ -31280,6 +31329,7 @@ DEFS=-DHAVE_CONFIG_H
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
  # 1. Remove the extension, and $U if already installed.
  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -31303,168 +31353,172 @@ else
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PO_TRUE}" && test -z "${HAVE_PO_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PO\" was never defined.
+  as_fn_error $? "conditional \"HAVE_PO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then
-  as_fn_error "conditional \"EFL_ENABLE_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepOBJC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then
-  as_fn_error "conditional \"EFL_BUILD_DOC\" was never defined.
+  as_fn_error $? "conditional \"EFL_BUILD_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ECORE_HAVE_EXOTIC_TRUE}" && test -z "${ECORE_HAVE_EXOTIC_FALSE}"; then
+  as_fn_error $? "conditional \"ECORE_HAVE_EXOTIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ECORE_HAVE_WINCE_TRUE}" && test -z "${ECORE_HAVE_WINCE_FALSE}"; then
-  as_fn_error "conditional \"ECORE_HAVE_WINCE\" was never defined.
+  as_fn_error $? "conditional \"ECORE_HAVE_WINCE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ECORE_HAVE_WIN32_TRUE}" && test -z "${ECORE_HAVE_WIN32_FALSE}"; then
-  as_fn_error "conditional \"ECORE_HAVE_WIN32\" was never defined.
+  as_fn_error $? "conditional \"ECORE_HAVE_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ECORE_HAVE_PS3_TRUE}" && test -z "${ECORE_HAVE_PS3_FALSE}"; then
-  as_fn_error "conditional \"ECORE_HAVE_PS3\" was never defined.
+  as_fn_error $? "conditional \"ECORE_HAVE_PS3\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_X_XLIB_TRUE}" && test -z "${BUILD_ECORE_X_XLIB_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_X_XLIB\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_X_XLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_X_XCB_TRUE}" && test -z "${BUILD_ECORE_X_XCB_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_X_XCB\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_X_XCB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_CON_TRUE}" && test -z "${BUILD_ECORE_CON_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_CON\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_CON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_CARES_TRUE}" && test -z "${HAVE_CARES_FALSE}"; then
-  as_fn_error "conditional \"HAVE_CARES\" was never defined.
+  as_fn_error $? "conditional \"HAVE_CARES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_IPC_TRUE}" && test -z "${BUILD_ECORE_IPC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_IPC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_IPC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_FILE_TRUE}" && test -z "${BUILD_ECORE_FILE_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_FILE\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_FILE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_CONFIG_TRUE}" && test -z "${BUILD_ECORE_CONFIG_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_CONFIG\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_CONFIG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_IMF_TRUE}" && test -z "${BUILD_ECORE_IMF_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_IMF\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_IMF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_IMF_EVAS_TRUE}" && test -z "${BUILD_ECORE_IMF_EVAS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_IMF_EVAS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_IMF_EVAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_INPUT_TRUE}" && test -z "${BUILD_ECORE_INPUT_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_INPUT\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_INPUT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_INPUT_EVAS_TRUE}" && test -z "${BUILD_ECORE_INPUT_EVAS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_INPUT_EVAS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_INPUT_EVAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_IMF_XIM_TRUE}" && test -z "${BUILD_ECORE_IMF_XIM_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_IMF_XIM\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_IMF_XIM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_IMF_XIM_TRUE}" && test -z "${BUILD_ECORE_IMF_XIM_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_IMF_XIM\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_IMF_XIM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_IMF_SCIM_TRUE}" && test -z "${BUILD_ECORE_IMF_SCIM_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_IMF_SCIM_TRUE}" && test -z "${BUILD_ECORE_IMF_SCIM_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_X_TRUE}" && test -z "${BUILD_ECORE_X_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_X\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_X\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_WIN32_TRUE}" && test -z "${BUILD_ECORE_WIN32_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_WIN32\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_COCOA_TRUE}" && test -z "${BUILD_ECORE_COCOA_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_COCOA\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_COCOA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_SDL_TRUE}" && test -z "${BUILD_ECORE_SDL_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_SDL\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_SDL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_PSL1GHT_TRUE}" && test -z "${BUILD_ECORE_PSL1GHT_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_PSL1GHT\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_PSL1GHT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_FB_TRUE}" && test -z "${BUILD_ECORE_FB_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_FB\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_FB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_DIRECTFB_TRUE}" && test -z "${BUILD_ECORE_DIRECTFB_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_DIRECTFB\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_DIRECTFB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_WINCE_TRUE}" && test -z "${BUILD_ECORE_WINCE_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_WINCE\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_WINCE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_EVAS_TRUE}" && test -z "${BUILD_ECORE_EVAS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_EVAS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_EVAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ECORE_WAYLAND_TRUE}" && test -z "${BUILD_ECORE_WAYLAND_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ECORE_WAYLAND\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ECORE_WAYLAND\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"EFL_ENABLE_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EFL_BUILD_EXAMPLES_TRUE}" && test -z "${EFL_BUILD_EXAMPLES_FALSE}"; then
-  as_fn_error "conditional \"EFL_BUILD_EXAMPLES\" was never defined.
+  as_fn_error $? "conditional \"EFL_BUILD_EXAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EFL_INSTALL_EXAMPLES_TRUE}" && test -z "${EFL_INSTALL_EXAMPLES_FALSE}"; then
-  as_fn_error "conditional \"EFL_INSTALL_EXAMPLES\" was never defined.
+  as_fn_error $? "conditional \"EFL_INSTALL_EXAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -31614,19 +31668,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ---------------------------------
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
+  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
+  if test "$4"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
  as_fn_exit $as_status
 } # as_fn_error
@@ -31822,7 +31876,7 @@ $as_echo X"$as_dir" |
      test -d "$as_dir" && break
    done
    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 } # as_fn_mkdir_p
@@ -31875,8 +31929,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ecore $as_me 1.1.99.67344, which was
+This file was extended by ecore $as_me 1.2.0-alpha, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
  CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -31941,11 +31995,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ecore config.status 1.1.99.67344
+ecore config.status 1.2.0-alpha
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.67,
  with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
@@ -31963,11 +32017,16 @@ ac_need_defaults=:
 while test $# != 0
 do
  case $1 in
-  --*=*)
+  --*=?*)
    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    ac_shift=:
    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
  *)
    ac_option=$1
    ac_optarg=$2
@@ -31989,6 +32048,7 @@ do
    $ac_shift
    case $ac_optarg in
    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
    esac
    as_fn_append CONFIG_FILES " '$ac_optarg'"
    ac_need_defaults=false;;
@@ -32001,7 +32061,7 @@ do
    ac_need_defaults=false;;
  --he | --h)
    # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
  --help | --hel | -h )
    $as_echo "$ac_cs_usage"; exit ;;
@@ -32010,7 +32070,7 @@ Try \`$0 --help' for more information.";;
    ac_cs_silent=: ;;
  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
  *) as_fn_append ac_config_targets " $1"
@@ -32484,7 +32544,7 @@ do
    "ecore.spec") CONFIG_FILES="$CONFIG_FILES ecore.spec" ;;
    "$po_makefile_in") CONFIG_FILES="$CONFIG_FILES $po_makefile_in" ;;
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
  esac
 done
@@ -32522,7 +32582,7 @@ $debug ||
 {
  tmp=./conf$$-$RANDOM
  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -32539,7 +32599,7 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
  ac_cs_awk_cr=$ac_cr
 fi
@@ -32553,18 +32613,18 @@ _ACEOF
  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
  echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
  if test $ac_delim_n = $ac_delim_num; then
    break
  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  else
    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  fi
@@ -32653,20 +32713,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
  cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[  ]*VPATH[        ]*=/{
+  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
-s/:*\$(srcdir):*/:/
+h
-s/:*\${srcdir}:*/:/
+s///
-s/:*@srcdir@:*/:/
+s/^/:/
-s/^\([^=]*=[     ]*\):*/\1/
+s/[      ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[   ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[       ]*$//
 }'
 fi
@@ -32694,7 +32762,7 @@ for ac_last_try in false false :; do
  if test -z "$ac_t"; then
    break
  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  else
    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  fi
@@ -32779,7 +32847,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
@@ -32792,7 +32860,7 @@ do
  esac
  case $ac_mode$ac_tag in
  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
  :[FH]-) ac_tag=-:-;;
  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  esac
@@ -32820,7 +32888,7 @@ do
           [\\/$]*) false;;
           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
           esac ||
-           as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
      esac
      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
      as_fn_append ac_file_inputs " '$ac_f'"
@@ -32847,7 +32915,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
    case $ac_tag in
    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
    esac
    ;;
  esac
@@ -32984,22 +33052,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
  rm -f "$tmp/stdin"
  case $ac_file in
  -) cat "$tmp/out" && rm -f "$tmp/out";;
  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 ;;
  :H)
  #
@@ -33010,19 +33078,19 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
      $as_echo "/* $configure_input  */" \
      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
    else
      rm -f "$ac_file"
      mv "$tmp/config.h" "$ac_file" \
-        || as_fn_error "could not create $ac_file" "$LINENO" 5
+        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    fi
  else
    $as_echo "/* $configure_input  */" \
      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
  fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -34093,7 +34161,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 # configure is writing to config.log, and then calls config.status.
@@ -34114,7 +34182,7 @@ if test "$no_create" != yes; then
  exec 5>>config.log
  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
@@ -34266,6 +34334,7 @@ if test "x${have_ecore_evas}" = "xyes" ; then
  echo "    Sing.Proc. Windowing System: $have_ecore_evas_ews"
  echo "    Wayland Shm................: $have_ecore_evas_wayland_shm"
  echo "    Wayland Egl................: $have_ecore_evas_wayland_egl"
+  echo "    Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
 fi
 echo
 echo "  Tests................: ${enable_tests}"
diff --git a/libraries/ecore/configure.ac b/libraries/ecore/configure.ac
index 21393dd..3d93c9b 100644
--- a/libraries/ecore/configure.ac
+++ b/libraries/ecore/configure.ac
@@ -1,12 +1,12 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
-m4_define([v_min], [1])
+m4_define([v_min], [2])
-m4_define([v_mic], [99])
+m4_define([v_mic], [0])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n' | sed 's/Unversioneddirectory/0/' | tr -d '\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
-dnl m4_undefine([v_rev])
+m4_undefine([v_rev])
 ##--   When doing snapshots - change soname. remove dnl on below line
 dnl m4_define([relname], [ver-pre-svn-07])
 dnl m4_define([v_rel], [-release relname])
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-AC_INIT([ecore], [v_ver], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([ecore], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -174,6 +174,7 @@ want_ecore_evas_directfb="no"
 want_ecore_evas_fb="no"
 want_ecore_evas_software_16_wince="no"
 want_ecore_evas_ews="yes"
+want_ecore_evas_extn="yes"
 want_ecore_evas_wayland_shm="no"
 want_ecore_evas_wayland_egl="no"
@@ -182,11 +183,12 @@ want_ecore_imf_xim="no"
 want_ecore_imf_scim="no"
 case "$host_os" in
-   mingw32ce* | cegcc*)
+   mingw32ce*)
      want_ecore_con="no"
      want_ecore_ipc="no"
      want_ecore_wince="yes"
      want_ecore_evas_software_16_wince="yes"
+      want_ecore_evas_extn="no"
      ;;
   mingw*)
      want_notify_win32="yes"
@@ -273,30 +275,6 @@ requirements_ecore_imf_xim=""
 requirements_ecore_imf_scim=""
 requirements_ecore_wayland=""
-AC_CHECK_DECL([MAXHOSTNAMELEN],[FOUND_MAXHOSTNAMELEN=yes])
-if test x$FOUND_MAXHOSTNAMELEN != xyes ; then
-  AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
-  FOUND_MAXHOSTNAMELEN='not found'
-  AC_COMPILE_IFELSE(
-        AC_LANG_PROGRAM([#include <sys/param.h>],
-                [int h = MAXHOSTNAMELEN;]),
-        [FOUND_MAXHOSTNAMELEN='sys/param.h'
-           AC_DEFINE(NEED_SYS_PARAM_H,1,
-             [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])])
-        AC_COMPILE_IFELSE(
-            AC_LANG_PROGRAM([#include <netdb.h>],
-                            [int h = MAXHOSTNAMELEN;]),
-            [FOUND_MAXHOSTNAMELEN='netdb.h'
-             AC_DEFINE(NEED_NETDB_H,1,
-               [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])])
-  AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
-fi
 ### Additional options to configure
 want_glib_integration_always=no
@@ -377,10 +355,6 @@ if test "x${want_xim}" = "xyes" ; then
   AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method])
 fi
-# Unit tests
-EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
 ### Checks for programs
 m4_ifdef([AC_PROG_OBJC],
@@ -499,6 +473,21 @@ case "$host_vendor" in
      ;;
 esac
+### Checks for portability layer
+PKG_CHECK_MODULES([EXOTIC],
+   [exotic],
+   [enable_exotic="yes"],
+   [enable_exotic="no"])
+if test "x${enable_exotic}" = "xyes"; then
+    requirements_ecore="exotic ${requirements_ecore}"
+    AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.])
+fi
+AM_CONDITIONAL([ECORE_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
 AC_SUBST(EFL_ECORE_BUILD)
 AC_SUBST(EFL_ECORE_CON_BUILD)
 AC_SUBST(EFL_ECORE_EVAS_BUILD)
@@ -549,26 +538,26 @@ AC_SUBST(rt_libs)
 # Eina library
-PKG_CHECK_MODULES(EINA, [eina >= 1.1.0])
+PKG_CHECK_MODULES(EINA, [eina >= 1.2.0])
 #FIXME check all the requirements when the eina move will be finished
-requirements_ecore="eina >= 1.1.0 ${requirements_ecore}"
+requirements_ecore="eina >= 1.2.0 ${requirements_ecore}"
-requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}"
+requirements_ecore_con="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_con}"
-#requirements_ecore_config="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_config}"
+#requirements_ecore_config="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_config}"
-requirements_ecore_directfb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_directfb}"
+requirements_ecore_directfb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_directfb}"
-requirements_ecore_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_evas}"
+requirements_ecore_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_evas}"
-requirements_ecore_fb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_fb}"
+requirements_ecore_fb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_fb}"
-requirements_ecore_file="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_file}"
+requirements_ecore_file="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_file}"
-requirements_ecore_imf="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf}"
+requirements_ecore_imf="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf}"
-requirements_ecore_imf_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf_evas}"
+requirements_ecore_imf_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf_evas}"
-requirements_ecore_input="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input}"
+requirements_ecore_input="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input}"
-requirements_ecore_input_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input_evas}"
+requirements_ecore_input_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input_evas}"
-requirements_ecore_ipc="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_ipc}"
+requirements_ecore_ipc="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_ipc}"
-requirements_ecore_cocoa="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_cocoa}"
+requirements_ecore_cocoa="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_cocoa}"
-requirements_ecore_sdl="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}"
+requirements_ecore_sdl="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}"
-requirements_ecore_psl1ght="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}"
+requirements_ecore_psl1ght="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}"
-requirements_ecore_win32="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_win32}"
+requirements_ecore_win32="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_win32}"
-requirements_ecore_wince="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_wince}"
+requirements_ecore_wince="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_wince}"
-requirements_ecore_x="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_x}"
+requirements_ecore_x="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_x}"
 # glib support (main loop integration)
@@ -637,6 +626,45 @@ PKG_CHECK_MODULES([DIRECTFB],
 # Xlib and XCB (ecore_x)
+AC_CHECK_DECL([MAXHOSTNAMELEN], [FOUND_MAXHOSTNAMELEN=yes])
+if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then
+   AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN])
+   FOUND_MAXHOSTNAMELEN="not found"
+   AC_COMPILE_IFELSE(
+      [
+       AC_LANG_PROGRAM(
+          [[
+#include <sys/param.h>
+          ]],
+          [[
+int h = MAXHOSTNAMELEN;
+          ]])
+      ],
+      [
+       FOUND_MAXHOSTNAMELEN="sys/param.h"
+       AC_DEFINE([NEED_SYS_PARAM_H], [1], [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])
+      ])
+   AC_COMPILE_IFELSE(
+      [
+       AC_LANG_PROGRAM(
+          [[
+#include <netdb.h>
+          ]],
+          [[
+int h = MAXHOSTNAMELEN;
+          ]])
+      ],
+      [
+       FOUND_MAXHOSTNAMELEN="netdb.h"
+       AC_DEFINE([NEED_NETDB_H], [1], [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])
+      ])
+   AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN])
+fi
 have_x="no"
 have_ecore_x="no"
 have_ecore_x_xlib="no"
@@ -1171,7 +1199,7 @@ AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes)
 # Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas)
-PKG_CHECK_MODULES([EVAS], [evas >= 1.1.99],
+PKG_CHECK_MODULES([EVAS], [evas >= 1.2.0],
   [have_evas="yes"],
   [have_evas="no"])
@@ -1200,7 +1228,23 @@ esac
 # ecore_con
-AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h net/if.h netinet/in.h sys/socket.h sys/un.h ws2tcpip.h netdb.h])
+AC_CHECK_HEADERS([sys/socket.h])
+AC_CHECK_HEADERS([net/if.h], [], [],
+[
+#include <stdio.h>
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+])
+AC_CHECK_HEADERS([sys/un.h arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h])
 if test "x${ac_cv_header_netdb_h}" = "xyes" ; then
   have_addrinfo="yes"
@@ -1390,6 +1434,60 @@ if ! test "x${have_atfile_source}" = "xno" ; then
      ])
 fi
+SHM_OPEN_LIBS=""
+AC_MSG_CHECKING([whether shm_open is in libc])
+AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM(
+       [[
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+       ]],
+       [[
+int fd;
+fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+shm_unlink("/");
+       ]])],
+   [
+    have_shm_open="yes"
+    AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call])
+   ],
+   [have_shm_open="no"])
+LIBS="${LIBS_save}"
+AC_MSG_RESULT([${have_shm_open}])
+if ! test "x${have_shm_open}" = "xyes" ; then
+   AC_MSG_CHECKING([whether shm_open is in librt])
+   LIBS_save="${LIBS}"
+   LIBS="${LIBS} -lrt"
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+          [[
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+          ]],
+          [[
+int fd;
+fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+shm_unlink("/");
+          ]])],
+      [
+       have_shm_open="yes"
+       AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call])
+       SHM_OPEN_LIBS="-lrt"
+      ],
+      [have_shm_open="no"])
+   LIBS="${LIBS_save}"
+   AC_MSG_RESULT([${have_shm_open}])
+fi
+AC_SUBST([SHM_OPEN_LIBS])
+AC_MSG_CHECKING([whether shm_open is available])
+AC_MSG_RESULT([${have_shm_open}])
 ### Checks for optionnal feature
 AC_CHECK_FUNC([mallinfo],
   [
@@ -1485,8 +1583,8 @@ AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"])
 # ecore_ipc
 ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}],
   [
-     requirements_ecore_ipc="ecore-con >= 1.1.99 ${requirements_ecore_ipc}"
+     requirements_ecore_ipc="ecore-con >= 1.2.0 ${requirements_ecore_ipc}"
-     requirements_ecore_evas="ecore-ipc >= 1.1.99 ${requirements_ecore_evas}"
+     requirements_ecore_evas="ecore-ipc >= 1.2.0 ${requirements_ecore_evas}"
   ])
 # ecore_file
@@ -1501,7 +1599,7 @@ if test "x${have_ecore_file}" = "xyes" ; then
   ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"])
   if test "x${have_ecore_con}" = "xyes" ; then
-      requirements_ecore_file="ecore-con >= 1.1.99 ${requirements_ecore_file}"
+      requirements_ecore_file="ecore-con >= 1.2.0 ${requirements_ecore_file}"
   else
      ECORE_CHECK_CURL([${want_curl}],
         [
@@ -1520,7 +1618,7 @@ fi
 #fi
 #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}],
-#   [requirements_ecore_config="ecore-ipc >= 1.1.99 evas >= 1.1.99 eet >= 1.5.0 ${requirements_ecore_config}"])
+#   [requirements_ecore_config="ecore-ipc >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 ${requirements_ecore_config}"])
 AM_CONDITIONAL(BUILD_ECORE_CONFIG, false)
@@ -1536,12 +1634,12 @@ if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then
 fi
 ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}],
-   [requirements_ecore_imf_evas="ecore-imf >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_imf_evas}"])
+   [requirements_ecore_imf_evas="ecore-imf >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_imf_evas}"])
 # ecore_input{_evas}
 ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input])
 ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}],
-   [requirements_ecore_input_evas="ecore-input >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_input}"])
+   [requirements_ecore_input_evas="ecore-input >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_input}"])
 # ecore_imf_xim
 AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false)
@@ -1555,7 +1653,7 @@ if test    "x${have_ecore_imf}" = "xyes" \
 fi
 ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}],
-   [requirements_ecore_imf_xim="ecore-imf >= 1.1.99 ecore-x >= 1.1.99 ecore-input >= 1.1.99 ${requirements_ecore_imf_xim}"])
+   [requirements_ecore_imf_xim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_xim}"])
 # ecore_imf_scim
 PKG_CHECK_MODULES([SCIM], [scim], [have_scim="yes"], [have_scim="no"])
@@ -1571,7 +1669,7 @@ if test    "x${have_ecore_imf}" = "xyes" \
 fi
 ECORE_CHECK_MODULE([imf-scim], [${want_ecore_imf}], [Imf_SCIM], [${ecore_imf_scim_deps}],
-   [requirements_ecore_imf_scim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_scim}"])
+   [requirements_ecore_imf_scim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_scim}"])
 ## Graphic systems
@@ -1586,7 +1684,7 @@ fi
 ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}],
  [
   ecore_x_libs="$ecore_x_libs $x_libs"
-   requirements_ecore_x="ecore-input >= 1.1.99 ${requirements_ecore_x}"
+   requirements_ecore_x="ecore-input >= 1.2.0 ${requirements_ecore_x}"
  ])
 # ecore_win32
@@ -1594,7 +1692,7 @@ ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}],
 ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}],
   [
    ecore_win32_libs="-lole32 -lgdi32"
-    requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"
+    requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}"
   ])
 AC_SUBST(ecore_win32_libs)
@@ -1606,7 +1704,7 @@ if test "x${have_ecore_input}" = "xyes" -a "x${have_cocoa}" = "xyes" ; then
 fi
 ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}],
-   [requirements_ecore_cocoa="ecore-input >= 1.1.99 ${requirements_ecore_cocoa}"])
+   [requirements_ecore_cocoa="ecore-input >= 1.2.0 ${requirements_ecore_cocoa}"])
 # ecore_sdl
@@ -1616,10 +1714,10 @@ if test "x${have_sdl}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then
 fi
 ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}],
-   [requirements_ecore_sdl="ecore-input >= 1.1.99 ${requirements_ecore_sdl}"])
+   [requirements_ecore_sdl="ecore-input >= 1.2.0 ${requirements_ecore_sdl}"])
 ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}],
-   [requirements_ecore_psl1ght="ecore-input >= 1.1.99 ${requirements_ecore_psl1ght}"])
+   [requirements_ecore_psl1ght="ecore-input >= 1.2.0 ${requirements_ecore_psl1ght}"])
 # ecore_fb
 ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb])
@@ -1641,19 +1739,19 @@ ECORE_CHECK_MODULE([directfb], [${want_ecore_directfb}], [DirectFB], [${have_dir
 # ecore_wince
 ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}],
-   [requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"])
+   [requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}"])
 ## Ecore Evas
 # ecore_evas
 ecore_evas_deps="no"
-if test "x${have_evas}" = "xyes" -a "x${have_ecore_input}" = "xyes" -a "x${have_ecore_input_evas}" = "xyes" ; then
+if test "x${have_evas}" = "xyes" && test "x${have_ecore_input}" = "xyes" && test "x${have_ecore_input_evas}" = "xyes" ; then
   ecore_evas_deps="yes"
 fi
 ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}],
-  [requirements_ecore_evas="ecore-input >= 1.1.99 ecore-input-evas >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_evas}"])
+  [requirements_ecore_evas="ecore-input >= 1.2.0 ecore-input-evas >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_evas}"])
 # ecore_evas_buffer
@@ -1743,7 +1841,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \
        "x$have_ecore_evas_software_16_x11" = "xyes" -o \
        "x$have_ecore_evas_software_xcb" = "xyes"; then
   AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas])
-   requirements_ecore_evas="ecore-x >= 1.1.99 ${requirements_ecore_evas}"
+   requirements_ecore_evas="ecore-x >= 1.2.0 ${requirements_ecore_evas}"
 fi
 # ecore_evas_win32
@@ -1779,16 +1877,18 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \
        "x${have_ecore_evas_opengl_glew}" = "xyes" -o \
        "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then
   AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas])
-   requirements_ecore_evas="ecore-win32 >= 1.1.99 ${requirements_ecore_evas}"
+   requirements_ecore_evas="ecore-win32 >= 1.2.0 ${requirements_ecore_evas}"
 fi
 # ecore_evas_software_sdl
-ECORE_EVAS_CHECK_MODULE([software-sdl],
+have_ecore_evas_software_sdl="no"
-   [${want_ecore_evas_software_sdl}],
+if test "x${have_ecore_sdl}" = "xyes"; then
-   [Software SDL],
+   requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"
-   [${have_ecore_sdl}],
+   have_ecore_evas_software_sdl="yes"
-   [requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"])
+   AC_DEFINE(BUILD_ECORE_EVAS_SOFTWARE_SDL, 1, [Support for Software SDL Engine in Ecore_Evas])
+   requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"
+fi
 # ecore_evas_gl_sdl
@@ -1796,7 +1896,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-sdl],
   [${want_ecore_evas_gl_sdl}],
   [OpenGL SDL],
   [${have_ecore_sdl}],
-   [requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"])
+   [requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"])
 # ecore_evas_cocoa
@@ -1804,7 +1904,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-cocoa],
   [${want_ecore_evas_gl_cocoa}],
   [OpenGL Cocoa],
   [${have_ecore_cocoa}],
-   [requirements_ecore_evas="ecore-cocoa >= 1.1.99 ${requirements_ecore_evas}"])
+   [requirements_ecore_evas="ecore-cocoa >= 1.2.0 ${requirements_ecore_evas}"])
 # ecore_evas_directfb
@@ -1812,7 +1912,7 @@ ECORE_EVAS_CHECK_MODULE([directfb],
   [${want_ecore_evas_directfb}],
   [DirectFB],
   [${have_ecore_directfb}],
-   [requirements_ecore_evas="ecore-directfb >= 1.1.99 ${requirements_ecore_evas}"])
+   [requirements_ecore_evas="ecore-directfb >= 1.2.0 ${requirements_ecore_evas}"])
 # ecore_evas_fb
@@ -1820,7 +1920,7 @@ ECORE_EVAS_CHECK_MODULE([fb],
   [${want_ecore_evas_fb}],
   [Linux Framebuffer],
   [${have_ecore_fb}],
-   [requirements_ecore_evas="ecore-fb >= 1.1.99 ${requirements_ecore_evas}"])
+   [requirements_ecore_evas="ecore-fb >= 1.2.0 ${requirements_ecore_evas}"])
 # ecore_evas_wince
@@ -1828,7 +1928,7 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince],
   [${want_ecore_evas_software_16_wince}],
   [16 bpp Software Windows CE],
   [${have_ecore_wince}],
-   [requirements_ecore_evas="ecore-wince >= 1.1.99 ${requirements_ecore_evas}"])
+   [requirements_ecore_evas="ecore-wince >= 1.2.0 ${requirements_ecore_evas}"])
 # ecore_evas_ews
@@ -1837,20 +1937,38 @@ ECORE_EVAS_CHECK_MODULE_FULL([ews], [software-buffer],
   [Ecore Evas Single Process Windowing System],
   [yes], [])
+# ecore_evas_extn
+have_extn="yes"
+if test "x${have_ecore_ipc}" = "xno" || \
+   test "x${have_ecore_evas_software_buffer}" = "xno" || \
+   test "x${have_shm_open}" = "xno" ; then
+   have_extn="no"
+fi
+dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE
+have_ecore_evas_extn="no"
+if test "x${want_ecore_evas_extn}" = "xyes" && \
+   test "x${have_extn}" = "xyes" && \
+   test "x${have_ecore_evas}" = "xyes"; then
+   AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas])
+   have_ecore_evas_extn="yes"
+fi
 # ecore_evas_psl1ght
 ECORE_EVAS_CHECK_MODULE([psl1ght],
   [${want_ecore_evas_psl1ght}],
   [PSL1GHT],
   [${have_ecore_psl1ght}],
-   [requirements_ecore_evas="ecore-psl1ght >= 1.1.99 ${requirements_ecore_evas}"])
+   [requirements_ecore_evas="ecore-psl1ght >= 1.2.0 ${requirements_ecore_evas}"])
 ### WAYLAND
 ecore_wayland_deps="no"
 have_wayland="no"
 if test "x${want_ecore_wayland}" = "xyes" ; then
-  PKG_CHECK_MODULES([WAYLAND], [wayland-client xkbcommon], [have_wayland="yes"], [have_wayland="no"])
+  PKG_CHECK_MODULES([WAYLAND], [egl wayland-egl wayland-client xkbcommon], [have_wayland="yes"], [have_wayland="no"])
 fi
 if test "x${have_ecore_input}" = "xyes" -a "x${have_wayland}" = "xyes" ; then
  ecore_wayland_deps="yes"
@@ -1858,7 +1976,7 @@ fi
 ECORE_CHECK_MODULE([wayland], [${want_ecore_wayland}], [Wayland], [${ecore_wayland_deps}])
 if test "x${have_ecore_wayland}" = "xyes" ; then
-  requirements_ecore_wayland="ecore-input >= 1.1.0 wayland-client xkbcommon ${requirements_ecore_wayland}"
+  requirements_ecore_wayland="ecore-input >= 1.2.0 egl wayland-egl wayland-client xkbcommon ${requirements_ecore_wayland}"
 fi
 ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], 
@@ -1867,7 +1985,7 @@ ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm],
   [${have_ecore_wayland}],
   [requirements_ecore_evas="${requirements_ecore_wayland} ${requirements_ecore_evas}"])
-ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl], 
+ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl egl], 
   [${want_ecore_evas_wayland_egl}],
   [Wayland Egl],
   [${have_ecore_wayland}],
@@ -1878,6 +1996,10 @@ ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl],
      fi
   ])
+### Unit tests
+EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
 ### install and build examples
 EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
@@ -2112,6 +2234,7 @@ if test "x${have_ecore_evas}" = "xyes" ; then
  echo "    Sing.Proc. Windowing System: $have_ecore_evas_ews"
  echo "    Wayland Shm................: $have_ecore_evas_wayland_shm"
  echo "    Wayland Egl................: $have_ecore_evas_wayland_egl"
+  echo "    Extn (Plug/socket Extn)....: $have_ecore_evas_extn"
 fi
 echo
 echo "  Tests................: ${enable_tests}"