1 files changed, 1012 insertions, 1016 deletions
diff --git a/libraries/edje/configure b/libraries/edje/configure
index c763308..aafa1b0 100755
--- a/libraries/edje/configure
+++ b/libraries/edje/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for edje 1.1.99.67344.
+# Generated by GNU Autoconf 2.67 for edje 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='edje'
 PACKAGE_TARNAME='edje'
-PACKAGE_VERSION='1.1.99.67344'
+PACKAGE_VERSION='1.2.0-alpha'
-PACKAGE_STRING='edje 1.1.99.67344'
+PACKAGE_STRING='edje 1.2.0-alpha'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
@@ -750,7 +750,6 @@ LIBOBJS
 requirement_edje
 BUILD_EXAMPLES_FALSE
 BUILD_EXAMPLES_TRUE
-edje_cc
 EFL_ENABLE_COVERAGE_FALSE
 EFL_ENABLE_COVERAGE_TRUE
 EFL_COVERAGE_LIBS
@@ -806,6 +805,8 @@ EFL_EDJE_BUILD
 EVIL_LIBS
 EVIL_CFLAGS
 pkgconfig_requires_private
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 HAVE_PYTHON_FALSE
 HAVE_PYTHON_TRUE
@@ -847,6 +848,7 @@ EDJE_DECC_PRG
 BUILD_EDJE_CC_FALSE
 BUILD_EDJE_CC_TRUE
 EDJE_CC_PRG
+edje_cc
 EDJE_AMALGAMATION_FALSE
 EDJE_AMALGAMATION_TRUE
 MODULE_ARCH
@@ -974,6 +976,7 @@ enable_dependency_tracking
 with_gnu_ld
 enable_libtool_lock
 enable_amalgamation
+with_edje_cc
 enable_edje_cc
 enable_edje_decc
 enable_edje_recc
@@ -1005,6 +1008,8 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 EVIL_CFLAGS
 EVIL_LIBS
 LUA_CFLAGS
@@ -1099,8 +1104,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.
@@ -1145,7 +1151,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
@@ -1171,7 +1177,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
@@ -1375,7 +1381,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
@@ -1391,7 +1397,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
@@ -1421,8 +1427,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"
    ;;
  *=*)
