Update EFL to latest beta.

33 files changed, 1179 insertions, 667 deletions

diff --git a/libraries/eet/AUTHORS b/libraries/eet/AUTHORS
index ebdd15f..260b216 100644
--- a/libraries/eet/AUTHORS
+++ b/libraries/eet/AUTHORS
@@ -11,3 +11,4 @@ Mathieu Taillefumier <mathieu.taillefumier@free.fr>
 Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>
 Adam Simpkins <adam@adamsimpkins.net>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
+Lionel Orry <lionel.orry@gmail.com>
diff --git a/libraries/eet/ChangeLog b/libraries/eet/ChangeLog
index 795d102..4de0f82 100644
--- a/libraries/eet/ChangeLog
+++ b/libraries/eet/ChangeLog
@@ -547,21 +547,29 @@
         noticable quality losses in the chase for speed. It will use
         IFAST for quality less than 60 when encoding
 
-2011-12-02 Carsten Haitzler (The Rasterman)
+2011-12-02  Carsten Haitzler (The Rasterman)
 
         1.1.0 release
-        
+
 2011-12-02  Mike Blumenkrantz
 
         * added eet_file_get to return the filename of an Eet_File
         * Eet_File filenames are now stringshared
         * added mempool allocators
 
-2011-12-29 Carsten Haitzler (The Rasterman)
+2011-12-29  Carsten Haitzler (The Rasterman)
 
         * increase eet_connection packet size to 1Mb - more reasonable.
 
-2012-01-07 Boris Faure (billiob)
+2012-01-07  Boris Faure (billiob)
 
         * make eet tool write to standard output if no output file given.
-        
+
+2012-02-09  Cedric Bail
+
+        * add support for GNUTLS 3.x.
+
+2012-02-10  Cedric Bail
+
+        * add eet_dictionary_count.
+        * add "eet -t FILE.EET".
diff --git a/libraries/eet/Makefile.am b/libraries/eet/Makefile.am
index 34a5762..d3622dc 100644
--- a/libraries/eet/Makefile.am
+++ b/libraries/eet/Makefile.am
@@ -69,18 +69,16 @@ endif
 
 if EFL_ENABLE_COVERAGE
 lcov-reset:
-        @rm -rf coverage
-        @find . -name "*.gcda" -exec rm {} \;
-        @lcov --directory . --zerocounters
+        @rm -rf $(top_builddir)/coverage
+        @find $(top_builddir) -name "*.gcda" -delete
+        @lcov --zerocounters --directory $(top_builddir)
 
 lcov-report:
-        @mkdir coverage
-        @lcov --compat-libtool --directory . --capture --output-file coverage/coverage.info
-        @lcov -l coverage/coverage.info |grep "\\.h"  |cut -d " " -f 2 > coverage/remove
-        @lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info
-        @rm coverage/remove
-        @mv coverage/coverage.cleaned.info coverage/coverage.info
-        @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
+        @mkdir $(top_builddir)/coverage
+        lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)
+        lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
+        genhtml -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned.info
+        @echo "Coverage Report at $(top_builddir)/coverage/html"
 
 coverage:
         @$(MAKE) lcov-reset
diff --git a/libraries/eet/Makefile.in b/libraries/eet/Makefile.in
index b865027..fb2955c 100644
--- a/libraries/eet/Makefile.in
+++ b/libraries/eet/Makefile.in
@@ -184,6 +184,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -223,6 +225,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -878,18 +882,16 @@ doc:
 # Coverage report
 
 @EFL_ENABLE_COVERAGE_TRUE@lcov-reset:
-@EFL_ENABLE_COVERAGE_TRUE@      @rm -rf coverage
-@EFL_ENABLE_COVERAGE_TRUE@      @find . -name "*.gcda" -exec rm {} \;
-@EFL_ENABLE_COVERAGE_TRUE@      @lcov --directory . --zerocounters
+@EFL_ENABLE_COVERAGE_TRUE@      @rm -rf $(top_builddir)/coverage
+@EFL_ENABLE_COVERAGE_TRUE@      @find $(top_builddir) -name "*.gcda" -delete
+@EFL_ENABLE_COVERAGE_TRUE@      @lcov --zerocounters --directory $(top_builddir)
 
 @EFL_ENABLE_COVERAGE_TRUE@lcov-report:
-@EFL_ENABLE_COVERAGE_TRUE@      @mkdir coverage
-@EFL_ENABLE_COVERAGE_TRUE@      @lcov --compat-libtool --directory . --capture --output-file coverage/coverage.info
-@EFL_ENABLE_COVERAGE_TRUE@      @lcov -l coverage/coverage.info |grep "\\.h"  |cut -d " " -f 2 > coverage/remove
-@EFL_ENABLE_COVERAGE_TRUE@      @lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info
-@EFL_ENABLE_COVERAGE_TRUE@      @rm coverage/remove
-@EFL_ENABLE_COVERAGE_TRUE@      @mv coverage/coverage.cleaned.info coverage/coverage.info
-@EFL_ENABLE_COVERAGE_TRUE@      @genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
+@EFL_ENABLE_COVERAGE_TRUE@      @mkdir $(top_builddir)/coverage
+@EFL_ENABLE_COVERAGE_TRUE@      lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)
+@EFL_ENABLE_COVERAGE_TRUE@      lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
+@EFL_ENABLE_COVERAGE_TRUE@      genhtml -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned.info
+@EFL_ENABLE_COVERAGE_TRUE@      @echo "Coverage Report at $(top_builddir)/coverage/html"
 
 @EFL_ENABLE_COVERAGE_TRUE@coverage:
 @EFL_ENABLE_COVERAGE_TRUE@      @$(MAKE) lcov-reset
diff --git a/libraries/eet/NEWS b/libraries/eet/NEWS
index cccda15..1abe36e 100644
--- a/libraries/eet/NEWS
+++ b/libraries/eet/NEWS
@@ -9,6 +9,8 @@ Additions:
 Improvements:
 
     * most allocations moved to mempools
+    * support GNUTLS 3.x
+    * add "eet -t FILE.EET" to get some stat out of an eet file
 
 Eet 1.5.0
 
diff --git a/libraries/eet/README b/libraries/eet/README
index 48be3e5..416214b 100644
--- a/libraries/eet/README
+++ b/libraries/eet/README
@@ -1,4 +1,4 @@
-Eet 1.1.0
+Eet 1.6.0
 
 ******************************************************************************
 
@@ -11,7 +11,6 @@ Requirements:
 -------------
 Must have:
   libc
-  libm
   zlib
   libjpeg
   eina (1.1.0 or better) 
diff --git a/libraries/eet/aclocal.m4 b/libraries/eet/aclocal.m4
index 6d7b012..1d329e5 100644
--- a/libraries/eet/aclocal.m4
+++ b/libraries/eet/aclocal.m4
@@ -13,13 +13,14 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -47,7 +48,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
         AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -60,7 +64,6 @@ if test -n "$PKG_CONFIG"; then
                 AC_MSG_RESULT([no])
                 PKG_CONFIG=""
         fi
-                
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -69,34 +72,31 @@ fi[]dnl
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
+  m4_default([$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-                         [pkg_failed=yes])
-    fi
-else
-        pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -138,16 +138,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-                $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
         # Put the nasty error message in config.log where it belongs
         echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-        ifelse([$4], , [AC_MSG_ERROR(dnl
+        m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -155,25 +156,24 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT
-])],
-                [AC_MSG_RESULT([no])
-                $4])
+_PKG_TEXT])[]dnl
+        ])
 elif test $pkg_failed = untried; then
-        ifelse([$4], , [AC_MSG_FAILURE(dnl
+        AC_MSG_RESULT([no])
+        m4_default([$4], [AC_MSG_FAILURE(
 [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.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-                [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
 else
         $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
         $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-        ifelse([$3], , :, [$3])
+        $3
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
diff --git a/libraries/eet/config.guess b/libraries/eet/config.guess
index e3a2116..c2246a4 100755
--- a/libraries/eet/config.guess
+++ b/libraries/eet/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-06-10'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
         exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+        echo i386-pc-auroraux${UNAME_RELEASE}
+        exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
         eval $set_cc_for_build
         SUN_ARCH="i386"
@@ -807,12 +811,12 @@ EOF
     i*:PW*:*)
         echo ${UNAME_MACHINE}-pc-pw32
         exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
         case ${UNAME_MACHINE} in
             x86)
                 echo i586-pc-interix${UNAME_RELEASE}
                 exit ;;
-            EM64T | authenticamd | genuineintel)
+            authenticamd | genuineintel | EM64T)
                 echo x86_64-unknown-interix${UNAME_RELEASE}
                 exit ;;
             IA64)
@@ -854,6 +858,20 @@ EOF
     i*86:Minix:*:*)
         echo ${UNAME_MACHINE}-pc-minix
         exit ;;
+    alpha:Linux:*:*)
+        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+          EV5)   UNAME_MACHINE=alphaev5 ;;
+          EV56)  UNAME_MACHINE=alphaev56 ;;
+          PCA56) UNAME_MACHINE=alphapca56 ;;
+          PCA57) UNAME_MACHINE=alphapca56 ;;
+          EV6)   UNAME_MACHINE=alphaev6 ;;
+          EV67)  UNAME_MACHINE=alphaev67 ;;
+          EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+        objdump --private-headers /bin/sh | grep -q ld.so.1
+        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+        exit ;;
     arm*:Linux:*:*)
         eval $set_cc_for_build
         if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +894,17 @@ EOF
     frv:Linux:*:*)
         echo frv-unknown-linux-gnu
         exit ;;
