34 files changed, 672 insertions, 444 deletions
diff --git a/libraries/embryo/ChangeLog b/libraries/embryo/ChangeLog
index a9a410a..297abf1 100644
--- a/libraries/embryo/ChangeLog
+++ b/libraries/embryo/ChangeLog
@@ -18,3 +18,12 @@
 2011-12-02 Carsten Haitzler (The Rasterman)
        1.1.0 release
+2012-02-24  Cedric Bail
+        * Add exotic support
+2012-03-07  Vincent Torri
+        * Fix windows compilation issues
diff --git a/libraries/embryo/Makefile.in b/libraries/embryo/Makefile.in
index 4652fe5..b7f26fd 100644
--- a/libraries/embryo/Makefile.in
+++ b/libraries/embryo/Makefile.in
@@ -45,6 +45,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
        $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \
        $(top_srcdir)/m4/efl_fnmatch.m4 \
+        $(top_srcdir)/m4/efl_gettimeofday.m4 \
        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -174,6 +175,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -206,6 +209,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/embryo/README b/libraries/embryo/README
index 36cfe09..f2cd749 100644
--- a/libraries/embryo/README
+++ b/libraries/embryo/README
@@ -1,4 +1,4 @@
-Embryo
+Embryo 1.2.0
 ******************************************************************************
@@ -13,7 +13,6 @@ Requirements:
 Must:
  eina
  libc
-  libm
 WARNING: gcc compatibility!!!
 There seems to be some bug (or disagreement) between embryo and gcc 3.2.x
diff --git a/libraries/embryo/aclocal.m4 b/libraries/embryo/aclocal.m4
index 14faac2..d3a77dd 100644
--- a/libraries/embryo/aclocal.m4
+++ b/libraries/embryo/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_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.65.
+[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.
 #
-#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# only at the first occurence in configure.ac, so if the first place
-# this or PKG_CHECK_MODULES is called, or make sure to call
+# it's called might be skipped (such as if it is within an "if", you
-# PKG_CHECK_EXISTS manually
+# 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
-    if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
-        pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    PKG_CHECK_EXISTS([$3],
-        PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                     [pkg_failed=yes])
-                         [pkg_failed=yes])
+ else
-    fi
+    pkg_failed=untried
-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
+_PKG_TEXT])[]dnl
-])],
+        ])
-                [AC_MSG_RESULT([no])
-                $4])
 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/>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-                [$4])
+        ])
 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
@@ -1173,6 +1173,7 @@ m4_include([m4/ac_attribute.m4])
 m4_include([m4/efl_binary.m4])
 m4_include([m4/efl_doxygen.m4])
 m4_include([m4/efl_fnmatch.m4])
+m4_include([m4/efl_gettimeofday.m4])
 m4_include([m4/efl_path_max.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
diff --git a/libraries/embryo/config.guess b/libraries/embryo/config.guess
index e3a2116..c2246a4 100755
--- a/libraries/embryo/config.guess
+++ b/libraries/embryo/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>.
+# Originally written by Per Bothner.  Please send patches (context
-# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# diff and a properly formatted ChangeLog entry.
+# 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
+# You can get the latest version of this script from:
-# don't specify an explicit build system type.
+# 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,
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+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 '
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-            /^CPU/{
-                s: ::g
-                p
-            }'`"
        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:*:*)
+    ppc64:Linux:*:*)
-        echo hppa64-unknown-linux-gnu
+        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/embryo/config.h.in b/libraries/embryo/config.h.in
index 331fd3f..cd3ce40 100644
--- a/libraries/embryo/config.h.in
+++ b/libraries/embryo/config.h.in
@@ -16,6 +16,9 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
+/* Defined if gettimeofday is available. */
+#undef EFL_HAVE_GETTIMEOFDAY
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
@@ -29,8 +32,8 @@
 /* Set to 1 if Evil library is installed */
 #undef HAVE_EVIL