@@ -1430,7 +1436,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 ;;
@@ -1448,13 +1454,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
@@ -1477,7 +1483,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'
@@ -1491,8 +1497,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
@@ -1507,9 +1513,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.
@@ -1548,11 +1554,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
@@ -1578,7 +1584,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 edje 1.1.99.67344 to adapt to many kinds of systems.
+\`configure' configures edje 1.2.0-alpha to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1592,7 +1598,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
@@ -1648,7 +1654,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of edje 1.1.99.67344:";;
+     short | recursive ) echo "Configuration of edje 1.2.0-alpha:";;
   esac
  cat <<\_ACEOF
@@ -1705,6 +1711,7 @@ Optional Packages:
  --with-pic              try to use only PIC/non-PIC objects [default=use
                          both]
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-edje-cc=PATH     specify a specific path to edje_cc [default=edje_cc]
  --with-vim=DIR          Location of Vim data files [[autodetect]]
  --with-doxygen=FILE     doxygen program to use [default=doxygen]
@@ -1718,6 +1725,10 @@ Some influential environment variables:
              you have headers in a nonstandard directory <include dir>
  CPP         C preprocessor
  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
  EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config
  EVIL_LIBS   linker flags for EVIL, overriding pkg-config
  LUA_CFLAGS  C compiler flags for LUA, overriding pkg-config
@@ -1838,10 +1849,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-edje configure 1.1.99.67344
+edje 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
@@ -1945,7 +1956,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
@@ -1988,7 +1999,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 :
@@ -2054,7 +2065,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
@@ -2121,10 +2132,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
@@ -2160,7 +2171,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; }
@@ -2183,17 +2194,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"
@@ -2209,8 +2218,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 edje $as_me 1.1.99.67344, which was
+It was created by edje $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 $@
@@ -2320,11 +2329,9 @@ trap 'exit_status=$?
  {
    echo
-    cat <<\_ASBOX
+    $as_echo "## ---------------- ##
-## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
+## ---------------- ##"
-_ASBOX
    echo
    # The following way of writing the cache mishandles newlines in values,
 (
@@ -2358,11 +2365,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
@@ -2375,11 +2380,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
@@ -2393,11 +2396,9 @@ _ASBOX
    fi
    if test -s confdefs.h; then
-      cat <<\_ASBOX
+      $as_echo "## ----------- ##
-## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
+## ----------- ##"
-_ASBOX
      echo
      cat confdefs.h
      echo
@@ -2452,7 +2453,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
@@ -2467,7 +2473,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
@@ -2543,7 +2553,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. ##
@@ -2569,16 +2579,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,
@@ -2694,11 +2710,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
@@ -2720,7 +2736,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
@@ -2730,7 +2746,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
@@ -2968,7 +2984,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
@@ -2976,7 +2992,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;;
@@ -3010,7 +3026,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
@@ -3026,7 +3042,7 @@ fi
 # Define the identity of the package.
 PACKAGE='edje'
- VERSION='1.1.99.67344'
+ VERSION='1.2.0-alpha'
 cat >>confdefs.h <<_ACEOF
@@ -3081,7 +3097,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; }
@@ -3092,16 +3108,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='-'
@@ -3126,7 +3142,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
@@ -3134,7 +3150,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='-'
@@ -3840,8 +3856,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
@@ -3955,9 +3971,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; }
@@ -3999,8 +4014,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
@@ -4057,9 +4072,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
@@ -4110,8 +4125,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
@@ -4515,7 +4530,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
@@ -4591,7 +4606,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
@@ -4657,7 +4672,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
@@ -4724,7 +4739,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
@@ -4840,7 +4855,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 :
@@ -5042,13 +5057,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:5045: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5060: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:5048: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5063: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:5051: output\"" >&5)
+  (eval echo "\"\$as_me:5066: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -6251,7 +6266,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 6254 "configure"' > conftest.$ac_ext
+  echo '#line 6269 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -7040,7 +7055,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.
@@ -7056,11 +7071,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
@@ -7099,7 +7114,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.
@@ -7115,18 +7130,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
@@ -7255,8 +7270,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
@@ -7779,11 +7793,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:7782: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7796: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7786: \$? = $ac_status" >&5
+   echo "$as_me:7800: \$? = $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.
@@ -8118,11 +8132,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:8121: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8135: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:8125: \$? = $ac_status" >&5
+   echo "$as_me:8139: \$? = $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.
@@ -8223,11 +8237,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:8226: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8240: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:8230: \$? = $ac_status" >&5
+   echo "$as_me:8244: \$? = $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
@@ -8278,11 +8292,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:8281: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8295: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:8285: \$? = $ac_status" >&5
+   echo "$as_me:8299: \$? = $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
@@ -10662,7 +10676,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10665 "configure"
+#line 10679 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -10758,7 +10772,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 10761 "configure"
+#line 10775 "configure"
 #include "confdefs.h"
 #if HAVE_DLFCN_H
@@ -10997,20 +11011,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=""
@@ -11079,6 +11093,29 @@ fi
+# Check whether --with-edje-cc was given.
+if test "${with_edje_cc+set}" = set; then :
+  withval=$with_edje_cc; _efl_with_binary=${withval}
+else
+  _efl_with_binary=$(pkg-config --variable=prefix edje)/bin/edje_cc
+fi
+edje_cc=${_efl_with_binary}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: edje_cc set to ${_efl_with_binary}" >&5
+$as_echo "$as_me: edje_cc set to ${_efl_with_binary}" >&6;}
+with_binary_edje_cc=${_efl_with_binary}
 have_edje_cc="yes"
@@ -11748,8 +11785,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
@@ -12303,7 +12340,7 @@ sys.exit(sys.hexversion < minverhex)"
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "too old" "$LINENO" 5
+  as_fn_error $? "too old" "$LINENO" 5
 fi
      am_display_PYTHON=$PYTHON
    else
@@ -12315,7 +12352,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
-        for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+        for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
          test "$am_cv_pathless_PYTHON" = none && break
          prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -12517,6 +12554,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.
@@ -12629,7 +12670,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
                PKG_CONFIG=""
        fi
 fi
 # Check whether pkg-config supports Requires.private
@@ -12654,11 +12694,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=$?
@@ -12668,15 +12707,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=$?
@@ -12686,14 +12723,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
@@ -12701,14 +12739,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
@@ -12717,12 +12755,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.
@@ -12731,13 +12770,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
@@ -12759,11 +12798,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5
  ac_status=$?
@@ -12773,15 +12811,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5
  ac_status=$?
@@ -12791,14 +12827,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
@@ -12806,25 +12843,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -12834,15 +12868,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -12852,14 +12884,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
@@ -12867,25 +12900,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -12895,15 +12925,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -12913,14 +12941,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
@@ -12928,25 +12957,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -12956,15 +12982,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -12974,14 +12998,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
@@ -12989,17 +13014,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13009,16 +13034,17 @@ $as_echo "yes" >&6; }
        requirement_lua="lua51"
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13028,15 +13054,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13046,14 +13070,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
@@ -13061,17 +13086,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13088,16 +13113,17 @@ $as_echo "yes" >&6; }
        requirement_lua="lua-5.1"
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13107,15 +13133,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13125,14 +13149,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
@@ -13140,25 +13165,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13168,15 +13190,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13186,14 +13206,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
@@ -13201,17 +13222,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13221,16 +13242,17 @@ $as_echo "yes" >&6; }
        requirement_lua="lua51"
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13240,15 +13262,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13258,14 +13278,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
@@ -13273,17 +13294,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13307,16 +13328,17 @@ $as_echo "yes" >&6; }
        requirement_lua="lua5.1"
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13326,15 +13348,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13344,14 +13364,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
@@ -13359,25 +13380,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13387,15 +13405,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13405,14 +13421,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
@@ -13420,25 +13437,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13448,15 +13462,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13466,14 +13478,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
@@ -13481,17 +13494,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13501,16 +13514,17 @@ $as_echo "yes" >&6; }
        requirement_lua="lua51"
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13520,15 +13534,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13538,14 +13550,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
@@ -13553,17 +13566,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13580,16 +13593,17 @@ $as_echo "yes" >&6; }
        requirement_lua="lua-5.1"
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13599,15 +13613,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua-5.1 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13617,14 +13629,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
@@ -13632,25 +13645,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13660,15 +13670,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13678,14 +13686,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
@@ -13693,17 +13702,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13713,16 +13722,17 @@ $as_echo "yes" >&6; }
        requirement_lua="lua51"
 fi
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
 $as_echo_n "checking for LUA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$LUA_CFLAGS"; then
-    if test -n "$LUA_CFLAGS"; then
+    pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
-        pkg_cv_LUA_CFLAGS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13732,15 +13742,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 "$LUA_LIBS"; then
-    if test -n "$LUA_LIBS"; then
+    pkg_cv_LUA_LIBS="$LUA_LIBS"
-        pkg_cv_LUA_LIBS="$LUA_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 \"lua51 >= 5.1.0\""; } >&5
  ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
  ac_status=$?
@@ -13750,14 +13758,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
@@ -13765,17 +13774,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
        else
-                LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
+                LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$LUA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_lua="no"
-$as_echo "no" >&6; }
-                have_lua="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_lua="no"
 else
        LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13860,7 +13869,7 @@ fi
 if test "x${have_lua}" = "xno" ; then
-   as_fn_error "Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly" "$LINENO" 5
+   as_fn_error $? "Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly" "$LINENO" 5
 fi
@@ -13868,64 +13877,62 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIMAL" >&5
 $as_echo_n "checking for MINIMAL... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$MINIMAL_CFLAGS"; then
-    if test -n "$MINIMAL_CFLAGS"; then
+    pkg_cv_MINIMAL_CFLAGS="$MINIMAL_CFLAGS"
-        pkg_cv_MINIMAL_CFLAGS="$MINIMAL_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.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
   \""; } >&5
  ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
   ") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_MINIMAL_CFLAGS=`$PKG_CONFIG --cflags "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.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 "$MINIMAL_LIBS"; then