+    i*86:Linux:*:*)
+        LIBC=gnu
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #ifdef __dietlibc__
+        LIBC=dietlibc
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+        exit ;;
     ia64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
@@ -901,39 +930,18 @@ EOF
         #endif
         #endif
 EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^CPU/{
-                s: ::g
-                p
-            }'`"
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
     or32:Linux:*:*)
         echo or32-unknown-linux-gnu
         exit ;;
-    ppc:Linux:*:*)
-        echo powerpc-unknown-linux-gnu
-        exit ;;
-    ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-gnu
-        exit ;;
-    alpha:Linux:*:*)
-        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-          EV5)   UNAME_MACHINE=alphaev5 ;;
-          EV56)  UNAME_MACHINE=alphaev56 ;;
-          PCA56) UNAME_MACHINE=alphapca56 ;;
-          PCA57) UNAME_MACHINE=alphapca56 ;;
-          EV6)   UNAME_MACHINE=alphaev6 ;;
-          EV67)  UNAME_MACHINE=alphaev67 ;;
-          EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-        objdump --private-headers /bin/sh | grep -q ld.so.1
-        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-        exit ;;
     padre:Linux:*:*)
         echo sparc-unknown-linux-gnu
         exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+        echo hppa64-unknown-linux-gnu
+        exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +950,11 @@ EOF
           *)    echo hppa-unknown-linux-gnu ;;
         esac
         exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+        echo powerpc64-unknown-linux-gnu
+        exit ;;
+    ppc:Linux:*:*)
+        echo powerpc-unknown-linux-gnu
         exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
         echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +977,6 @@ EOF
     xtensa*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
-    i*86:Linux:*:*)
-        # The BFD linker knows what the default object file format is, so
-        # first see if it will tell us. cd to the root directory to prevent
-        # problems with other programs or directories called `ld' in the path.
-        # Set LC_ALL=C to ensure ld outputs messages in English.
-        ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-                         | sed -ne '/supported targets:/!d
-                                    s/[         ][      ]*/ /g
-                                    s/.*supported targets: *//
-                                    s/ .*//
-                                    p'`
-        case "$ld_supported_targets" in
-          elf32-i386)
-                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-                ;;
-        esac
-        # Determine whether the default compiler is a.out or elf
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
-        #include <features.h>
-        #ifdef __ELF__
-        # ifdef __GLIBC__
-        #  if __GLIBC__ >= 2
-        LIBC=gnu
-        #  else
-        LIBC=gnulibc1
-        #  endif
-        # else
-        LIBC=gnulibc1
-        # endif
-        #else
-        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-        LIBC=gnu
-        #else
-        LIBC=gnuaout
-        #endif
-        #endif
-        #ifdef __dietlibc__
-        LIBC=dietlibc
-        #endif
-EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^LIBC/{
-                s: ::g
-                p
-            }'`"
-        test x"${LIBC}" != x && {
-                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-                exit
-        }
-        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-        ;;
     i*86:DYNIX/ptx:4*:*)
         # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
         # earlier versions are messed up and put the nodename in both
@@ -1247,6 +1206,16 @@ EOF
     *:Darwin:*:*)
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
         case $UNAME_PROCESSOR in
+            i386)
+                eval $set_cc_for_build
+                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                      grep IS_64BIT_ARCH >/dev/null
+                  then
+                      UNAME_PROCESSOR="x86_64"
+                  fi
+                fi ;;
             unknown) UNAME_PROCESSOR=powerpc ;;
         esac
         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/libraries/eet/config.h.in b/libraries/eet/config.h.in
index 02ec411..76da120 100644
--- a/libraries/eet/config.h.in
+++ b/libraries/eet/config.h.in
@@ -19,6 +19,12 @@
 /* use gnutls_x509_crt_verify_hash */
 #undef EET_USE_NEW_GNUTLS_API
 
+/* use gnutls_privkey_sign_data */
+#undef EET_USE_NEW_PRIVKEY_SIGN_DATA
+
+/* use gnutls_pubkey_verify_hash */
+#undef EET_USE_NEW_PUBKEY_VERIFY_HASH
+
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
@@ -35,6 +41,9 @@
 /* Set to 1 if Evil library is installed */
 #undef HAVE_EVIL
 
+/* Define to 1 if you have Exotic. */
+#undef HAVE_EXOTIC_H
+
 /* Define to 1 if you have the `fmemopen' function. */
 #undef HAVE_FMEMOPEN
 
diff --git a/libraries/eet/config.sub b/libraries/eet/config.sub
index eb0389a..c2d1257 100755
--- a/libraries/eet/config.sub
+++ b/libraries/eet/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-11'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2009-06-11'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +153,7 @@ case $os in
         -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis | -knuth | -cray)
+        -apple | -axis | -knuth | -cray | -microblaze)
                 os=
                 basic_machine=$1
                 ;;
@@ -284,6 +288,7 @@ case $basic_machine in
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
+        | rx \
         | score \
         | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
@@ -291,13 +296,14 @@ case $basic_machine in
         | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
         | spu | strongarm \
         | tahoe | thumb | tic4x | tic80 | tron \
+        | ubicom32 \
         | v850 | v850e \
         | we32k \
         | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
         | z8k | z80)
                 basic_machine=$basic_machine-unknown
                 ;;
-        m6811 | m68hc11 | m6812 | m68hc12)
+        m6811 | m68hc11 | m6812 | m68hc12 | picochip)
                 # Motorola 68HC11/12.
                 basic_machine=$basic_machine-unknown
                 os=-none
@@ -340,7 +346,7 @@ case $basic_machine in
         | lm32-* \
         | m32c-* | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
@@ -368,15 +374,17 @@ case $basic_machine in
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
         | pyramid-* \
-        | romp-* | rs6000-* \
+        | romp-* | rs6000-* | rx-* \
         | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
         | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
         | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tile-* | tilegx-* \
         | tron-* \
+        | ubicom32-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
         | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -726,6 +734,9 @@ case $basic_machine in
                 basic_machine=ns32k-utek
                 os=-sysv
                 ;;
+        microblaze)
+                basic_machine=microblaze-xilinx
+                ;;
         mingw32)
                 basic_machine=i386-pc
                 os=-mingw32
@@ -1076,6 +1087,11 @@ case $basic_machine in
                 basic_machine=tic6x-unknown
                 os=-coff
                 ;;
+        # This must be matched before tile*.
+        tilegx*)
+                basic_machine=tilegx-unknown
+                os=-linux-gnu
+                ;;
         tile*)
                 basic_machine=tile-unknown
                 os=-linux-gnu
@@ -1247,6 +1263,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
         # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+                os=-auroraux
+                ;;
         -solaris1 | -solaris1.*)
                 os=`echo $os | sed -e 's|solaris1|sunos4|'`
                 ;;
@@ -1268,8 +1287,8 @@ case $os in
         # -sysv* is not here because it comes later, after sysvr4.
         -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
               | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-              | -kopensolaris* \
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+              | -sym* | -kopensolaris* \
               | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
               | -aos* | -aros* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1290,7 +1309,7 @@ case $os in
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         -qnx*)
@@ -1423,6 +1442,8 @@ case $os in
         -dicos*)
                 os=-dicos
                 ;;
+        -nacl*)
+                ;;
         -none)
                 ;;
         *)
diff --git a/libraries/eet/configure b/libraries/eet/configure
index b02c1c4..0687ffe 100755
--- a/libraries/eet/configure
+++ b/libraries/eet/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for eet 1.5.99.67344.
+# Generated by GNU Autoconf 2.67 for eet 1.6.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,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 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
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $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='eet'
 PACKAGE_TARNAME='eet'
-PACKAGE_VERSION='1.5.99.67344'
-PACKAGE_STRING='eet 1.5.99.67344'
+PACKAGE_VERSION='1.6.0-alpha'
+PACKAGE_STRING='eet 1.6.0-alpha'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -760,6 +760,8 @@ LIBGCRYPT_CFLAGS
 LIBGCRYPT_CONFIG
 GNUTLS_LIBS
 GNUTLS_CFLAGS
+EXOTIC_LIBS
+EXOTIC_CFLAGS
 EINA_LIBS
 EINA_CFLAGS
 EET_LIBS
@@ -781,6 +783,8 @@ EFL_ENABLE_TESTS_FALSE
 EFL_ENABLE_TESTS_TRUE
 CHECK_LIBS
 CHECK_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 BUILD_EXAMPLES_FALSE
 BUILD_EXAMPLES_TRUE
@@ -917,8 +921,6 @@ enable_libtool_lock
 enable_amalgamation
 enable_eet
 enable_old_eet_file_format
-enable_gnutls
-enable_new_gnutls_api
 enable_openssl
 enable_cipher
 enable_signature
@@ -929,8 +931,10 @@ enable_tests
 enable_coverage
 enable_doc
 with_doxygen