-/* Define to 1 if you have the `gettimeofday' function. */
+/* Define to 1 if you have Exotic. */
-#undef HAVE_GETTIMEOFDAY
+#undef HAVE_EXOTIC
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
diff --git a/libraries/embryo/config.sub b/libraries/embryo/config.sub
index eb0389a..c2d1257 100755
--- a/libraries/embryo/config.sub
+++ b/libraries/embryo/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,
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+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* \
+              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-              | -kopensolaris* \
+              | -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/embryo/configure b/libraries/embryo/configure
index 88e889b..7f04eec 100755
--- a/libraries/embryo/configure
+++ b/libraries/embryo/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for embryo 1.1.99.67344.
+# Generated by GNU Autoconf 2.67 for embryo 1.2.0-alpha.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Inc.
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
      test -d "$as_dir" && break
    done
    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 } # as_fn_mkdir_p
@@ -359,19 +359,19 @@ else
 fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ---------------------------------
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
+  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
+  if test "$4"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
  as_fn_exit $as_status
 } # as_fn_error
@@ -682,7 +682,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='embryo'
 PACKAGE_TARNAME='embryo'
-PACKAGE_VERSION='1.1.99.67344'
+PACKAGE_VERSION='1.2.0-alpha'
-PACKAGE_STRING='embryo 1.1.99.67344'
+PACKAGE_STRING='embryo 1.2.0-alpha'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
@@ -754,12 +754,16 @@ ALLOCA
 lt_enable_auto_import
 EMBRYO_CFLAGS
 EMBRYO_CPPFLAGS
+EXOTIC_LIBS
+EXOTIC_CFLAGS
 EINA_LIBS
 EINA_CFLAGS
 EFL_EMBRYO_BUILD
 EVIL_LIBS
 EVIL_CFLAGS
 pkgconfig_requires_private
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 EFL_BUILD_DOC_FALSE
 EFL_BUILD_DOC_TRUE
@@ -905,10 +909,14 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 EVIL_CFLAGS
 EVIL_LIBS
 EINA_CFLAGS
-EINA_LIBS'
+EINA_LIBS
+EXOTIC_CFLAGS
+EXOTIC_LIBS'
 # Initialize some variables set by options.
@@ -971,8 +979,9 @@ do
  fi
  case $ac_option in
-  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)    ac_optarg=yes ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
  esac
  # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1017,7 +1026,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
@@ -1043,7 +1052,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
@@ -1247,7 +1256,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
@@ -1263,7 +1272,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
@@ -1293,8 +1302,8 @@ do
  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
    x_libraries=$ac_optarg ;;