-    if test -n "$MINIMAL_LIBS"; then
+    pkg_cv_MINIMAL_LIBS="$MINIMAL_LIBS"
-        pkg_cv_MINIMAL_LIBS="$MINIMAL_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.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
   \""; } >&5
  ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
   ") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_MINIMAL_LIBS=`$PKG_CONFIG --libs "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.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
@@ -13933,22 +13940,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+                MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-   "`
+   " 2>&1`
        else
-                MINIMAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+                MINIMAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-   "`
+   " 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$MINIMAL_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (
+        as_fn_error $? "Package requirements (
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
   ) were not met:
 $MINIMAL_PKG_ERRORS
@@ -13958,12 +13965,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables MINIMAL_CFLAGS
 and MINIMAL_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.
@@ -13972,13 +13980,13 @@ and MINIMAL_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
        MINIMAL_CFLAGS=$pkg_cv_MINIMAL_CFLAGS
        MINIMAL_LIBS=$pkg_cv_MINIMAL_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
@@ -13986,94 +13994,92 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE" >&5
 $as_echo_n "checking for EDJE... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EDJE_CFLAGS"; then
-    if test -n "$EDJE_CFLAGS"; then
+    pkg_cv_EDJE_CFLAGS="$EDJE_CFLAGS"
-        pkg_cv_EDJE_CFLAGS="$EDJE_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.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 1.2.0
   \""; } >&5
  ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 1.2.0
   ") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_EDJE_CFLAGS=`$PKG_CONFIG --cflags "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 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 "$EDJE_LIBS"; then
-    if test -n "$EDJE_LIBS"; then
+    pkg_cv_EDJE_LIBS="$EDJE_LIBS"
-        pkg_cv_EDJE_LIBS="$EDJE_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.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 1.2.0
   \""; } >&5
  ($PKG_CONFIG --exists --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 1.2.0
   ") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_EDJE_LIBS=`$PKG_CONFIG --libs "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 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
@@ -14081,37 +14087,37 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+                EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 1.2.0
-   "`
+   " 2>&1`
        else
-                EDJE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+                EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 1.2.0
-   "`
+   " 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EDJE_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (
+        as_fn_error $? "Package requirements (
-    eina >= 1.1.0
+    eina >= 1.2.0
-    eet >= 1.5.0
+    eet >= 1.6.0
-    evas >= 1.1.0
+    evas >= 1.2.0
-    ecore >= 1.1.0
+    ecore >= 1.2.0
-    ecore-evas >= 1.1.0
+    ecore-evas >= 1.2.0
-    ecore-file >= 1.1.0
+    ecore-file >= 1.2.0
-    embryo >= 1.1.0
+    embryo >= 1.2.0
   ) were not met:
 $EDJE_PKG_ERRORS
@@ -14121,12 +14127,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_CFLAGS
 and EDJE_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.