+enable_gnutls
 with_libgcrypt_prefix
 with_libgcrypt_exec_prefix
+enable_new_gnutls_api
 '
       ac_precious_vars='build_alias
 host_alias
@@ -942,12 +946,16 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 CHECK_CFLAGS
 CHECK_LIBS
 EVIL_CFLAGS
 EVIL_LIBS
 EINA_CFLAGS
 EINA_LIBS
+EXOTIC_CFLAGS
+EXOTIC_LIBS
 GNUTLS_CFLAGS
 GNUTLS_LIBS
 OPENSSL_CFLAGS
@@ -1014,8 +1022,9 @@ do
   fi
 
   case $ac_option in
-  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)    ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1060,7 +1069,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
@@ -1086,7 +1095,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
@@ -1290,7 +1299,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
@@ -1306,7 +1315,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
@@ -1336,8 +1345,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'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1345,7 +1354,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 ;;
@@ -1363,13 +1372,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
@@ -1392,7 +1401,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'
@@ -1406,8 +1415,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.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $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
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1422,9 +1431,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.
@@ -1463,11 +1472,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
@@ -1493,7 +1502,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 eet 1.5.99.67344 to adapt to many kinds of systems.
+\`configure' configures eet 1.6.0-alpha to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1507,7 +1516,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
@@ -1563,7 +1572,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of eet 1.5.99.67344:";;
+     short | recursive ) echo "Configuration of eet 1.6.0-alpha:";;
    esac
   cat <<\_ACEOF
 
@@ -1586,10 +1595,6 @@ Optional Features:
   --disable-old-eet-file-format
                           disable old eet file format support.
                           [[default=enabled]]
-  --disable-gnutls        disable gnutls eet support
-  --disable-new-gnutls-api
-                          enable use of gnutls_x509_crt_verify_hash.
-                          [[default=enable]]
   --disable-openssl       disable openssl eet support
   --disable-cipher        disable cipher support for eet API
   --disable-signature     disable signature file support for eet
@@ -1602,6 +1607,10 @@ Optional Features:
   --enable-coverage       enable coverage profiling instrumentation
                           [default=disabled]
   --disable-doc           Disable documentation build [default=enabled]
+  --disable-gnutls        disable gnutls eet support
+  --disable-new-gnutls-api
+                          enable use of gnutls_x509_crt_verify_hash.
+                          [[default=enable]]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1623,6 +1632,10 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CPP         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
   CHECK_CFLAGS
               C compiler flags for CHECK, overriding pkg-config
   CHECK_LIBS  linker flags for CHECK, overriding pkg-config
@@ -1630,6 +1643,9 @@ Some influential environment variables:
   EVIL_LIBS   linker flags for EVIL, overriding pkg-config
   EINA_CFLAGS C compiler flags for EINA, overriding pkg-config
   EINA_LIBS   linker flags for EINA, overriding pkg-config
+  EXOTIC_CFLAGS
+              C compiler flags for EXOTIC, overriding pkg-config
+  EXOTIC_LIBS linker flags for EXOTIC, overriding pkg-config
   GNUTLS_CFLAGS
               C compiler flags for GNUTLS, overriding pkg-config
   GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
@@ -1704,10 +1720,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-eet configure 1.5.99.67344
-generated by GNU Autoconf 2.65
+eet configure 1.6.0-alpha
+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
@@ -1811,7 +1827,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
@@ -1854,7 +1870,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 :
@@ -1920,7 +1936,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
@@ -1987,10 +2003,10 @@ $as_echo "$ac_res" >&6; }
 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
@@ -2026,7 +2042,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; }
 
@@ -2049,17 +2065,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"
@@ -2075,8 +2089,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 eet $as_me 1.5.99.67344, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by eet $as_me 1.6.0-alpha, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2186,11 +2200,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2224,11 +2236,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
@@ -2241,11 +2251,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
@@ -2259,11 +2267,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2318,7 +2324,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
@@ -2333,7 +2344,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
 
@@ -2409,7 +2424,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. ##
@@ -2435,16 +2450,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/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    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,
@@ -2560,11 +2581,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
@@ -2586,7 +2607,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
 
@@ -2596,7 +2617,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
@@ -2834,7 +2855,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
@@ -2842,7 +2863,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;;
@@ -2876,7 +2897,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
 
@@ -2892,7 +2913,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='eet'
- VERSION='1.5.99.67344'
+ VERSION='1.6.0-alpha'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2947,7 +2968,7 @@ AM_BACKSLASH='\'
 
 # 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; }
@@ -2958,16 +2979,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='-'
@@ -2992,7 +3013,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
@@ -3000,7 +3021,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='-'
@@ -3706,8 +3727,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
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+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
@@ -3821,9 +3842,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 "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3865,8 +3885,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
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+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
@@ -3923,9 +3943,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
@@ -3976,8 +3996,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
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4381,7 +4401,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
@@ -4457,7 +4477,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
@@ -4523,7 +4543,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
@@ -4590,7 +4610,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
@@ -4706,7 +4726,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 :
@@ -4908,13 +4928,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:4911: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4931: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4914: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4934: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4917: output\"" >&5)
+  (eval echo "\"\$as_me:4937: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6117,7 +6137,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6120 "configure"' > conftest.$ac_ext
+  echo '#line 6140 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6906,7 +6926,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.
@@ -6922,11 +6942,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
@@ -6965,7 +6985,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.
@@ -6981,18 +7001,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
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -7121,8 +7141,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 test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7645,11 +7664,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:7648: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7667: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7652: \$? = $ac_status" >&5
+   echo "$as_me:7671: \$? = $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.
@@ -7984,11 +8003,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:7987: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8006: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7991: \$? = $ac_status" >&5
+   echo "$as_me:8010: \$? = $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.
@@ -8089,11 +8108,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:8092: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8111: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8096: \$? = $ac_status" >&5
+   echo "$as_me:8115: \$? = $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
@@ -8144,11 +8163,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:8147: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8166: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8151: \$? = $ac_status" >&5
+   echo "$as_me:8170: \$? = $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
@@ -10528,7 +10547,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10531 "configure"
+#line 10550 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10624,7 +10643,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10627 "configure"
+#line 10646 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10863,20 +10882,20 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIN 5
+#define VMIN 6
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 99
+#define VMIC 0
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VREV 67344
+#define VREV 0
 _ACEOF
 
-version_info="6:99:5"
+version_info="7:0:6"
 release_info=""
 
 
@@ -10995,85 +11014,6 @@ $as_echo "#define EET_OLD_EET_FILE_FORMAT 0" >>confdefs.h
 
 fi
 
-# Gnutls support
-
-# Check whether --enable-gnutls was given.
-if test "${enable_gnutls+set}" = set; then :
-  enableval=$enable_gnutls; want_gnutls=$enableval
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Gnutls" >&5
-$as_echo_n "checking whether to use Gnutls... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_gnutls}" >&5
-$as_echo "${want_gnutls}" >&6; }
-
-# Specific GNUTLS improvement
-
-new_gnutls_api="yes"
-# Check whether --enable-new-gnutls-api was given.
-if test "${enable_new_gnutls_api+set}" = set; then :
-  enableval=$enable_new_gnutls_api; new_gnutls_api=$enableval
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use gnutls_x509_crt_verify_hash" >&5
-$as_echo_n "checking whether to use gnutls_x509_crt_verify_hash... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${new_gnutls_api}" >&5
-$as_echo "${new_gnutls_api}" >&6; }
-
-if test "x${new_gnutls_api}" = "xyes" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_x509_crt_verify_hash in -lgnutls" >&5
-$as_echo_n "checking for gnutls_x509_crt_verify_hash in -lgnutls... " >&6; }
-if test "${ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgnutls  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gnutls_x509_crt_verify_hash ();
-int
-main ()
-{
-return gnutls_x509_crt_verify_hash ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash=yes
-else
-  ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash" >&5
-$as_echo "$ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash" >&6; }
-if test "x$ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash" = x""yes; then :
-   new_gnutls_api="yes"
-else
-   new_gnutls_api="no"
-
-fi
-
-
-   if test "x${new_gnutls_api}" = "xyes"; then
-
-$as_echo "#define EET_USE_NEW_GNUTLS_API 1" >>confdefs.h
-
-   fi
-fi
-
 # Openssl support
 
 # Check whether --enable-openssl was given.
@@ -11170,6 +11110,10 @@ fi
 
 
 
+
+
+
+
 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.
@@ -11282,7 +11226,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
                 PKG_CONFIG=""
         fi
-
 fi
 
 
@@ -11314,11 +11257,10 @@ 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" && \
+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=$?
@@ -11328,15 +11270,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ 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" && \
+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=$?
@@ -11346,14 +11286,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ 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
@@ -11361,17 +11302,17 @@ 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"`
+                CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1`
         else
-                CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.5"`
+                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
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                _efl_enable_tests="no"
+        _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
@@ -11808,8 +11749,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
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+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
@@ -12179,6 +12120,10 @@ fi
 # pkg-config
 
 
+
+
+
+
 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.
@@ -12291,7 +12236,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
                 PKG_CONFIG=""
         fi
-
 fi
 
 # Check whether pkg-config supports Requires.private