-  -*) as_fn_error "unrecognized option: \`$ac_option'
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+Try \`$0 --help' for more information"
    ;;
  *=*)
@@ -1302,7 +1311,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 ;;
@@ -1320,13 +1329,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
@@ -1349,7 +1358,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'
@@ -1363,8 +1372,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
  if test "x$build_alias" = x; then
    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    If a cross compiler is detected then cross compile mode will be used" >&2
  elif test "x$build_alias" != "x$host_alias"; then
    cross_compiling=yes
  fi
@@ -1379,9 +1388,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.
@@ -1420,11 +1429,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
@@ -1450,7 +1459,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 embryo 1.1.99.67344 to adapt to many kinds of systems.
+\`configure' configures embryo 1.2.0-alpha to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1464,7 +1473,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
@@ -1520,7 +1529,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of embryo 1.1.99.67344:";;
+     short | recursive ) echo "Configuration of embryo 1.2.0-alpha:";;
   esac
  cat <<\_ACEOF
@@ -1558,10 +1567,17 @@ 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
  EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config
  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
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1629,10 +1645,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-embryo configure 1.1.99.67344
+embryo configure 1.2.0-alpha
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.67
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1736,7 +1752,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
@@ -1779,7 +1795,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 :
@@ -1845,7 +1861,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
@@ -1912,10 +1928,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
@@ -1951,7 +1967,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; }
@@ -1974,17 +1990,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"
@@ -2000,8 +2014,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 embryo $as_me 1.1.99.67344, which was
+It was created by embryo $as_me 1.2.0-alpha, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
  $ $0 $@
@@ -2111,11 +2125,9 @@ trap 'exit_status=$?
  {
    echo
-    cat <<\_ASBOX
+    $as_echo "## ---------------- ##
-## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
+## ---------------- ##"
-_ASBOX
    echo
    # The following way of writing the cache mishandles newlines in values,
 (
@@ -2149,11 +2161,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
@@ -2166,11 +2176,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
@@ -2184,11 +2192,9 @@ _ASBOX
    fi
    if test -s confdefs.h; then
-      cat <<\_ASBOX
+      $as_echo "## ----------- ##
-## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
+## ----------- ##"
-_ASBOX
      echo
      cat confdefs.h
      echo
@@ -2243,7 +2249,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
@@ -2258,7 +2269,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
@@ -2334,7 +2349,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. ##
@@ -2360,16 +2375,22 @@ am__api_version='1.11'
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
+  if test -f "$ac_dir/install-sh"; then
-    if test -f "$ac_dir/$ac_t"; then
+    ac_aux_dir=$ac_dir
-      ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+    break
-      break 2
+  elif test -f "$ac_dir/install.sh"; then
-    fi
+    ac_aux_dir=$ac_dir
-  done
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 # These three variables are undocumented and unsupported,
@@ -2485,11 +2506,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
@@ -2511,7 +2532,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
@@ -2521,7 +2542,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
@@ -2759,7 +2780,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
@@ -2767,7 +2788,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;;
@@ -2801,7 +2822,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
@@ -2817,7 +2838,7 @@ fi
 # Define the identity of the package.
 PACKAGE='embryo'
- VERSION='1.1.99.67344'
+ VERSION='1.2.0-alpha'
 cat >>confdefs.h <<_ACEOF
@@ -2872,7 +2893,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; }
@@ -2883,16 +2904,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='-'
@@ -2917,7 +2938,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
@@ -2925,7 +2946,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='-'
@@ -3631,8 +3652,8 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3746,9 +3767,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "C compiler cannot create executables
-as_fn_error "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3790,8 +3810,8 @@ done
 else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3848,9 +3868,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
@@ -3901,8 +3921,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
+as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4306,7 +4326,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
@@ -4382,7 +4402,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
@@ -4448,7 +4468,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
@@ -4515,7 +4535,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
@@ -4631,7 +4651,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 :
@@ -4833,13 +4853,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:4836: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4856: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:4839: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4859: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:4842: output\"" >&5)
+  (eval echo "\"\$as_me:4862: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -6042,7 +6062,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 6045 "configure"' > conftest.$ac_ext
+  echo '#line 6065 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -6831,7 +6851,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.
@@ -6847,11 +6867,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
@@ -6890,7 +6910,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.
@@ -6906,18 +6926,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 ac_ext=c
@@ -7046,8 +7066,7 @@ do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7570,11 +7589,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:7573: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7592: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7577: \$? = $ac_status" >&5
+   echo "$as_me:7596: \$? = $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.
@@ -7909,11 +7928,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:7912: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7931: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7916: \$? = $ac_status" >&5
+   echo "$as_me:7935: \$? = $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.
@@ -8014,11 +8033,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:8017: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8036: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:8021: \$? = $ac_status" >&5
+   echo "$as_me:8040: \$? = $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
@@ -8069,11 +8088,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:8072: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8091: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:8076: \$? = $ac_status" >&5
+   echo "$as_me:8095: \$? = $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
@@ -10453,7 +10472,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10456 "configure"
+#line 10475 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -10549,7 +10568,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10552 "configure"
+#line 10571 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -10788,20 +10807,20 @@ _ACEOF
 cat >>confdefs.h <<_ACEOF
-#define VMIN 1
+#define VMIN 2
 _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="2:99:1"
+version_info="3:0:2"
 release_info=""
@@ -11167,8 +11186,8 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -11699,6 +11718,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.
@@ -11811,7 +11834,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
                PKG_CONFIG=""
        fi
 fi
 # Check whether pkg-config supports Requires.private
@@ -11835,11 +11857,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5
 $as_echo_n "checking for EVIL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EVIL_CFLAGS"; then
-    if test -n "$EVIL_CFLAGS"; then
+    pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
-        pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
  ac_status=$?
@@ -11849,15 +11870,13 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$EVIL_LIBS"; then
-    if test -n "$EVIL_LIBS"; then
+    pkg_cv_EVIL_LIBS="$EVIL_LIBS"
-        pkg_cv_EVIL_LIBS="$EVIL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
  ac_status=$?
@@ -11867,14 +11886,15 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -11882,14 +11902,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
@@ -11898,12 +11918,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EVIL_CFLAGS
 and EVIL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+See the pkg-config man page for more details." "$LINENO" 5
-" "$LINENO" 5
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -11912,13 +11933,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
@@ -11935,46 +11956,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EINA" >&5
 $as_echo_n "checking for EINA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EINA_CFLAGS"; then
-    if test -n "$EINA_CFLAGS"; then
+    pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
-        pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.2.0" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$EINA_LIBS"; then
-    if test -n "$EINA_LIBS"; then
+    pkg_cv_EINA_LIBS="$EINA_LIBS"
-        pkg_cv_EINA_LIBS="$EINA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
-    else
+    if test -n "$PKG_CONFIG" && \
-        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.2.0" 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -11982,14 +12001,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
@@ -11998,12 +12017,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EINA_CFLAGS
 and EINA_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+See the pkg-config man page for more details." "$LINENO" 5
-" "$LINENO" 5
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -12012,13 +12032,93 @@ 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
+### 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_embryo="exotic ${requirement_embryo}"
+$as_echo "#define HAVE_EXOTIC 1" >>confdefs.h
 fi
 ### Checks for header files
@@ -12315,8 +12415,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
     ;; #(
   *)
-     as_fn_error "unknown endianness
+     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
 esac
 if test "x$CC" != xcc; then
@@ -12328,7 +12428,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
@@ -13236,8 +13336,7 @@ if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -13337,7 +13436,7 @@ return fnmatch ();
  return 0;
 }
 _ACEOF
-for ac_lib in '' fnmatch evil iberty; do
+for ac_lib in '' fnmatch evil exotic iberty; do
  if test -z "$ac_lib"; then
    ac_res="none required"
  else
@@ -13384,31 +13483,83 @@ 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
-case "$host_os" in
+# gettimeofday
-   mingw*)
-$as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
-      ;;
+_efl_have_gettimeofday="no"
-   *)
-      for ac_func in gettimeofday
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-do :
+/* end confdefs.h.  */
-  ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = x""yes; then :
+#include <stdlib.h>
-  cat >>confdefs.h <<_ACEOF
+#include <sys/time.h>
-#define HAVE_GETTIMEOFDAY 1
+int
+main ()
+{
+int res;
+res = gettimeofday(NULL, NULL);
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  _efl_have_gettimeofday="yes"
+else
+  _efl_have_gettimeofday="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test "x${_efl_have_gettimeofday}" = "xno" -a "x${enable_exotic}" = "xyes"; then
+   SAVE_LIBS="${LIBS}"
+   SAVE_CFLAGS="${CFLAGS}"
+   LIBS="${LIBS} ${EXOTIC_LIBS}"
+   CFLAGS="${CFLAGS} ${EXOTIC_CFLAGS}"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <Exotic.h>
+int
+main ()
+{
+int res;
+res = gettimeofday(NULL, NULL);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  _efl_have_gettimeofday="yes"
+else
+  _efl_have_gettimeofday="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+if test "x${_efl_have_gettimeofday}" = "xyes"; then
+$as_echo "#define EFL_HAVE_GETTIMEOFDAY 1" >>confdefs.h
+fi
+if test "x${_efl_have_gettimeofday}" = "xyes"; then :
+else
+  as_fn_error $? "Cannot find gettimeofday()" "$LINENO" 5
 fi
-done
-      ;;
-esac
@@ -13499,6 +13650,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$//'
@@ -13522,23 +13674,23 @@ 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 "${BUILD_EMBRYO_CC_TRUE}" && test -z "${BUILD_EMBRYO_CC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EMBRYO_CC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EMBRYO_CC\" 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
@@ -13689,19 +13841,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ---------------------------------
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
+  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
+  if test "$4"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
  as_fn_exit $as_status
 } # as_fn_error
@@ -13897,7 +14049,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
@@ -13950,8 +14102,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 embryo $as_me 1.1.99.67344, which was
+This file was extended by embryo $as_me 1.2.0-alpha, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
  CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14016,11 +14168,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="\\
-embryo config.status 1.1.99.67344
+embryo config.status 1.2.0-alpha
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.67,
  with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
@@ -14038,11 +14190,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
@@ -14064,6 +14221,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;;
@@ -14076,7 +14234,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 ;;
@@ -14085,7 +14243,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"
@@ -14409,7 +14567,7 @@ do
    "src/bin/Makefile") CONFIG_FILES="$CONFIG_FILES src/bin/Makefile" ;;
    "embryo.spec") CONFIG_FILES="$CONFIG_FILES embryo.spec" ;;
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
  esac
 done
@@ -14447,7 +14605,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.
@@ -14464,7 +14622,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
@@ -14478,18 +14636,18 @@ _ACEOF
  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
  echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
  if test $ac_delim_n = $ac_delim_num; then
    break
  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  else
    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
  fi
@@ -14578,20 +14736,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
  cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[  ]*VPATH[        ]*=/{
+  ac_vpsub='/^[  ]*VPATH[        ]*=[    ]*/{
-s/:*\$(srcdir):*/:/
+h
-s/:*\${srcdir}:*/:/
+s///
-s/:*@srcdir@:*/:/
+s/^/:/
-s/^\([^=]*=[     ]*\):*/\1/
+s/[      ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[   ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[       ]*$//
 }'
 fi
@@ -14619,7 +14785,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
@@ -14704,7 +14870,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"
@@ -14717,7 +14883,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
@@ -14745,7 +14911,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'"
@@ -14772,7 +14938,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
@@ -14909,22 +15075,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)
  #
@@ -14935,19 +15101,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"
@@ -15738,7 +15904,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.
@@ -15759,7 +15925,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/embryo/configure.ac b/libraries/embryo/configure.ac
index 61c50b8..09bd04e 100644
--- a/libraries/embryo/configure.ac
+++ b/libraries/embryo/configure.ac
@@ -1,12 +1,12 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
-m4_define([v_min], [1])
+m4_define([v_min], [2])
-m4_define([v_mic], [99])
+m4_define([v_mic], [0])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
-dnl m4_undefine([v_rev])
+m4_undefine([v_rev])
 ##--   When doing snapshots - change soname. remove dnl on below line
 dnl m4_define([relname], [ver-pre-svn-07])
 dnl m4_define([v_rel], [-release ver-pre-svn-07])
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-AC_INIT([embryo], [v_ver], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([embryo], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -107,7 +107,20 @@ esac
 AC_SUBST(EFL_EMBRYO_BUILD)
 # For embryo_cc_prefix.c
-PKG_CHECK_MODULES([EINA], [eina >= 1.1.0])
+PKG_CHECK_MODULES([EINA], [eina >= 1.2.0])
+### Checks for portability layer
+PKG_CHECK_MODULES([EXOTIC],
+   [exotic],
+   [enable_exotic="yes"],
+   [enable_exotic="no"])
+if test "x${enable_exotic}" = "xyes"; then
+    requirement_embryo="exotic ${requirement_embryo}"
+    AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.])
+fi
 ### Checks for header files
@@ -162,14 +175,8 @@ AC_FUNC_ALLOCA
 # fnmatch
 EFL_CHECK_FNMATCH([], [AC_MSG_ERROR([Cannot find fnmatch()])])
-case "$host_os" in
+# gettimeofday
-   mingw*)
+EFL_CHECK_GETTIMEOFDAY([], [AC_MSG_ERROR([Cannot find gettimeofday()])])
-      AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defined to 1 (MinGW platform)])
-      ;;
-   *)
-      AC_CHECK_FUNCS(gettimeofday)
-      ;;
-esac
 AC_SUBST(requirement_embryo)
diff --git a/libraries/embryo/doc/Makefile.in b/libraries/embryo/doc/Makefile.in
index 102cd2f..744e789 100644
--- a/libraries/embryo/doc/Makefile.in
+++ b/libraries/embryo/doc/Makefile.in
@@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
        $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \
        $(top_srcdir)/m4/efl_fnmatch.m4 \
+        $(top_srcdir)/m4/efl_gettimeofday.m4 \
        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -94,6 +95,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -126,6 +129,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/embryo/doc/img/e.png b/libraries/embryo/doc/img/e.png
index b3884a5..b3884a5 100755..100644
--- a/libraries/embryo/doc/img/e.png
+++ b/libraries/embryo/doc/img/e.png
Binary files differ
diff --git a/libraries/embryo/doc/img/e_big.png b/libraries/embryo/doc/img/e_big.png
index d42aeb4..d42aeb4 100755..100644
--- a/libraries/embryo/doc/img/e_big.png
+++ b/libraries/embryo/doc/img/e_big.png
Binary files differ
diff --git a/libraries/embryo/doc/img/edoxy.css b/libraries/embryo/doc/img/edoxy.css
index 616a0c5..616a0c5 100755..100644
--- a/libraries/embryo/doc/img/edoxy.css
+++ b/libraries/embryo/doc/img/edoxy.css
diff --git a/libraries/embryo/doc/img/foot_bg.png b/libraries/embryo/doc/img/foot_bg.png
index b24f3a4..b24f3a4 100755..100644
--- a/libraries/embryo/doc/img/foot_bg.png
+++ b/libraries/embryo/doc/img/foot_bg.png
Binary files differ
diff --git a/libraries/embryo/doc/img/head_bg.png b/libraries/embryo/doc/img/head_bg.png
index 081dc13..081dc13 100755..100644
--- a/libraries/embryo/doc/img/head_bg.png
+++ b/libraries/embryo/doc/img/head_bg.png
Binary files differ
diff --git a/libraries/embryo/doc/img/menu_bg.png b/libraries/embryo/doc/img/menu_bg.png
index e978743..e978743 100755..100644
--- a/libraries/embryo/doc/img/menu_bg.png
+++ b/libraries/embryo/doc/img/menu_bg.png
Binary files differ
diff --git a/libraries/embryo/doc/img/menu_bg_current.png b/libraries/embryo/doc/img/menu_bg_current.png
index de97c92..de97c92 100755..100644
--- a/libraries/embryo/doc/img/menu_bg_current.png
+++ b/libraries/embryo/doc/img/menu_bg_current.png
Binary files differ
diff --git a/libraries/embryo/doc/img/menu_bg_hover.png b/libraries/embryo/doc/img/menu_bg_hover.png
index 3fd851d..3fd851d 100755..100644
--- a/libraries/embryo/doc/img/menu_bg_hover.png
+++ b/libraries/embryo/doc/img/menu_bg_hover.png
Binary files differ
diff --git a/libraries/embryo/doc/img/menu_bg_last.png b/libraries/embryo/doc/img/menu_bg_last.png
index 88c116c..88c116c 100755..100644
--- a/libraries/embryo/doc/img/menu_bg_last.png
+++ b/libraries/embryo/doc/img/menu_bg_last.png
Binary files differ
diff --git a/libraries/embryo/doc/img/menu_bg_unsel.png b/libraries/embryo/doc/img/menu_bg_unsel.png
index 50e5fd8..50e5fd8 100755..100644
--- a/libraries/embryo/doc/img/menu_bg_unsel.png
+++ b/libraries/embryo/doc/img/menu_bg_unsel.png
Binary files differ
diff --git a/libraries/embryo/embryo.spec b/libraries/embryo/embryo.spec
index 834f792..73de4de 100644
--- a/libraries/embryo/embryo.spec
+++ b/libraries/embryo/embryo.spec
@@ -4,7 +4,7 @@
 Summary: A small virtual machine engine (in a library) and bytecode compiler
 Name: embryo
-Version: 1.1.99.67344
+Version: 1.2.0-alpha
 Release: %{_rel}
 License: BSD
 Group: System Environment/Libraries
diff --git a/libraries/embryo/include/Makefile.in b/libraries/embryo/include/Makefile.in
index 0a96acd..f462b6c 100644
--- a/libraries/embryo/include/Makefile.in
+++ b/libraries/embryo/include/Makefile.in
@@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
        $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \
        $(top_srcdir)/m4/efl_fnmatch.m4 \
+        $(top_srcdir)/m4/efl_gettimeofday.m4 \
        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -117,6 +118,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -149,6 +152,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/embryo/ltmain.sh b/libraries/embryo/ltmain.sh
index 7ed280b..fa4b1e1 100755
--- a/libraries/embryo/ltmain.sh
+++ b/libraries/embryo/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/embryo/m4/efl_fnmatch.m4 b/libraries/embryo/m4/efl_fnmatch.m4
index a92ac6b..c857046 100644
--- a/libraries/embryo/m4/efl_fnmatch.m4
+++ b/libraries/embryo/m4/efl_fnmatch.m4
@@ -13,7 +13,7 @@ AC_CHECK_HEADER([fnmatch.h], [_efl_have_fnmatch="yes"], [_efl_have_fnmatch="no"]
 if test "x${_efl_have_fnmatch}" = "xyes" ; then
   AC_SEARCH_LIBS([fnmatch],
-      [fnmatch evil iberty],
+      [fnmatch evil exotic iberty],
      [_efl_have_fnmatch="yes"],
      [_efl_have_fnmatch="no"])
 fi
diff --git a/libraries/embryo/src/Makefile.in b/libraries/embryo/src/Makefile.in
index ff3d123..e060803 100644
--- a/libraries/embryo/src/Makefile.in
+++ b/libraries/embryo/src/Makefile.in
@@ -39,6 +39,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
        $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \
        $(top_srcdir)/m4/efl_fnmatch.m4 \
+        $(top_srcdir)/m4/efl_gettimeofday.m4 \
        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -133,6 +134,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -165,6 +168,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/embryo/src/bin/Makefile.in b/libraries/embryo/src/bin/Makefile.in
index a6551be..4eaa4b2 100644
--- a/libraries/embryo/src/bin/Makefile.in
+++ b/libraries/embryo/src/bin/Makefile.in
@@ -41,6 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
        $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \
        $(top_srcdir)/m4/efl_fnmatch.m4 \
+        $(top_srcdir)/m4/efl_gettimeofday.m4 \
        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -138,6 +139,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -170,6 +173,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/embryo/src/bin/embryo_cc_sc5.scp b/libraries/embryo/src/bin/embryo_cc_sc5.scp
index 8005f79..af3f352 100644
--- a/libraries/embryo/src/bin/embryo_cc_sc5.scp
+++ b/libraries/embryo/src/bin/embryo_cc_sc5.scp
@@ -18,7 +18,7 @@
 *      misrepresented as being the original software.
 *  3.  This notice may not be removed or altered from any source distribution.
 *
- *  Version: $Id: embryo_cc_sc5.scp 14177 2005-04-13 19:37:01Z tsauerbeck $
+ *  Version: $Id: embryo_cc_sc5.scp 35497 2008-08-17 07:44:18Z raster $
 */
 int         strexpand(char *dest, unsigned char *source, int maxlen,
diff --git a/libraries/embryo/src/bin/embryo_cc_sc7.scp b/libraries/embryo/src/bin/embryo_cc_sc7.scp
index 83d49a1..15c80ac 100644
--- a/libraries/embryo/src/bin/embryo_cc_sc7.scp
+++ b/libraries/embryo/src/bin/embryo_cc_sc7.scp
@@ -19,7 +19,7 @@
 *      misrepresented as being the original software.
 *  3.  This notice may not be removed or altered from any source distribution.
 *
- *  Version: $Id: embryo_cc_sc7.scp 14177 2005-04-13 19:37:01Z tsauerbeck $
+ *  Version: $Id: embryo_cc_sc7.scp 35497 2008-08-17 07:44:18Z raster $
 */
 int         strexpand(char *dest, unsigned char *source, int maxlen,
diff --git a/libraries/embryo/src/lib/Embryo.h b/libraries/embryo/src/lib/Embryo.h
index 74c872b..4003f6b 100644
--- a/libraries/embryo/src/lib/Embryo.h
+++ b/libraries/embryo/src/lib/Embryo.h
@@ -10,7 +10,7 @@ These routines are used for Embryo.
 @version 1.0.0
 @author Carsten Haitzler <raster\@rasterman.com>
 @author Compuphase http://www.compuphase.com
-@date 2004-2011
+@date 2004-2012
 @section intro What is Embryo?
diff --git a/libraries/embryo/src/lib/Makefile.am b/libraries/embryo/src/lib/Makefile.am
index f5c78aa..d2ccb55 100644
--- a/libraries/embryo/src/lib/Makefile.am
+++ b/libraries/embryo/src/lib/Makefile.am
@@ -11,6 +11,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EVIL_CFLAGS@ \
+@EXOTIC_CFLAGS@ \
 @EMBRYO_CPPFLAGS@ \
 @EFL_EMBRYO_BUILD@
@@ -29,7 +30,7 @@ embryo_str.c \
 embryo_time.c
 libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
-libembryo_la_LIBADD = @EVIL_LIBS@ -lm
+libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm
 libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 EXTRA_DIST = embryo_private.h
diff --git a/libraries/embryo/src/lib/Makefile.in b/libraries/embryo/src/lib/Makefile.in
index 3fb5591..c46a03e 100644
--- a/libraries/embryo/src/lib/Makefile.in
+++ b/libraries/embryo/src/lib/Makefile.in
@@ -42,6 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \
        $(top_srcdir)/m4/efl_binary.m4 $(top_srcdir)/m4/efl_doxygen.m4 \
        $(top_srcdir)/m4/efl_fnmatch.m4 \
+        $(top_srcdir)/m4/efl_gettimeofday.m4 \
        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -154,6 +155,8 @@ EMBRYO_CPPFLAGS = @EMBRYO_CPPFLAGS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -186,6 +189,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@
@@ -264,6 +269,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EVIL_CFLAGS@ \
+@EXOTIC_CFLAGS@ \
 @EMBRYO_CPPFLAGS@ \
 @EFL_EMBRYO_BUILD@
@@ -280,7 +286,7 @@ embryo_str.c \
 embryo_time.c
 libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
-libembryo_la_LIBADD = @EVIL_LIBS@ -lm
+libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm
 libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 EXTRA_DIST = embryo_private.h
 all: all-am
diff --git a/libraries/embryo/src/lib/embryo_amx.c b/libraries/embryo/src/lib/embryo_amx.c
index 4fa84c5..7a41111 100644
--- a/libraries/embryo/src/lib/embryo_amx.c
+++ b/libraries/embryo/src/lib/embryo_amx.c
@@ -29,6 +29,10 @@
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_EXOTIC
+# include <Exotic.h>
+#endif
 #include "Embryo.h"
 #include "embryo_private.h"
diff --git a/libraries/embryo/src/lib/embryo_str.c b/libraries/embryo/src/lib/embryo_str.c
index 46a3284..0c2faa2 100644
--- a/libraries/embryo/src/lib/embryo_str.c
+++ b/libraries/embryo/src/lib/embryo_str.c
@@ -2,28 +2,41 @@
 # include "config.h"
 #endif
-#include <stdlib.h>
+#ifdef STDC_HEADERS
-#include <stdio.h>
+# include <stdlib.h>
-#include <string.h>
+# include <stddef.h>
-#include <fnmatch.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
-#elif defined __GNUC__
+#elif !defined alloca
-# define alloca __builtin_alloca
+# ifdef __GNUC__
-#elif defined _AIX
+#  define alloca __builtin_alloca
-# define alloca __alloca
+# elif defined _AIX
-#elif defined _MSC_VER
+#  define alloca __alloca
-# include <malloc.h>
+# elif defined _MSC_VER
-# define alloca _alloca
+#  include <malloc.h>
-#else
+#  define alloca _alloca
-# include <stddef.h>
+# elif !defined HAVE_ALLOCA
-# ifdef  __cplusplus
+#  ifdef  __cplusplus
 extern "C"
-# endif
+#  endif
 void *alloca (size_t);
+# endif
+#endif
+#ifdef HAVE_EXOTIC
+# include <Exotic.h>
 #endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fnmatch.h>
 #include "Embryo.h"
 #include "embryo_private.h"
diff --git a/libraries/embryo/src/lib/embryo_time.c b/libraries/embryo/src/lib/embryo_time.c
index 8392ec3..90c14cf 100644
--- a/libraries/embryo/src/lib/embryo_time.c
+++ b/libraries/embryo/src/lib/embryo_time.c
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
-#ifndef HAVE_GETTIMEOFDAY
+#ifndef EFL_HAVE_GETTIMEOFDAY
 # error "Your platform isn't supported yet"
 #endif
@@ -17,6 +17,10 @@
 # include <Evil.h>
 #endif
+#ifdef HAVE_EXOTIC
+# include <Exotic.h>
+#endif
 #include "Embryo.h"
 #include "embryo_private.h"