@@ -14135,19 +14142,19 @@ and EDJE_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
        EDJE_CFLAGS=$pkg_cv_EDJE_CFLAGS
        EDJE_LIBS=$pkg_cv_EDJE_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
 EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
 EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
-requirement_edje="embryo >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_edje}"
+requirement_edje="embryo >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_edje}"
 requirement_edje="${requirement_lua} ${requirement_edje}"
 have_ecore_imf="no"
@@ -14156,64 +14163,62 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_IMF" >&5
 $as_echo_n "checking for ECORE_IMF... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_IMF_CFLAGS"; then
-    if test -n "$ECORE_IMF_CFLAGS"; then
+    pkg_cv_ECORE_IMF_CFLAGS="$ECORE_IMF_CFLAGS"
-        pkg_cv_ECORE_IMF_CFLAGS="$ECORE_IMF_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 \"
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
   \""; } >&5
  ($PKG_CONFIG --exists --print-errors "
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
   ") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags "
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
   " 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
+if test -n "$ECORE_IMF_LIBS"; then
-    if test -n "$ECORE_IMF_LIBS"; then
+    pkg_cv_ECORE_IMF_LIBS="$ECORE_IMF_LIBS"
-        pkg_cv_ECORE_IMF_LIBS="$ECORE_IMF_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 \"
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
   \""; } >&5
  ($PKG_CONFIG --exists --print-errors "
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
   ") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
  pkg_cv_ECORE_IMF_LIBS=`$PKG_CONFIG --libs "
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
   " 2>/dev/null`
 else
  pkg_failed=yes
 fi
-    fi
+ else
-else
+    pkg_failed=untried
-        pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
@@ -14221,23 +14226,23 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+                ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
-   "`
+   " 2>&1`
        else
-                ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+                ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-    ecore-imf >= 1.1.0
+    ecore-imf >= 1.2.0
-    ecore-imf-evas >= 1.1.0
+    ecore-imf-evas >= 1.2.0
-   "`
+   " 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$ECORE_IMF_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_ecore_imf="no"
-$as_echo "no" >&6; }
-                have_ecore_imf="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_ecore_imf="no"
 else
        ECORE_IMF_CFLAGS=$pkg_cv_ECORE_IMF_CFLAGS
@@ -14249,7 +14254,7 @@ $as_echo "yes" >&6; }
 $as_echo "#define HAVE_ECORE_IMF 1" >>confdefs.h
    have_ecore_imf="yes"
-    requirement_edje="ecore-imf-evas >= 1.1.0 ecore-imf >= 1.1.0 ${requirement_edje}"
+    requirement_edje="ecore-imf-evas >= 1.2.0 ecore-imf >= 1.2.0 ${requirement_edje}"
 fi
@@ -14286,11 +14291,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
 $as_echo_n "checking for SNDFILE... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$SNDFILE_CFLAGS"; then
-    if test -n "$SNDFILE_CFLAGS"; then
+    pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
-        pkg_cv_SNDFILE_CFLAGS="$SNDFILE_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 \"sndfile >= 1.0.21\""; } >&5
  ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5
  ac_status=$?
@@ -14300,15 +14304,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 "$SNDFILE_LIBS"; then
-    if test -n "$SNDFILE_LIBS"; then
+    pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
-        pkg_cv_SNDFILE_LIBS="$SNDFILE_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 \"sndfile >= 1.0.21\""; } >&5
  ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5
  ac_status=$?
@@ -14318,14 +14320,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
@@ -14333,18 +14336,18 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sndfile >= 1.0.21"`
+                SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sndfile >= 1.0.21" 2>&1`
        else
-                SNDFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sndfile >= 1.0.21"`
+                SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sndfile >= 1.0.21" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$SNDFILE_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_sndfile="no"; want_multisense="no"
-$as_echo "no" >&6; }
-                have_sndfile="no"; want_multisense="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_sndfile="no"; want_multisense="no"
 else
@@ -14362,7 +14365,7 @@ $as_echo "#define HAVE_LIBSNDFILE 1" >>confdefs.h
 fi
        if test "x$want_sndfile" = "xyes" -a "x$have_sndfile" = "xno"; then
-            as_fn_error "sndfile support requested, but not found by pkg-config." "$LINENO" 5
+            as_fn_error $? "sndfile support requested, but not found by pkg-config." "$LINENO" 5
        fi
 fi
 if test "x${have_sndfile}" = "xyes"; then
@@ -14389,11 +14392,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for REMIX" >&5
 $as_echo_n "checking for REMIX... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$REMIX_CFLAGS"; then
-    if test -n "$REMIX_CFLAGS"; then
+    pkg_cv_REMIX_CFLAGS="$REMIX_CFLAGS"
-        pkg_cv_REMIX_CFLAGS="$REMIX_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 \"remix >= 0.2.4\""; } >&5
  ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5
  ac_status=$?
@@ -14403,15 +14405,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 "$REMIX_LIBS"; then
-    if test -n "$REMIX_LIBS"; then
+    pkg_cv_REMIX_LIBS="$REMIX_LIBS"
-        pkg_cv_REMIX_LIBS="$REMIX_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 \"remix >= 0.2.4\""; } >&5
  ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5
  ac_status=$?