@@ -12476,11 +12420,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
-        pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$EVIL_CFLAGS"; then
+    pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -12490,15 +12433,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$EVIL_LIBS"; then
-        pkg_cv_EVIL_LIBS="$EVIL_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$EVIL_LIBS"; then
+    pkg_cv_EVIL_LIBS="$EVIL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -12508,14 +12449,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ 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
@@ -12523,14 +12465,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
 
@@ -12539,12 +12481,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.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$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.
 
@@ -12553,13 +12496,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
@@ -12588,46 +12531,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
-        pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
+if test -n "$EINA_CFLAGS"; then
+    pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.2.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
-        pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$EINA_LIBS"; then
-        pkg_cv_EINA_LIBS="$EINA_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
+if test -n "$EINA_LIBS"; then
+    pkg_cv_EINA_LIBS="$EINA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.2.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
-        pkg_failed=untried
+ 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
@@ -12635,14 +12576,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
 
@@ -12651,12 +12592,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.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$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.
 
@@ -12665,15 +12607,108 @@ 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
+requirement_eet="eina >= 1.2.0 ${requirement_eet}"
+
+### 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
+    requirement_eet="exotic ${requirement_eet}"
+
+
+$as_echo "#define HAVE_EXOTIC_H 1" >>confdefs.h
+
 fi
-requirement_eet="eina >= 1.1.0 ${requirement_eet}"
+
+# Gnutls support
+
+# Check whether --enable-gnutls was given.
+if test "${enable_gnutls+set}" = set; then :
+  enableval=$enable_gnutls; want_gnutls=$enableval
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Gnutls" >&5
+$as_echo_n "checking whether to use Gnutls... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_gnutls}" >&5
+$as_echo "${want_gnutls}" >&6; }
 
 # Gnutls library
 have_gnutls="no"
@@ -12683,11 +12718,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
 $as_echo_n "checking for GNUTLS... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNUTLS_CFLAGS"; then
-        pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GNUTLS_CFLAGS"; then
+    pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.6\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.6") 2>&5
   ac_status=$?
@@ -12697,15 +12731,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNUTLS_LIBS"; then
-        pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GNUTLS_LIBS"; then
+    pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.7.6\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnutls >= 1.7.6") 2>&5
   ac_status=$?
@@ -12715,14 +12747,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ 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
@@ -12730,17 +12763,17 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 1.7.6"`
+                GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 1.7.6" 2>&1`
         else
-                GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 1.7.6"`
+                GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 1.7.6" 2>&1`
         fi
         # Put the nasty error message in config.log where it belongs
         echo "$GNUTLS_PKG_ERRORS" >&5
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_gnutls="no"
+        have_gnutls="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_gnutls="no"
 else
         GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
@@ -12869,6 +12902,204 @@ $as_echo "no" >&6; }
    fi
 fi
 
+# Specific GNUTLS improvement
+
+new_gnutls_api="yes"
+# Check whether --enable-new-gnutls-api was given.
+if test "${enable_new_gnutls_api+set}" = set; then :
+  enableval=$enable_new_gnutls_api; new_gnutls_api=$enableval
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use gnutls_x509_crt_verify_hash" >&5
+$as_echo_n "checking whether to use gnutls_x509_crt_verify_hash... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${new_gnutls_api}" >&5
+$as_echo "${new_gnutls_api}" >&6; }
+
+if test "x${new_gnutls_api}" = "xyes" ; then
+   tmp_CFLAGS="${CFLAGS}"
+   tmp_LIBS="${LIBS}"
+   CFLAGS="${GNUTLS_CFLAGS}"
+   LIBS="${GNUTLS_LIBS}"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_x509_crt_verify_hash in -lgnutls" >&5
+$as_echo_n "checking for gnutls_x509_crt_verify_hash in -lgnutls... " >&6; }
+if test "${ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgnutls  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gnutls_x509_crt_verify_hash ();
+int
+main ()
+{
+return gnutls_x509_crt_verify_hash ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash=yes
+else
+  ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash" >&5
+$as_echo "$ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash" >&6; }
+if test "x$ac_cv_lib_gnutls_gnutls_x509_crt_verify_hash" = x""yes; then :
+   new_gnutls_api="yes"
+else
+   new_gnutls_api="no"
+
+fi
+
+   CFLAGS="${tmp_CFLAGS}"
+   LIBS="${tmp_LIBS}"
+
+   if test "x${new_gnutls_api}" = "xyes"; then
+
+$as_echo "#define EET_USE_NEW_GNUTLS_API 1" >>confdefs.h
+
+   fi
+fi
+
+use_gnutls_privkey_sign_data="no"
+if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then
+   tmp_CFLAGS="${CFLAGS}"
+   tmp_LIBS="${LIBS}"
+   CFLAGS="${GNUTLS_CFLAGS}"
+   LIBS="${GNUTLS_LIBS}"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_privkey_sign_data in -lgnutls" >&5
+$as_echo_n "checking for gnutls_privkey_sign_data in -lgnutls... " >&6; }
+if test "${ac_cv_lib_gnutls_gnutls_privkey_sign_data+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgnutls  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gnutls_privkey_sign_data ();
+int
+main ()
+{
+return gnutls_privkey_sign_data ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gnutls_gnutls_privkey_sign_data=yes
+else
+  ac_cv_lib_gnutls_gnutls_privkey_sign_data=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_privkey_sign_data" >&5
+$as_echo "$ac_cv_lib_gnutls_gnutls_privkey_sign_data" >&6; }
+if test "x$ac_cv_lib_gnutls_gnutls_privkey_sign_data" = x""yes; then :
+   use_gnutls_privkey_sign_data="yes"
+else
+   use_gnutls_privkey_sign_data="no"
+
+fi
+
+   CFLAGS="${tmp_CFLAGS}"
+   LIBS="${tmp_LIBS}"
+
+   if test "x${use_gnutls_privkey_sign_data}" = "xyes"; then
+
+$as_echo "#define EET_USE_NEW_PRIVKEY_SIGN_DATA 1" >>confdefs.h
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use gnutls_privkey_sign_data" >&5
+$as_echo_n "checking whether to use gnutls_privkey_sign_data... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${use_gnutls_privkey_sign_data}" >&5
+$as_echo "${use_gnutls_privkey_sign_data}" >&6; }
+
+use_gnutls_pubkey_verify_hash="no"
+if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then
+   tmp_CFLAGS="${CFLAGS}"
+   tmp_LIBS="${LIBS}"
+   CFLAGS="${GNUTLS_CFLAGS}"
+   LIBS="${GNUTLS_LIBS}"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_pubkey_verify_hash in -lgnutls" >&5
+$as_echo_n "checking for gnutls_pubkey_verify_hash in -lgnutls... " >&6; }
+if test "${ac_cv_lib_gnutls_gnutls_pubkey_verify_hash+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgnutls  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gnutls_pubkey_verify_hash ();
+int
+main ()
+{
+return gnutls_pubkey_verify_hash ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gnutls_gnutls_pubkey_verify_hash=yes
+else
+  ac_cv_lib_gnutls_gnutls_pubkey_verify_hash=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_pubkey_verify_hash" >&5
+$as_echo "$ac_cv_lib_gnutls_gnutls_pubkey_verify_hash" >&6; }
+if test "x$ac_cv_lib_gnutls_gnutls_pubkey_verify_hash" = x""yes; then :
+   use_gnutls_pubkey_verify_hash="yes"
+else
+   use_gnutls_pubkey_verify_hash="no"
+
+fi
+
+   CFLAGS="${tmp_CFLAGS}"
+   LIBS="${tmp_LIBS}"
+
+   if test "x${use_gnutls_pubkey_verify_hash}" = "xyes"; then
+
+$as_echo "#define EET_USE_NEW_PUBKEY_VERIFY_HASH 1" >>confdefs.h
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use gnutls_pubkey_verify_hash" >&5
+$as_echo_n "checking whether to use gnutls_pubkey_verify_hash... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${use_gnutls_pubkey_verify_hash}" >&5
+$as_echo "${use_gnutls_pubkey_verify_hash}" >&6; }
+
 # Openssl library
 have_openssl="no"
 if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then
@@ -12877,11 +13108,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
 $as_echo_n "checking for OPENSSL... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$OPENSSL_CFLAGS"; then
-        pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$OPENSSL_CFLAGS"; then
+    pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -12891,15 +13121,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$OPENSSL_LIBS"; then
-        pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$OPENSSL_LIBS"; then
+    pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -12909,14 +13137,15 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-        pkg_failed=untried
+ 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
@@ -12924,17 +13153,17 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
+                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
         else
-                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
+                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
         fi
         # Put the nasty error message in config.log where it belongs
         echo "$OPENSSL_PKG_ERRORS" >&5
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                have_openssl="no"
+        have_openssl="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         have_openssl="no"
 else
         OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
@@ -13001,7 +13230,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_inclu
 if test "x$ac_cv_header_zlib_h" = x""yes; then :
   dummy="yes"
 else
-  as_fn_error "\"Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5
+  as_fn_error $? "\"Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5
 fi
 
 
@@ -13010,7 +13239,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac
 if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
   dummy="yes"
 else
-  as_fn_error "\"Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5
+  as_fn_error $? "\"Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file\"" "$LINENO" 5
 fi
 
 