@@ -14421,14 +14421,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
@@ -14436,18 +14437,18 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "remix >= 0.2.4"`
+                REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "remix >= 0.2.4" 2>&1`
        else
-                REMIX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "remix >= 0.2.4"`
+                REMIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "remix >= 0.2.4" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$REMIX_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_libremix="no"; want_multisense="no"
-$as_echo "no" >&6; }
-                have_libremix="no"; want_multisense="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_libremix="no"; want_multisense="no"
 else
@@ -14475,7 +14476,7 @@ _ACEOF
 fi
        if test "x$want_libremix" = "xyes" -a "x$have_libremix" = "xno"; then
-            as_fn_error "remix support requested, but not found by pkg-config." "$LINENO" 5
+            as_fn_error $? "remix support requested, but not found by pkg-config." "$LINENO" 5
        fi
 fi
 if test "x${have_libremix}" = "xyes"; then
@@ -14502,11 +14503,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBISENC" >&5
 $as_echo_n "checking for VORBISENC... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$VORBISENC_CFLAGS"; then
-    if test -n "$VORBISENC_CFLAGS"; then
+    pkg_cv_VORBISENC_CFLAGS="$VORBISENC_CFLAGS"
-        pkg_cv_VORBISENC_CFLAGS="$VORBISENC_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 \"
       ogg >= 1.1.4
       vorbis >= 1.2.3
@@ -14528,15 +14528,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 "$VORBISENC_LIBS"; then
-    if test -n "$VORBISENC_LIBS"; then
+    pkg_cv_VORBISENC_LIBS="$VORBISENC_LIBS"
-        pkg_cv_VORBISENC_LIBS="$VORBISENC_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 \"
       ogg >= 1.1.4
       vorbis >= 1.2.3
@@ -14558,14 +14556,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
@@ -14573,26 +14572,26 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+                VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
       ogg >= 1.1.4
       vorbis >= 1.2.3
       vorbisenc >= 1.2.3
-      "`
+      " 2>&1`
        else
-                VORBISENC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+                VORBISENC_PKG_ERRORS=`$PKG_CONFIG --print-errors "
       ogg >= 1.1.4
       vorbis >= 1.2.3
       vorbisenc >= 1.2.3
-      "`
+      " 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$VORBISENC_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_vorbis="no"; want_multisense="no"
-$as_echo "no" >&6; }
-                have_vorbis="no"; want_multisense="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_vorbis="no"; want_multisense="no"
 else
@@ -14610,7 +14609,7 @@ $as_echo "#define HAVE_VORBIS 1" >>confdefs.h
 fi
        if test "x$want_vorbis" = "xyes" -a "x$have_vorbis" = "xno"; then
-            as_fn_error "vorbisenc support requested, but not found by pkg-config." "$LINENO" 5
+            as_fn_error $? "vorbisenc support requested, but not found by pkg-config." "$LINENO" 5
        fi
 fi
@@ -14629,11 +14628,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
 $as_echo_n "checking for ALSA... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$ALSA_CFLAGS"; then
-    if test -n "$ALSA_CFLAGS"; then
+    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
-        pkg_cv_ALSA_CFLAGS="$ALSA_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 \"
       alsa >= 1.0.21
      \""; } >&5
@@ -14649,15 +14647,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 "$ALSA_LIBS"; then
-    if test -n "$ALSA_LIBS"; then
+    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
-        pkg_cv_ALSA_LIBS="$ALSA_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 \"
       alsa >= 1.0.21
      \""; } >&5
@@ -14673,14 +14669,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
@@ -14688,22 +14685,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+                ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
       alsa >= 1.0.21
-      "`
+      " 2>&1`
        else
-                ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+                ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "
       alsa >= 1.0.21
-      "`
+      " 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$ALSA_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_alsa_lib="no"; want_multisense="no"
-$as_echo "no" >&6; }
-                have_alsa_lib="no"; want_multisense="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_alsa_lib="no"; want_multisense="no"
 else
@@ -14721,7 +14718,7 @@ $as_echo "#define HAVE_LIBALSA 1" >>confdefs.h
 fi
        if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then
-            as_fn_error "alsa support requested, but not found by pkg-config." "$LINENO" 5
+            as_fn_error $? "alsa support requested, but not found by pkg-config." "$LINENO" 5
        fi
 fi
 if test "x${have_alsa_lib}" = "xyes"; then
@@ -14749,11 +14746,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
 $as_echo_n "checking for FLAC... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$FLAC_CFLAGS"; then
-    if test -n "$FLAC_CFLAGS"; then
+    pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
-        pkg_cv_FLAC_CFLAGS="$FLAC_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 \"
       flac >= 1.2.1
      \""; } >&5
@@ -14769,15 +14765,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 "$FLAC_LIBS"; then
-    if test -n "$FLAC_LIBS"; then
+    pkg_cv_FLAC_LIBS="$FLAC_LIBS"
-        pkg_cv_FLAC_LIBS="$FLAC_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 \"
       flac >= 1.2.1
      \""; } >&5
@@ -14793,14 +14787,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
@@ -14808,22 +14803,22 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
+                FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
       flac >= 1.2.1
-      "`
+      " 2>&1`
        else
-                FLAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+                FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "
       flac >= 1.2.1
-      "`
+      " 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$FLAC_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        have_flac_lib="no"; want_multisense="no"
-$as_echo "no" >&6; }
-                have_flac_lib="no"; want_multisense="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        have_flac_lib="no"; want_multisense="no"
 else
@@ -14844,7 +14839,7 @@ $as_echo "#define HAVE_LIBFLAC 1" >>confdefs.h
 fi
        if test "x$want_flac_lib" = "xyes" -a "x$have_flac_lib" = "xno"; then
-            as_fn_error "flac support requested, but not found by pkg-config." "$LINENO" 5
+            as_fn_error $? "flac support requested, but not found by pkg-config." "$LINENO" 5
        fi
 fi
@@ -14862,46 +14857,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_CC" >&5
 $as_echo_n "checking for EDJE_CC... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EDJE_CC_CFLAGS"; then
-    if test -n "$EDJE_CC_CFLAGS"; then
+    pkg_cv_EDJE_CC_CFLAGS="$EDJE_CC_CFLAGS"
-        pkg_cv_EDJE_CC_CFLAGS="$EDJE_CC_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 \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 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_EDJE_CC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_CC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 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 "$EDJE_CC_LIBS"; then
-    if test -n "$EDJE_CC_LIBS"; then
+    pkg_cv_EDJE_CC_LIBS="$EDJE_CC_LIBS"
-        pkg_cv_EDJE_CC_LIBS="$EDJE_CC_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 \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 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_EDJE_CC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_CC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 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
@@ -14909,14 +14902,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
+                EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
        else
-                EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
+                EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EDJE_CC_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met:
+        as_fn_error $? "Package requirements (ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0) were not met:
 $EDJE_CC_PKG_ERRORS
@@ -14925,12 +14918,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_CC_CFLAGS
 and EDJE_CC_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.
@@ -14939,13 +14933,13 @@ and EDJE_CC_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
        EDJE_CC_CFLAGS=$pkg_cv_EDJE_CC_CFLAGS
        EDJE_CC_LIBS=$pkg_cv_EDJE_CC_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
   EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
 fi
@@ -14965,46 +14959,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_DECC" >&5
 $as_echo_n "checking for EDJE_DECC... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EDJE_DECC_CFLAGS"; then
-    if test -n "$EDJE_DECC_CFLAGS"; then
+    pkg_cv_EDJE_DECC_CFLAGS="$EDJE_DECC_CFLAGS"
-        pkg_cv_EDJE_DECC_CFLAGS="$EDJE_DECC_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 \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 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_EDJE_DECC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_DECC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 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 "$EDJE_DECC_LIBS"; then
-    if test -n "$EDJE_DECC_LIBS"; then
+    pkg_cv_EDJE_DECC_LIBS="$EDJE_DECC_LIBS"
-        pkg_cv_EDJE_DECC_LIBS="$EDJE_DECC_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 \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 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_EDJE_DECC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_DECC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 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
@@ -15012,14 +15004,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
+                EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
        else
-                EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
+                EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EDJE_DECC_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met:
+        as_fn_error $? "Package requirements (ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0) were not met:
 $EDJE_DECC_PKG_ERRORS
@@ -15028,12 +15020,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_DECC_CFLAGS
 and EDJE_DECC_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.
@@ -15042,13 +15035,13 @@ and EDJE_DECC_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
        EDJE_DECC_CFLAGS=$pkg_cv_EDJE_DECC_CFLAGS
        EDJE_DECC_LIBS=$pkg_cv_EDJE_DECC_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
 fi
@@ -15058,46 +15051,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_PLAYER" >&5
 $as_echo_n "checking for EDJE_PLAYER... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EDJE_PLAYER_CFLAGS"; then
-    if test -n "$EDJE_PLAYER_CFLAGS"; then
+    pkg_cv_EDJE_PLAYER_CFLAGS="$EDJE_PLAYER_CFLAGS"
-        pkg_cv_EDJE_PLAYER_CFLAGS="$EDJE_PLAYER_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 \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 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_EDJE_PLAYER_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_PLAYER_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 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 "$EDJE_PLAYER_LIBS"; then
-    if test -n "$EDJE_PLAYER_LIBS"; then
+    pkg_cv_EDJE_PLAYER_LIBS="$EDJE_PLAYER_LIBS"
-        pkg_cv_EDJE_PLAYER_LIBS="$EDJE_PLAYER_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 \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 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_EDJE_PLAYER_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_PLAYER_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 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
@@ -15105,14 +15096,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
+                EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
        else
-                EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
+                EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EDJE_PLAYER_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met:
+        as_fn_error $? "Package requirements (ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0) were not met:
 $EDJE_PLAYER_PKG_ERRORS