@@ -13019,8 +13248,7 @@ for ac_header in netinet/in.h unistd.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 test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13097,7 +13325,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
                       sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13992,8 +14220,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 test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -14060,8 +14287,7 @@ for ac_func in fmemopen open_memstream realpath
 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 test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -14148,12 +14374,63 @@ if (! test "x${ac_cv_search_fnmatch}" = "xnone required") && (! test "x${ac_cv_s
    EFL_FNMATCH_LIBS=${ac_cv_search_fnmatch}
 fi
 
+if test "x${_efl_have_fnmatch}" != "xyes" -a "x${enable_exotic}" = "xyes"; then
+   LDFLAGS_SAVE="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $EXOTIC_LIBS"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fnmatch in -lexotic" >&5
+$as_echo_n "checking for fnmatch in -lexotic... " >&6; }
+if test "${ac_cv_lib_exotic_fnmatch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lexotic  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char fnmatch ();
+int
+main ()
+{
+return fnmatch ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_exotic_fnmatch=yes
+else
+  ac_cv_lib_exotic_fnmatch=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exotic_fnmatch" >&5
+$as_echo "$ac_cv_lib_exotic_fnmatch" >&6; }
+if test "x$ac_cv_lib_exotic_fnmatch" = x""yes; then :
+  _efl_have_fnmatch="yes"
+else
+  _efl_have_fnmatch="no"
+fi
+
+
+   if test "x${_efl_have_fnmatch}" = "xyes"; then
+      EFL_FNMATCH_LIBS="exotic"
+   fi
+fi
+
 
 
 if test "x$_efl_have_fnmatch" = "xyes"; then :
 
 else
-  as_fn_error "Cannot find fnmatch()" "$LINENO" 5
+  as_fn_error $? "Cannot find fnmatch()" "$LINENO" 5
 fi
 
 
@@ -14246,6 +14523,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$//'
@@ -14269,43 +14547,43 @@ 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 "${EET_AMALGAMATION_TRUE}" && test -z "${EET_AMALGAMATION_FALSE}"; then
-  as_fn_error "conditional \"EET_AMALGAMATION\" was never defined.
+  as_fn_error $? "conditional \"EET_AMALGAMATION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EET_TRUE}" && test -z "${BUILD_EET_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EET\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EET\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INSTALL_EXAMPLES_TRUE}" && test -z "${INSTALL_EXAMPLES_FALSE}"; then
-  as_fn_error "conditional \"INSTALL_EXAMPLES\" was never defined.
+  as_fn_error $? "conditional \"INSTALL_EXAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EXAMPLES\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EXAMPLES\" 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.
+  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_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then
-  as_fn_error "conditional \"EFL_ENABLE_COVERAGE\" was never defined.
+  as_fn_error $? "conditional \"EFL_ENABLE_COVERAGE\" 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
 
@@ -14455,19 +14733,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
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $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
 
@@ -14663,7 +14941,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
@@ -14716,8 +14994,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 eet $as_me 1.5.99.67344, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by eet $as_me 1.6.0-alpha, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14782,11 +15060,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="\\
-eet config.status 1.5.99.67344
-configured by $0, generated by GNU Autoconf 2.65,
+eet config.status 1.6.0-alpha
+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."
 
@@ -14804,11 +15082,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
@@ -14830,6 +15113,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;;
@@ -14842,7 +15126,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 ;;
@@ -14851,7 +15135,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"
@@ -15176,7 +15460,7 @@ do
     "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
     "eet.spec") CONFIG_FILES="$CONFIG_FILES eet.spec" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -15214,7 +15498,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.