@@ -15121,12 +15112,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_PLAYER_CFLAGS
 and EDJE_PLAYER_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.
@@ -15135,13 +15127,13 @@ and EDJE_PLAYER_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
        EDJE_PLAYER_CFLAGS=$pkg_cv_EDJE_PLAYER_CFLAGS
        EDJE_PLAYER_LIBS=$pkg_cv_EDJE_PLAYER_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
 fi
@@ -15151,46 +15143,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_INSPECTOR" >&5
 $as_echo_n "checking for EDJE_INSPECTOR... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EDJE_INSPECTOR_CFLAGS"; then
-    if test -n "$EDJE_INSPECTOR_CFLAGS"; then
+    pkg_cv_EDJE_INSPECTOR_CFLAGS="$EDJE_INSPECTOR_CFLAGS"
-        pkg_cv_EDJE_INSPECTOR_CFLAGS="$EDJE_INSPECTOR_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 \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 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_EDJE_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 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 "$EDJE_INSPECTOR_LIBS"; then
-    if test -n "$EDJE_INSPECTOR_LIBS"; then
+    pkg_cv_EDJE_INSPECTOR_LIBS="$EDJE_INSPECTOR_LIBS"
-        pkg_cv_EDJE_INSPECTOR_LIBS="$EDJE_INSPECTOR_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 \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 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_EDJE_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 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
@@ -15198,14 +15188,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
+                EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
        else
-                EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
+                EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EDJE_INSPECTOR_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met:
+        as_fn_error $? "Package requirements (ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0) were not met:
 $EDJE_INSPECTOR_PKG_ERRORS
@@ -15214,12 +15204,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_INSPECTOR_CFLAGS
 and EDJE_INSPECTOR_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.
@@ -15228,13 +15219,13 @@ and EDJE_INSPECTOR_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
        EDJE_INSPECTOR_CFLAGS=$pkg_cv_EDJE_INSPECTOR_CFLAGS
        EDJE_INSPECTOR_LIBS=$pkg_cv_EDJE_INSPECTOR_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
 fi
@@ -15244,46 +15235,44 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_EXTERNAL_INSPECTOR" >&5
 $as_echo_n "checking for EDJE_EXTERNAL_INSPECTOR... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then