@@ -15231,7 +15515,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
@@ -15245,18 +15529,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
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+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
@@ -15345,20 +15629,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),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${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[        ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[     ]*\):*/\1/
+  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
+h
+s///
+s/^/:/
+s/[      ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[   ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[       ]*$//
 }'
 fi
@@ -15386,7 +15678,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
@@ -15471,7 +15763,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"
 
 
@@ -15484,7 +15776,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
@@ -15512,7 +15804,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'"
@@ -15539,7 +15831,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
@@ -15676,22 +15968,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)
   #
@@ -15702,19 +15994,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"
@@ -16505,7 +16797,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.
@@ -16526,7 +16818,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
diff --git a/libraries/eet/configure.ac b/libraries/eet/configure.ac
index 220e2a1..eb3c7e5 100644
--- a/libraries/eet/configure.ac
+++ b/libraries/eet/configure.ac
@@ -1,12 +1,12 @@
-y##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
-m4_define([v_min], [5])
-m4_define([v_mic], [99])
+m4_define([v_min], [6])
+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']))
 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-05])
 dnl m4_define([v_rel], [-release relname])
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
-AC_INIT([eet], [v_ver], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([eet], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -110,39 +110,6 @@ else
    AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
 fi
 
-# Gnutls support
-
-AC_ARG_ENABLE([gnutls],
-   [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support])],
-   [want_gnutls=$enableval]
-)
-AC_MSG_CHECKING([whether to use Gnutls])
-AC_MSG_RESULT([${want_gnutls}])
-
-# Specific GNUTLS improvement
-
-new_gnutls_api="yes"
-AC_ARG_ENABLE(new-gnutls-api,
-   [AC_HELP_STRING(
-      [--disable-new-gnutls-api],
-      [enable use of gnutls_x509_crt_verify_hash. [[default=enable]]]
-    )],
-   [new_gnutls_api=$enableval]
-)
-AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash])
-AC_MSG_RESULT([${new_gnutls_api}])
-
-if test "x${new_gnutls_api}" = "xyes" ; then
-   AC_CHECK_LIB(gnutls, gnutls_x509_crt_verify_hash,
-                [ new_gnutls_api="yes" ],
-                [ new_gnutls_api="no" ]
-                )
-
-   if test "x${new_gnutls_api}" = "xyes"; then
-      AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash])
-   fi
-fi
-
 # Openssl support
 
 AC_ARG_ENABLE([openssl],
@@ -264,8 +231,30 @@ AC_SUBST(EET_LIBS)
 
 # Eina library
 
-PKG_CHECK_MODULES(EINA, [eina >= 1.1.0])
-requirement_eet="eina >= 1.1.0 ${requirement_eet}"
+PKG_CHECK_MODULES(EINA, [eina >= 1.2.0])
+requirement_eet="eina >= 1.2.0 ${requirement_eet}"
+
+### Checks for portability layer
+
+PKG_CHECK_MODULES([EXOTIC],
+   [exotic],
+   [enable_exotic="yes"],
+   [enable_exotic="no"])
+
+if test "x${enable_exotic}" = "xyes"; then
+    requirement_eet="exotic ${requirement_eet}"
+
+    AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
+fi
+
+# Gnutls support
+
+AC_ARG_ENABLE([gnutls],
+   [AC_HELP_STRING([--disable-gnutls], [disable gnutls eet support])],
+   [want_gnutls=$enableval]
+)
+AC_MSG_CHECKING([whether to use Gnutls])
+AC_MSG_RESULT([${want_gnutls}])
 
 # Gnutls library
 have_gnutls="no"
@@ -287,6 +276,76 @@ if test "x${want_gnutls}" = "xyes" || test "x${want_gnutls}" = "xauto" ; then
    fi
 fi
 
+# Specific GNUTLS improvement
+
+new_gnutls_api="yes"
+AC_ARG_ENABLE(new-gnutls-api,
+   [AC_HELP_STRING(
+      [--disable-new-gnutls-api],
+      [enable use of gnutls_x509_crt_verify_hash. [[default=enable]]]
+    )],
+   [new_gnutls_api=$enableval]
+)
+AC_MSG_CHECKING([whether to use gnutls_x509_crt_verify_hash])
+AC_MSG_RESULT([${new_gnutls_api}])
+
+if test "x${new_gnutls_api}" = "xyes" ; then
+   tmp_CFLAGS="${CFLAGS}"
+   tmp_LIBS="${LIBS}"
+   CFLAGS="${GNUTLS_CFLAGS}"
+   LIBS="${GNUTLS_LIBS}"
+   AC_CHECK_LIB(gnutls, gnutls_x509_crt_verify_hash,
+                [ new_gnutls_api="yes" ],
+                [ new_gnutls_api="no" ]
+                )
+   CFLAGS="${tmp_CFLAGS}"
+   LIBS="${tmp_LIBS}"
+
+   if test "x${new_gnutls_api}" = "xyes"; then
+      AC_DEFINE(EET_USE_NEW_GNUTLS_API, 1, [use gnutls_x509_crt_verify_hash])
+   fi
+fi
+
+use_gnutls_privkey_sign_data="no"
+if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then
+   tmp_CFLAGS="${CFLAGS}"
+   tmp_LIBS="${LIBS}"
+   CFLAGS="${GNUTLS_CFLAGS}"
+   LIBS="${GNUTLS_LIBS}"
+   AC_CHECK_LIB(gnutls, gnutls_privkey_sign_data,
+                [ use_gnutls_privkey_sign_data="yes" ],
+                [ use_gnutls_privkey_sign_data="no" ]
+                )
+   CFLAGS="${tmp_CFLAGS}"
+   LIBS="${tmp_LIBS}"
+
+   if test "x${use_gnutls_privkey_sign_data}" = "xyes"; then
+      AC_DEFINE(EET_USE_NEW_PRIVKEY_SIGN_DATA, 1, [use gnutls_privkey_sign_data])
+   fi
+fi
+AC_MSG_CHECKING([whether to use gnutls_privkey_sign_data])
+AC_MSG_RESULT([${use_gnutls_privkey_sign_data}])
+
+use_gnutls_pubkey_verify_hash="no"
+if test "x${want_gnutls}" = "xyes" -o "x${want_gnutls}" = "xauto"; then
+   tmp_CFLAGS="${CFLAGS}"
+   tmp_LIBS="${LIBS}"
+   CFLAGS="${GNUTLS_CFLAGS}"
+   LIBS="${GNUTLS_LIBS}"
+   AC_CHECK_LIB(gnutls, gnutls_pubkey_verify_hash,
+                [ use_gnutls_pubkey_verify_hash="yes" ],
+                [ use_gnutls_pubkey_verify_hash="no" ]
+                )
+   CFLAGS="${tmp_CFLAGS}"
+   LIBS="${tmp_LIBS}"
+
+   if test "x${use_gnutls_pubkey_verify_hash}" = "xyes"; then
+      AC_DEFINE(EET_USE_NEW_PUBKEY_VERIFY_HASH, 1, [use gnutls_pubkey_verify_hash])
+   fi
+fi
+AC_MSG_CHECKING([whether to use gnutls_pubkey_verify_hash])
+AC_MSG_RESULT([${use_gnutls_pubkey_verify_hash}])
+
 # Openssl library
 have_openssl="no"
 if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then
diff --git a/libraries/eet/doc/Doxyfile b/libraries/eet/doc/Doxyfile
index f6e3026..26a32a7 100644
--- a/libraries/eet/doc/Doxyfile
+++ b/libraries/eet/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = Eet
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.99.67344
+PROJECT_NUMBER         = 1.6.0-alpha
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
 
@@ -1267,7 +1267,7 @@ RTF_EXTENSIONS_FILE    =
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/libraries/eet/doc/Doxyfile.in b/libraries/eet/doc/Doxyfile.in
index eadf82a..8c427f8 100644
--- a/libraries/eet/doc/Doxyfile.in
+++ b/libraries/eet/doc/Doxyfile.in
@@ -1267,7 +1267,7 @@ RTF_EXTENSIONS_FILE    =
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/libraries/eet/doc/Makefile.am b/libraries/eet/doc/Makefile.am
index 145376f..4eeb438 100644
--- a/libraries/eet/doc/Makefile.am
+++ b/libraries/eet/doc/Makefile.am
@@ -8,19 +8,20 @@ PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 if EFL_BUILD_DOC
 
 doc-clean:
-        rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
+        rm -rf html/ latex/ xml/ $(PACKAGE_DOCNAME).tar*
 
 doc: doc-clean
         $(efl_doxygen)
         cp $(srcdir)/img/* html/
         rm -rf $(PACKAGE_DOCNAME).tar*
         mkdir -p $(PACKAGE_DOCNAME)/doc
-        cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+        cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc
         tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
         bzip2 -9 $(PACKAGE_DOCNAME).tar
         rm -rf $(PACKAGE_DOCNAME)/
         mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
-        @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
+        @echo "Documentation Package: $(PACKAGE_DOCNAME).tar.bz2"
+        @echo "Documentation HTML: doc/html"
 
 clean-local: doc-clean
 
diff --git a/libraries/eet/doc/Makefile.in b/libraries/eet/doc/Makefile.in
index e285740..25de7ec 100644
--- a/libraries/eet/doc/Makefile.in
+++ b/libraries/eet/doc/Makefile.in
@@ -104,6 +104,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -143,6 +145,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -414,19 +418,20 @@ uninstall-am:
 .PHONY: doc
 
 @EFL_BUILD_DOC_TRUE@doc-clean:
-@EFL_BUILD_DOC_TRUE@    rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
+@EFL_BUILD_DOC_TRUE@    rm -rf html/ latex/ xml/ $(PACKAGE_DOCNAME).tar*
 
 @EFL_BUILD_DOC_TRUE@doc: doc-clean
 @EFL_BUILD_DOC_TRUE@    $(efl_doxygen)
 @EFL_BUILD_DOC_TRUE@    cp $(srcdir)/img/* html/
 @EFL_BUILD_DOC_TRUE@    rm -rf $(PACKAGE_DOCNAME).tar*
 @EFL_BUILD_DOC_TRUE@    mkdir -p $(PACKAGE_DOCNAME)/doc
-@EFL_BUILD_DOC_TRUE@    cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+@EFL_BUILD_DOC_TRUE@    cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc
 @EFL_BUILD_DOC_TRUE@    tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
 @EFL_BUILD_DOC_TRUE@    bzip2 -9 $(PACKAGE_DOCNAME).tar
 @EFL_BUILD_DOC_TRUE@    rm -rf $(PACKAGE_DOCNAME)/
 @EFL_BUILD_DOC_TRUE@    mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
-@EFL_BUILD_DOC_TRUE@    @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
+@EFL_BUILD_DOC_TRUE@    @echo "Documentation Package: $(PACKAGE_DOCNAME).tar.bz2"
+@EFL_BUILD_DOC_TRUE@    @echo "Documentation HTML: doc/html"
 
 @EFL_BUILD_DOC_TRUE@clean-local: doc-clean
 
diff --git a/libraries/eet/eet.spec b/libraries/eet/eet.spec
index 4b7994b..a357773 100644
--- a/libraries/eet/eet.spec
+++ b/libraries/eet/eet.spec
@@ -3,7 +3,7 @@
 
 Summary: Library for speedy data storage, retrieval, and compression.
 Name: eet
-Version: 1.5.99.67344
+Version: 1.6.0-alpha
 Release: %{_rel}
 License: BSD
 Group: System Environment/Libraries
diff --git a/libraries/eet/ltmain.sh b/libraries/eet/ltmain.sh
index 7ed280b..fa4b1e1 100755
--- a/libraries/eet/ltmain.sh
+++ b/libraries/eet/ltmain.sh
@@ -65,7 +65,7 @@
 #       compiler:               $LTCC
 #       compiler flags:         $LTCFLAGS
 #       linker:         $LD (gnu? $with_gnu_ld)
-#       $progname:              (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       $progname:              (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
 #       automake:               $automake_version
 #       autoconf:               $autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
 TIMESTAMP=""
 package_revision=1.3017
 
diff --git a/libraries/eet/m4/efl_fnmatch.m4 b/libraries/eet/m4/efl_fnmatch.m4
index a92ac6b..b5555ee 100644
--- a/libraries/eet/m4/efl_fnmatch.m4
+++ b/libraries/eet/m4/efl_fnmatch.m4
@@ -24,6 +24,18 @@ if (! test "x${ac_cv_search_fnmatch}" = "xnone required") && (! test "x${ac_cv_s
    EFL_FNMATCH_LIBS=${ac_cv_search_fnmatch}
 fi
 
+if test "x${_efl_have_fnmatch}" != "xyes" -a "x${enable_exotic}" = "xyes"; then
+   LDFLAGS_SAVE="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $EXOTIC_LIBS"
+   AC_CHECK_LIB([exotic], [fnmatch],
+                [_efl_have_fnmatch="yes"],
+                [_efl_have_fnmatch="no"])
+
+   if test "x${_efl_have_fnmatch}" = "xyes"; then
+      EFL_FNMATCH_LIBS="exotic"
+   fi
+fi
+
 AC_SUBST(EFL_FNMATCH_LIBS)
 
 AS_IF([test "x$_efl_have_fnmatch" = "xyes"], [$1], [$2])
diff --git a/libraries/eet/src/Makefile.in b/libraries/eet/src/Makefile.in
index 8b2aa37..bfdc4f6 100644
--- a/libraries/eet/src/Makefile.in
+++ b/libraries/eet/src/Makefile.in
@@ -143,6 +143,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -182,6 +184,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
diff --git a/libraries/eet/src/bin/Makefile.am b/libraries/eet/src/bin/Makefile.am
index ba7d67e..89c68f1 100644
--- a/libraries/eet/src/bin/Makefile.am
+++ b/libraries/eet/src/bin/Makefile.am
@@ -17,5 +17,5 @@ EXTRA_PROGRAMS = eet
 
 eet_SOURCES = eet_main.c
 eet_CFLAGS = @EET_CFLAGS@
-eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@
+eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@ @EXOTIC_LIBS@
 eet_LDFLAGS = @lt_enable_auto_import@
diff --git a/libraries/eet/src/bin/Makefile.in b/libraries/eet/src/bin/Makefile.in
index 4a899f5..a7e94cb 100644
--- a/libraries/eet/src/bin/Makefile.in
+++ b/libraries/eet/src/bin/Makefile.in
@@ -138,6 +138,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -177,6 +179,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -259,7 +263,7 @@ AM_CPPFLAGS = \
 bin_PROGRAMS = @EET_PRG@
 eet_SOURCES = eet_main.c
 eet_CFLAGS = @EET_CFLAGS@
-eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@
+eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@ @EXOTIC_LIBS@
 eet_LDFLAGS = @lt_enable_auto_import@
 all: all-am
 
diff --git a/libraries/eet/src/bin/eet_main.c b/libraries/eet/src/bin/eet_main.c
index 0d577ad..8a93d11 100644
--- a/libraries/eet/src/bin/eet_main.c
+++ b/libraries/eet/src/bin/eet_main.c
@@ -69,6 +69,63 @@ do_eet_list(const char *file)
 } /* do_eet_list */
 
 static void
+do_eet_stats(const char *file)
+{
+   int i, num;
+   int count[2] = { 0, 0 };
+   int size[2] = { 0, 0 };
+   char **list;
+   Eet_File *ef;
+   Eet_Dictionary *ed;
+
+   ef = eet_open(file, EET_FILE_MODE_READ);
+   if (!ef)
+     {
+        ERR("cannot open for reading: %s", file);
+        exit(-1);
+     }
+
+   printf("*** sections stats ***\n");
+   list = eet_list(ef, "*", &num);
+   if (list)
+     {
+        for (i = 0; i < num; i++)
+          {
+             const void *ro = NULL;
+             void *rw = NULL;
+             int tsize;
+
+             ro = eet_read_direct(ef, list[i], &tsize);
+             if (!ro) rw = eet_read(ef, list[i], &tsize);
+             printf(rw ? "%s of size %i is compressed.\n" : "%s of size %i is not compressed.\n", list[i], tsize);
+             count[rw ? 0 : 1]++;
+             size[rw ? 0 : 1] += tsize;
+             free(rw);
+          }
+        free(list);
+     }
+
+   printf("*** dictionary ***\n");
+   ed = eet_dictionary_get(ef);
+   if (ed)
+     {
+        printf("%i strings inside the dictionary.\n", eet_dictionary_count(ed));
+     }
+   else
+     {
+        printf("no dictionary in this file.\n");
+     }
+   printf("*** global ***\n");
+   printf("%i sections\n", num);
+   printf("- %i of them are compressed (%02.2f%%) expanding in %i bytes.\n",
+          count[0], (float) count[0] * 100 / (float) num, size[0]);
+   printf("- %i of them are directly mappable in memory (%02.2f%%) representing %i bytes.\n",
+          count[1], (float) count[1] * 100 / (float) num, size[1]);
+
+   eet_close(ef);
+}
+
+static void
 do_eet_extract(const char *file,
                const char *key,
                const char *out,
@@ -366,6 +423,7 @@ help:
           "  eet -r FILE.EET KEY                                remove KEY in FILE.EET\n"
           "  eet -c FILE.EET                                    report and check the signature information of an eet file\n"
           "  eet -s FILE.EET PRIVATE_KEY PUBLIC_KEY             sign FILE.EET with PRIVATE_KEY and attach PUBLIC_KEY as it's certificate\n"
+          "  eet -t FILE.EET                                    give some statistic about a file\n"
           );
         eet_shutdown();
         return -1;
@@ -437,6 +495,8 @@ help:
      do_eet_check(argv[2]);
    else if ((!strcmp(argv[1], "-s")) && (argc > 4))
      do_eet_sign(argv[2], argv[3], argv[4]);
+   else if ((!strcmp(argv[1], "-t")) && (argc > 2))
+     do_eet_stats(argv[2]);
    else
      goto help;
 
diff --git a/libraries/eet/src/examples/Makefile.in b/libraries/eet/src/examples/Makefile.in
index 5830132..1e979ab 100644
--- a/libraries/eet/src/examples/Makefile.in
+++ b/libraries/eet/src/examples/Makefile.in
@@ -226,6 +226,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -265,6 +267,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
diff --git a/libraries/eet/src/lib/Eet.h b/libraries/eet/src/lib/Eet.h
index 2df7fbf..7495090 100644
--- a/libraries/eet/src/lib/Eet.h
+++ b/libraries/eet/src/lib/Eet.h
@@ -6,7 +6,7 @@
    @mainpage Eet Library Documentation
 
    @version 1.5.0
-   @date 2000-2011
+   @date 2000-2012
 
    Please see the @ref authors page for contact details.
 
@@ -30,7 +30,7 @@
    Eet is extremely fast, small and simple. Eet files can be very small and
    highly compressed, making them very optimal for just sending across the
    internet without having to archive, compress or decompress and install them.
-   They allow for lightning-fast random-acess reads once created, making them
+   They allow for lightning-fast random-access reads once created, making them
    perfect for storing data that is written once (or rarely) and read many
    times, but the program does not want to have to read it all in at once.
 
@@ -577,7 +577,7 @@ EAPI Eet_File_Mode
 eet_mode_get(Eet_File *ef);
 
 /**
- * Close an eet file handle and flush and writes pending.
+ * Close an eet file handle and flush pending writes.
  * @param ef A valid eet file handle.
  *
  * This function will flush any pending writes to disk if the eet file
@@ -645,6 +645,17 @@ eet_dictionary_string_check(Eet_Dictionary *ed,
                             const char *string);
 
 /**
+ * Return the number of strings inside a dictionary
+ * @param ed A valid dictionary handle
+ * @return the number of strings inside a dictionary
+ *
+ * @since 1.6.0
+ * @ingroup Eet_File_Group
+ */
+EAPI int
+eet_dictionary_count(const Eet_Dictionary *ed);
+
+/**
  * Read a specified entry from an eet file and return data
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
diff --git a/libraries/eet/src/lib/Makefile.in b/libraries/eet/src/lib/Makefile.in
index 2a3fec0..c0367b3 100644
--- a/libraries/eet/src/lib/Makefile.in
+++ b/libraries/eet/src/lib/Makefile.in
@@ -172,6 +172,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -211,6 +213,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
diff --git a/libraries/eet/src/lib/eet_alloc.c b/libraries/eet/src/lib/eet_alloc.c
index 85351ad..29e276c 100644
--- a/libraries/eet/src/lib/eet_alloc.c
+++ b/libraries/eet/src/lib/eet_alloc.c
@@ -3,6 +3,7 @@
 #endif
 
 #include <Eina.h>
+
 #include "Eet.h"
 #include "Eet_private.h"
 
@@ -90,4 +91,3 @@ eet_mempool_shutdown(void)
         mempool_array[i]->mp = NULL;
      }
 }
-
diff --git a/libraries/eet/src/lib/eet_cipher.c b/libraries/eet/src/lib/eet_cipher.c
index 37a0899..2425e22 100644
--- a/libraries/eet/src/lib/eet_cipher.c
+++ b/libraries/eet/src/lib/eet_cipher.c
@@ -56,6 +56,9 @@ void *alloca(size_t);
 
 #ifdef HAVE_CIPHER
 # ifdef HAVE_GNUTLS
+#  if defined EET_USE_NEW_PUBKEY_VERIFY_HASH || defined EET_USE_NEW_PRIVKEY_SIGN_DATA
+#   include <gnutls/abstract.h>
+#  endif
 #  include <gnutls/x509.h>
 #  include <gcrypt.h>
 # else /* ifdef HAVE_GNUTLS */
@@ -497,6 +500,10 @@ eet_identity_sign(FILE    *fp,
    gnutls_datum_t datum = { NULL, 0 };
    size_t sign_len = 0;
    size_t cert_len = 0;
+#ifdef EET_USE_NEW_PRIVKEY_SIGN_DATA
+   gnutls_datum_t signum = { NULL, 0 };
+   gnutls_privkey_t privkey;
+#endif
 # else /* ifdef HAVE_GNUTLS */
    EVP_MD_CTX md_ctx;
    unsigned int sign_len = 0;
@@ -528,6 +535,28 @@ eet_identity_sign(FILE    *fp,
    datum.size = st_buf.st_size;
 
    /* Get the signature length */
+#ifdef EET_USE_NEW_PRIVKEY_SIGN_DATA
+   if (gnutls_privkey_init(&privkey) < 0)
+     {
+        err = EET_ERROR_SIGNATURE_FAILED;
+        goto on_error;
+     }
+
+   if (gnutls_privkey_import_x509(privkey, key->private_key, 0) < 0)
+     {
+        err = EET_ERROR_SIGNATURE_FAILED;
+        goto on_error;
+     }
+
+   if (gnutls_privkey_sign_data(privkey, GNUTLS_DIG_SHA1, 0, &datum, &signum) < 0)
+     {
+        err = EET_ERROR_SIGNATURE_FAILED;
+        goto on_error;
+     }
+
+   sign = signum.data;
+   sign_len = signum.size;
+#else
    if (gnutls_x509_privkey_sign_data(key->private_key, GNUTLS_DIG_SHA1, 0,
                                      &datum, sign, &sign_len) &&
        !sign_len)
@@ -550,6 +579,7 @@ eet_identity_sign(FILE    *fp,
 
         goto on_error;
      }
+#endif
 
    /* Get the certificate length */
    if (gnutls_x509_crt_export(key->certificate, GNUTLS_X509_FMT_DER, cert,
@@ -696,6 +726,10 @@ eet_identity_check(const void   *data_base,
    gnutls_datum_t datum;
    gnutls_datum_t signature;
 #  if EET_USE_NEW_GNUTLS_API
+#  if EET_USE_NEW_PUBKEY_VERIFY_HASH
+   gnutls_pubkey_t pubkey;
+   gnutls_digest_algorithm_t hash_algo;
+#  endif
    unsigned char *hash;
    gcry_md_hd_t md;
    int err;
@@ -724,28 +758,32 @@ eet_identity_check(const void   *data_base,
 
    hash = gcry_md_read(md, GCRY_MD_SHA1);
    if (!hash)
-     {
-        gcry_md_close(md);
-        return NULL;
-     }
+     goto on_error;
 
    datum.size = gcry_md_get_algo_dlen(GCRY_MD_SHA1);
    datum.data = hash;
 
+#  ifdef EET_USE_NEW_PUBKEY_VERIFY_HASH
+   if (gnutls_pubkey_init(&pubkey) < 0)
+     goto on_error;
+
+   if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0)
+     goto on_error;
+
+   if (gnutls_pubkey_get_verify_algorithm(pubkey, &signature, &hash_algo) < 0)
+     goto on_error;
+
+   if (gnutls_pubkey_verify_hash(pubkey, 0, &datum, &signature) < 0)
+     goto on_error;
+#  else
    if (!gnutls_x509_crt_verify_hash(cert, 0, &datum, &signature))
-     {
-        gcry_md_close(md);
-        return NULL;
-     }
+     goto on_error;
+#  endif
 
    if (sha1)
      {
         *sha1 = malloc(datum.size);
-        if (!*sha1)
-          {
-             gcry_md_close(md);
-             return NULL;
-          }
+        if (!*sha1) goto on_error;
 
         memcpy(*sha1, hash, datum.size);
         *sha1_length = datum.size;
@@ -818,6 +856,13 @@ eet_identity_check(const void   *data_base,
      *raw_signature_length = sign_len;
 
    return cert_der;
+# ifdef HAVE_GNUTLS
+#  if EET_USE_NEW_GNUTLS_API
+ on_error:
+   gcry_md_close(md);
+   return NULL;
+#  endif
+# endif
 #else /* ifdef HAVE_SIGNATURE */
    data_base = NULL;
    data_length = 0;
diff --git a/libraries/eet/src/lib/eet_data.c b/libraries/eet/src/lib/eet_data.c
index 56b9ee0..d502f44 100644
--- a/libraries/eet/src/lib/eet_data.c
+++ b/libraries/eet/src/lib/eet_data.c
@@ -21,18 +21,6 @@
 #include "Eet.h"
 #include "Eet_private.h"
 
-#ifdef _WIN32
-# define FMT_CHAR       "%c"
-# define FMT_UCHAR      "%c"
-# define FMT_LONG_LONG  "%I64i"
-# define FMT_ULONG_LONG "%I64u"
-#else
-# define FMT_CHAR       "%hhi"
-# define FMT_UCHAR      "%hhu"
-# define FMT_LONG_LONG  "%lli"
-# define FMT_ULONG_LONG "%llu"
-#endif
-
 /*
  * routines for doing data -> struct and struct -> data conversion
  *
@@ -3108,7 +3096,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed,
                                             if      (!strcmp(tok3, "char:"))
                                               {
                                                  n->type = EET_T_CHAR;
-                                                 sscanf(tok4, FMT_CHAR,
+                                                 sscanf(tok4, "%hhi",
                                                         &(n->data.value.c));
                                               }
                                             else if (!strcmp(tok3, "short:"))
@@ -3126,7 +3114,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed,
                                             else if (!strcmp(tok3, "long_long:"))
                                               {
                                                  n->type = EET_T_LONG_LONG;
-                                                 sscanf(tok4, FMT_LONG_LONG,
+                                                 sscanf(tok4, "%lli",
                                                         &(n->data.value.l));
                                               }
                                             else if (!strcmp(tok3, "float:"))
@@ -3144,7 +3132,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed,
                                             else if (!strcmp(tok3, "uchar:"))
                                               {
                                                  n->type = EET_T_UCHAR;
-                                                 sscanf(tok4, FMT_UCHAR,
+                                                 sscanf(tok4, "%hhu",
                                                         &(n->data.value.uc));
                                               }
                                             else if (!strcmp(tok3, "ushort:"))
@@ -3162,7 +3150,7 @@ _eet_data_dump_parse(Eet_Dictionary *ed,
                                             else if (!strcmp(tok3, "ulong_long:"))
                                               {
                                                  n->type = EET_T_ULONG_LONG;
-                                                 sscanf(tok4, FMT_ULONG_LONG,
+                                                 sscanf(tok4, "%llu",
                                                         &(n->data.value.ul));
                                               }
                                             else if (!strcmp(tok3, "string:"))
@@ -4996,4 +4984,3 @@ eet_data_xattr_cipher_set(const char          *filename,
 
    return ret;
 }
-
diff --git a/libraries/eet/src/lib/eet_dictionary.c b/libraries/eet/src/lib/eet_dictionary.c
index 287860d..c79239b 100644
--- a/libraries/eet/src/lib/eet_dictionary.c
+++ b/libraries/eet/src/lib/eet_dictionary.c
@@ -169,6 +169,12 @@ eet_dictionary_string_get_size(const Eet_Dictionary *ed,
    return 0;
 }
 
+EAPI int
+eet_dictionary_count(const Eet_Dictionary *ed)
+{
+  return ed->count;
+}
+
 int
 eet_dictionary_string_get_hash(const Eet_Dictionary *ed,
                                int                   idx)
diff --git a/libraries/eet/src/lib/eet_image.c b/libraries/eet/src/lib/eet_image.c
index 8c6c03c..b622236 100644
--- a/libraries/eet/src/lib/eet_image.c
+++ b/libraries/eet/src/lib/eet_image.c
@@ -246,7 +246,7 @@ eet_data_image_jpeg_rgb_decode(const void   *data,
                                unsigned int  w,
                                unsigned int  h,
                                unsigned int  row_stride);
-static void *
+static int
 eet_data_image_jpeg_alpha_decode(const void   *data,
                                  int           size,
                                  unsigned int  src_x,
@@ -560,7 +560,7 @@ eet_data_image_jpeg_rgb_decode(const void   *data,
    return 1;
 }
 
-static void *
+static int
 eet_data_image_jpeg_alpha_decode(const void   *data,
                                  int           size,
                                  unsigned int  src_x,
@@ -577,6 +577,10 @@ eet_data_image_jpeg_alpha_decode(const void   *data,
    unsigned int x, y, l, scans;
    unsigned int i, iw;
 
+   /* FIXME: handle src_x, src_y and row_stride correctly */
+   if (!d)
+     return 0;
+
    memset(&cinfo, 0, sizeof (struct jpeg_decompress_struct));
 
    cinfo.err = jpeg_std_error(&(jerr.pub));
@@ -584,14 +588,14 @@ eet_data_image_jpeg_alpha_decode(const void   *data,
    jerr.pub.emit_message = _JPEGErrorHandler2;
    jerr.pub.output_message = _JPEGErrorHandler;
    if (setjmp(jerr.setjmp_buffer))
-     return NULL;
+     return 0;
 
    jpeg_create_decompress(&cinfo);
 
    if (eet_jpeg_membuf_src(&cinfo, data, (size_t)size))
      {
         jpeg_destroy_decompress(&cinfo);
-        return NULL;
+        return 0;
      }
 
    jpeg_read_header(&cinfo, TRUE);
@@ -609,7 +613,7 @@ eet_data_image_jpeg_alpha_decode(const void   *data,
         cinfo.src = NULL;
 
         jpeg_destroy_decompress(&cinfo);
-        return NULL;
+        return 0;
      }
 
    /* end head decoding */
@@ -620,11 +624,12 @@ eet_data_image_jpeg_alpha_decode(const void   *data,
         cinfo.src = NULL;
 
         jpeg_destroy_decompress(&cinfo);
-        return NULL;
+        return 0;
      }
 
    tdata = alloca(w * 16 * 3);
    ptr2 = d;
+
    if (cinfo.output_components == 1)
      {
         for (i = 0; i < (unsigned int)cinfo.rec_outbuf_height; i++)
@@ -666,7 +671,7 @@ eet_data_image_jpeg_alpha_decode(const void   *data,
    /* end data decoding */
    jpeg_finish_decompress(&cinfo);
    jpeg_destroy_decompress(&cinfo);
-   return d;
+   return 1;
 }
 
 static void *
diff --git a/libraries/eet/src/tests/Makefile.in b/libraries/eet/src/tests/Makefile.in
index 791f9fd..e17a54e 100644
--- a/libraries/eet/src/tests/Makefile.in
+++ b/libraries/eet/src/tests/Makefile.in
@@ -135,6 +135,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -174,6 +176,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
diff --git a/libraries/eet/src/tests/eet_suite.c b/libraries/eet/src/tests/eet_suite.c
index 3bbc912..91ef2a7 100644
--- a/libraries/eet/src/tests/eet_suite.c
+++ b/libraries/eet/src/tests/eet_suite.c
@@ -1933,7 +1933,7 @@ START_TEST(eet_cache_concurrency)
    thread = _beginthreadex(NULL, 0, open_close_worker, file, 0, &thread_id);
 # endif /* ifdef _EET_INCLUDED_PTHREAD */
    /* clear the cache repeatedly in this thread */
-   for (n = 0; n < 50000; ++n)
+   for (n = 0; n < 20000; ++n)
      {
         eet_clearcache();
      }