-    if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then
+    pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS="$EDJE_EXTERNAL_INSPECTOR_CFLAGS"
-        pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS="$EDJE_EXTERNAL_INSPECTOR_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 \"ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 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_EDJE_EXTERNAL_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.2.0 evas >= 1.2.0 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 "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then
-    if test -n "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then
+    pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS="$EDJE_EXTERNAL_INSPECTOR_LIBS"
-        pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS="$EDJE_EXTERNAL_INSPECTOR_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 \"ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
-  ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 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_EDJE_EXTERNAL_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null`
+  pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore >= 1.2.0 evas >= 1.2.0 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
@@ -15291,14 +15280,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
+                EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
        else
-                EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
+                EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS" >&5
-        as_fn_error "Package requirements (ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met:
+        as_fn_error $? "Package requirements (ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0) were not met:
 $EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS
@@ -15307,12 +15296,13 @@ installed software in a non-standard prefix.
 Alternatively, you may set the environment variables EDJE_EXTERNAL_INSPECTOR_CFLAGS
 and EDJE_EXTERNAL_INSPECTOR_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.
@@ -15321,13 +15311,13 @@ and EDJE_EXTERNAL_INSPECTOR_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
        EDJE_EXTERNAL_INSPECTOR_CFLAGS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS
        EDJE_EXTERNAL_INSPECTOR_LIBS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        :
 fi
 fi
@@ -15337,8 +15327,7 @@ for ac_header in locale.h sys/resource.h
 do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15417,7 +15406,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
@@ -16281,8 +16270,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
@@ -16398,11 +16386,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
 $as_echo_n "checking for CHECK... " >&6; }
-if test -n "$PKG_CONFIG"; then
+if test -n "$CHECK_CFLAGS"; then
-    if test -n "$CHECK_CFLAGS"; then
+    pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
-        pkg_cv_CHECK_CFLAGS="$CHECK_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 \"check >= 0.9.5\""; } >&5
  ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
  ac_status=$?
@@ -16412,15 +16399,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 "$CHECK_LIBS"; then
-    if test -n "$CHECK_LIBS"; then
+    pkg_cv_CHECK_LIBS="$CHECK_LIBS"
-        pkg_cv_CHECK_LIBS="$CHECK_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 \"check >= 0.9.5\""; } >&5
  ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
  ac_status=$?
@@ -16430,14 +16415,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
@@ -16445,17 +16431,17 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-                CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.5"`
+                CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1`
        else
-                CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.5"`
+                CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1`
        fi
        # Put the nasty error message in config.log where it belongs
        echo "$CHECK_PKG_ERRORS" >&5
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        _efl_enable_tests="no"
-$as_echo "no" >&6; }
-                _efl_enable_tests="no"
 elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        _efl_enable_tests="no"
 else
        CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
@@ -16596,11 +16582,6 @@ if test "${enable_build_examples+set}" = set; then :
  enableval=$enable_build_examples;
    if test "x${enableval}" = "xyes" ; then
       build_examples="yes"
-       edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc
-      # put in here the dependencies for Edje' examples. They are
-       # meant to be 'real world' usage examples, thus one will be
-       # using higher level libraries on these programs
    else
       build_examples="no"
    fi
@@ -16705,6 +16686,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$//'
@@ -16728,95 +16710,95 @@ 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 "${EDJE_AMALGAMATION_TRUE}" && test -z "${EDJE_AMALGAMATION_FALSE}"; then
-  as_fn_error "conditional \"EDJE_AMALGAMATION\" was never defined.
+  as_fn_error $? "conditional \"EDJE_AMALGAMATION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EDJE_CC_TRUE}" && test -z "${BUILD_EDJE_CC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EDJE_CC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EDJE_CC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EDJE_DECC_TRUE}" && test -z "${BUILD_EDJE_DECC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EDJE_DECC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EDJE_DECC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EDJE_RECC_TRUE}" && test -z "${BUILD_EDJE_RECC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EDJE_RECC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EDJE_RECC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EDJE_PLAYER_TRUE}" && test -z "${BUILD_EDJE_PLAYER_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EDJE_PLAYER\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EDJE_PLAYER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EDJE_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_INSPECTOR_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EDJE_INSPECTOR\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EDJE_INSPECTOR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EDJE_EXTERNAL_INSPECTOR\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EDJE_EXTERNAL_INSPECTOR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EDJE_PROGRAM_CACHE_TRUE}" && test -z "${EDJE_PROGRAM_CACHE_FALSE}"; then
-  as_fn_error "conditional \"EDJE_PROGRAM_CACHE\" was never defined.
+  as_fn_error $? "conditional \"EDJE_PROGRAM_CACHE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EDJE_CALC_CACHE_TRUE}" && test -z "${EDJE_CALC_CACHE_FALSE}"; then
-  as_fn_error "conditional \"EDJE_CALC_CACHE\" was never defined.
+  as_fn_error $? "conditional \"EDJE_CALC_CACHE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EDJE_FP_TRUE}" && test -z "${BUILD_EDJE_FP_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EDJE_FP\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EDJE_FP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then
-  as_fn_error "conditional \"EFL_BUILD_DOC\" was never defined.
+  as_fn_error $? "conditional \"EFL_BUILD_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then
-  as_fn_error "conditional \"HAVE_PYTHON\" was never defined.
+  as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ENABLE_MULTISENSE_TRUE}" && test -z "${ENABLE_MULTISENSE_FALSE}"; then
-  as_fn_error "conditional \"ENABLE_MULTISENSE\" was never defined.
+  as_fn_error $? "conditional \"ENABLE_MULTISENSE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LIBSNDFILE_TRUE}" && test -z "${HAVE_LIBSNDFILE_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBSNDFILE\" was never defined.
+  as_fn_error $? "conditional \"HAVE_LIBSNDFILE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LIBREMIX_TRUE}" && test -z "${HAVE_LIBREMIX_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBREMIX\" was never defined.
+  as_fn_error $? "conditional \"HAVE_LIBREMIX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_LIBALSA_TRUE}" && test -z "${HAVE_LIBALSA_FALSE}"; then
-  as_fn_error "conditional \"HAVE_LIBALSA\" was never defined.
+  as_fn_error $? "conditional \"HAVE_LIBALSA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EPP_TRUE}" && test -z "${BUILD_EPP_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EPP\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EPP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then
-  as_fn_error "conditional \"EFL_ENABLE_TESTS\" was never defined.
+  as_fn_error $? "conditional \"EFL_ENABLE_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${EFL_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then
-  as_fn_error "conditional \"EFL_ENABLE_COVERAGE\" was never defined.
+  as_fn_error $? "conditional \"EFL_ENABLE_COVERAGE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then
-  as_fn_error "conditional \"BUILD_EXAMPLES\" was never defined.
+  as_fn_error $? "conditional \"BUILD_EXAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -16966,19 +16948,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
@@ -17174,7 +17156,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
@@ -17227,8 +17209,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 edje $as_me 1.1.99.67344, which was
+This file was extended by edje $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
@@ -17293,11 +17275,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="\\
-edje config.status 1.1.99.67344
+edje 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."
@@ -17315,11 +17297,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
@@ -17341,6 +17328,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;;
@@ -17353,7 +17341,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 ;;
@@ -17362,7 +17350,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"
@@ -17694,7 +17682,7 @@ do
    "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
    "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
  esac
 done
@@ -17732,7 +17720,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.
@@ -17749,7 +17737,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
@@ -17763,18 +17751,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
@@ -17863,20 +17851,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
@@ -17904,7 +17900,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
@@ -17989,7 +17985,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"
@@ -18002,7 +17998,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
@@ -18030,7 +18026,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'"
@@ -18057,7 +18053,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
@@ -18194,22 +18190,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)
  #
@@ -18220,19 +18216,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"
@@ -19023,7 +19019,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.
@@ -19044,7 +19040,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