diff options
| author | sno <sno@pkgsrc.org> | 2013-06-16 18:56:04 +0000 |
|---|---|---|
| committer | sno <sno@pkgsrc.org> | 2013-06-16 18:56:04 +0000 |
| commit | 1af104312c9949d43ad5c9ee3ab29359b6c675b3 (patch) | |
| tree | 623927a32c2936544542f5724e9ca67d4888379f /x11/elementary/patches | |
| parent | 8652ff692b6b942d70127d395a33c13a16867f2f (diff) | |
| download | pkgsrc-1af104312c9949d43ad5c9ee3ab29359b6c675b3.tar.gz | |
Updating enlightenment libraries to 1.7.7, add missing enlightenment 0.17.3
libraries and enlightenment 0.17.3 itself.
Upstream changes of Eina (to get an impression):
Eina 1.7.7
Changes since Eina 1.7.6:
-------------------------
No changes, just updating to keep in sync with last release.
Changes since Eina 1.7.5:
-------------------------
Improvements:
* Honor tile size in Eina_Tiler.
Fixes:
* Prevent denial of service on Eina_Hash function.
* Fix map leak in Eina_File infrastructure.
* Fix portability issue on 64bits system for Eina_CList.
* Fix magic failure in eina_value_array_count when array has not been allocated
Changes since Eina 1.7.4:
-------------------------
No changes, just updating to keep in sync with last release.
Changes since Eina 1.7.3:
-------------------------
Fixes:
* Fix EINA_INLIST_FOREACH_SAFE macro
* Add XML output to doc
* Add installation rule for doc
* Fix build for Windows platforms.
Changes since Eina 1.7.2:
-------------------------
* Fix Solaris build.
* Don't leak fd after exec.
Changes since Eina 1.7.1:
-------------------------
No changes, just updating to keep in sync with last release.
Diffstat (limited to 'x11/elementary/patches')
| -rw-r--r-- | x11/elementary/patches/patch-aa | 22 | ||||
| -rw-r--r-- | x11/elementary/patches/patch-ab | 2108 |
2 files changed, 2130 insertions, 0 deletions
diff --git a/x11/elementary/patches/patch-aa b/x11/elementary/patches/patch-aa new file mode 100644 index 00000000000..0e5d93bc0ce --- /dev/null +++ b/x11/elementary/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1 2013/06/16 18:56:06 sno Exp $ + +--- configure.ac.orig 2012-08-26 13:26:31.000000000 +0000 ++++ configure.ac +@@ -723,7 +723,7 @@ AC_DEFINE_UNQUOTED(ELEMENTARY_BASE_DIR, + EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) + EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"]) + +-AC_TRY_COMPILE([ ++AC_TRY_LINK([ + # define _GNU_SOURCE 1 + #include <unistd.h> + ], [ +@@ -732,7 +732,7 @@ extern char **environ; + AC_DEFINE(HAVE_ENVIRON, 1, [extern environ exists]) + ]) + +-AC_TRY_COMPILE([ ++AC_TRY_LINK([ + #include <stdlib.h> + ], [ + clearenv(); diff --git a/x11/elementary/patches/patch-ab b/x11/elementary/patches/patch-ab new file mode 100644 index 00000000000..22d847127c7 --- /dev/null +++ b/x11/elementary/patches/patch-ab @@ -0,0 +1,2108 @@ +$NetBSD: patch-ab,v 1.1 2013/06/16 18:56:06 sno Exp $ + +--- configure.orig 2013-06-15 12:14:08.000000000 +0000 ++++ configure +@@ -1,13 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.68 for elementary 1.7.7. ++# Generated by GNU Autoconf 2.69 for elementary 1.7.7. + # + # 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, 2010 Free Software +-# Foundation, Inc. ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -136,6 +134,31 @@ export LANGUAGE + # CDPATH. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + ++# Use a proper internal environment variable to ensure we don't fall ++ # into an infinite loop, continuously re-executing ourselves. ++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then ++ _as_can_reexec=no; export _as_can_reexec; ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++as_fn_exit 255 ++ fi ++ # We don't want this to propagate to other subprocesses. ++ { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh +@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test + else + exitcode=1; echo positional parameters were not saved. + fi +-test x\$exitcode = x0 || exit 1" ++test x\$exitcode = x0 || exit 1 ++test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && +@@ -222,21 +246,25 @@ IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : +- # We cannot yet assume a decent shell, so we have to provide a +- # neutralization value for shells without unset; and this also +- # works around shells that cannot unset nonexistent variables. +- # Preserve -v and -x to the replacement shell. +- BASH_ENV=/dev/null +- ENV=/dev/null +- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +- export CONFIG_SHELL +- case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +- esac +- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} ++ export CONFIG_SHELL ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++exit 255 + fi + + if test x$as_have_required = xno; then : +@@ -339,6 +367,14 @@ $as_echo X"$as_dir" | + + + } # as_fn_mkdir_p ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p + # as_fn_append VAR VALUE + # ---------------------- + # Append the text in VALUE to the end of the definition contained in VAR. Take +@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have ++ # already done that, so ensure we don't try to do so again and fall ++ # in an infinite loop. This has already happened in practice. ++ _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). +@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -515,28 +555,8 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -1402,8 +1422,6 @@ target=$target_alias + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1567,10 +1585,12 @@ Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --enable-silent-rules less verbose build output (undo: `make V=1') +- --disable-silent-rules verbose build output (undo: `make V=0') +- --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors ++ --enable-silent-rules less verbose build output (undo: "make V=1") ++ --disable-silent-rules verbose build output (undo: "make V=0") ++ --enable-dependency-tracking ++ do not reject slow dependency extractors ++ --disable-dependency-tracking ++ speeds up one-time build + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] +@@ -1783,9 +1803,9 @@ test -n "$ac_init_help" && exit $ac_stat + if $ac_init_version; then + cat <<\_ACEOF + elementary configure 1.7.7 +-generated by GNU Autoconf 2.68 ++generated by GNU Autoconf 2.69 + +-Copyright (C) 2010 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -2062,7 +2082,7 @@ $as_echo "$ac_try_echo"; } >&5 + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext ++ test -x conftest$ac_exeext + }; then : + ac_retval=0 + else +@@ -2206,7 +2226,7 @@ This file contains any messages produced + running configure, to aid debugging if configure makes a mistake. + + It was created by elementary $as_me 1.7.7, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +@@ -2663,7 +2683,7 @@ ac_config_headers="$ac_config_headers el + + + +-am__api_version='1.11' ++am__api_version='1.13' + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -2702,7 +2722,7 @@ case $as_dir/ in #(( + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -2760,9 +2780,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } +-# Just in case +-sleep 1 +-echo timestamp > conftest.file + # Reject unsafe characters in $srcdir or the absolute working directory + # name. Accept space and tab only in the latter. + am_lf=' +@@ -2773,32 +2790,40 @@ case `pwd` in + 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 ++# Do 'set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$*" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- rm -f conftest.file +- if test "$*" != "X $srcdir/configure conftest.file" \ +- && test "$*" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # 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 +-alias in your environment" "$LINENO" 5 +- fi ++ am_has_slept=no ++ for am_try in 1 2; do ++ echo "timestamp, slept: $am_has_slept" > conftest.file ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ if test "$*" = "X"; then ++ # -L didn't work. ++ set X `ls -t "$srcdir/configure" conftest.file` ++ fi ++ if test "$*" != "X $srcdir/configure conftest.file" \ ++ && test "$*" != "X conftest.file $srcdir/configure"; then + ++ # If neither matched, then we have a broken ls. This can happen ++ # 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 ++ alias in your environment" "$LINENO" 5 ++ fi ++ if test "$2" = conftest.file || test $am_try -eq 2; then ++ break ++ fi ++ # Just in case. ++ sleep 1 ++ am_has_slept=yes ++ done + test "$2" = conftest.file + ) + then +@@ -2810,6 +2835,16 @@ Check your system clock" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } ++# If we didn't sleep, we still need to ensure time stamps of config.status and ++# generated files are strictly newer. ++am_sleep_pid= ++if grep 'slept: no' conftest.file >/dev/null 2>&1; then ++ ( sleep 1 ) & ++ am_sleep_pid=$! ++fi ++ ++rm -f conftest.file ++ + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. +@@ -2832,12 +2867,12 @@ if test x"${MISSING+set}" != xset; then + esac + fi + # Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " ++if eval "$MISSING --is-lightweight"; then ++ am_missing_run="$MISSING " + else + am_missing_run= +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + fi + + if test x"${install_sh}" != xset; then +@@ -2849,10 +2884,10 @@ if test x"${install_sh}" != xset; then + esac + fi + +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right ++# Installed binaries are usually stripped using 'strip' when the user ++# run "make install-strip". However 'strip' might not be the right + # tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. ++# will honor the 'STRIP' environment variable to overrule this program. + if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +@@ -2871,7 +2906,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2911,7 +2946,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2962,7 +2997,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do +- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ +@@ -2991,12 +3026,6 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + +-mkdir_p="$MKDIR_P" +-case $mkdir_p in +- [\\/$]* | ?:[\\/]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +- + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -3015,7 +3044,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3079,6 +3108,45 @@ else + fi + rmdir .tst 2>/dev/null + ++# Check whether --enable-silent-rules was given. ++if test "${enable_silent_rules+set}" = set; then : ++ enableval=$enable_silent_rules; ++fi ++ ++case $enable_silent_rules in # ((( ++ yes) AM_DEFAULT_VERBOSITY=0;; ++ no) AM_DEFAULT_VERBOSITY=1;; ++ *) AM_DEFAULT_VERBOSITY=1;; ++esac ++am_make=${MAKE-make} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 ++$as_echo_n "checking whether $am_make supports nested variables... " >&6; } ++if ${am_cv_make_support_nested_variables+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if $as_echo 'TRUE=$(BAR$(V)) ++BAR0=false ++BAR1=true ++V=1 ++am__doit: ++ @$(TRUE) ++.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then ++ am_cv_make_support_nested_variables=yes ++else ++ am_cv_make_support_nested_variables=no ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 ++$as_echo "$am_cv_make_support_nested_variables" >&6; } ++if test $am_cv_make_support_nested_variables = yes; then ++ AM_V='$(V)' ++ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' ++else ++ AM_V=$AM_DEFAULT_VERBOSITY ++ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY ++fi ++AM_BACKSLASH='\' ++ + if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." +@@ -3129,27 +3197,38 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + ++# For better backward compatibility. To be removed once Automake 1.9.x ++# dies out for good. For more background, see: ++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> ++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> ++mkdir_p='$(MKDIR_P)' ++ + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + # Always define AMTAR for backward compatibility. Yes, it's still used + # in the wild :-( We should find a proper way to deprecate it ... + AMTAR='$${TAR-tar}' + ++ ++# We'll loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar pax cpio none' ++ + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + ++ + # Check whether --enable-silent-rules was given. + if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; + fi + +-case $enable_silent_rules in +-yes) AM_DEFAULT_VERBOSITY=0;; +-no) AM_DEFAULT_VERBOSITY=1;; +-*) AM_DEFAULT_VERBOSITY=0;; ++case $enable_silent_rules in # ((( ++ yes) AM_DEFAULT_VERBOSITY=0;; ++ no) AM_DEFAULT_VERBOSITY=1;; ++ *) AM_DEFAULT_VERBOSITY=0;; + esac + am_make=${MAKE-make} + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +@@ -3200,7 +3279,7 @@ am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. ++# Ignore all kinds of additional output from 'make'. + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=include +@@ -3266,7 +3345,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3306,7 +3385,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3359,7 +3438,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3400,7 +3479,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -3458,7 +3537,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3502,7 +3581,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3948,8 +4027,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -4045,8 +4123,8 @@ else + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. ++ # making a dummy file named 'D' -- because '-MD' means "put the output ++ # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're +@@ -4081,16 +4159,16 @@ else + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with ++ # Solaris 10 /bin/sh. ++ echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs ++ # handle '-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in +@@ -4099,8 +4177,8 @@ else + test "$am__universal" = false || continue + ;; + nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested ++ # After this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else +@@ -4108,7 +4186,7 @@ else + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has ++ # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} +@@ -4317,7 +4395,7 @@ do + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ as_fn_executable_p "$ac_path_GREP" || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -4383,7 +4461,7 @@ do + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ as_fn_executable_p "$ac_path_EGREP" || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -4590,8 +4668,8 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-# define __EXTENSIONS__ 1 +- $ac_includes_default ++# define __EXTENSIONS__ 1 ++ $ac_includes_default + int + main () + { +@@ -4925,7 +5003,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4965,7 +5043,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5018,7 +5096,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5059,7 +5137,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -5117,7 +5195,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5161,7 +5239,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -5357,8 +5435,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -5454,8 +5531,8 @@ else + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. ++ # making a dummy file named 'D' -- because '-MD' means "put the output ++ # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're +@@ -5490,16 +5567,16 @@ else + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h ++ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with ++ # Solaris 10 /bin/sh. ++ echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs ++ # handle '-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in +@@ -5508,8 +5585,8 @@ else + test "$am__universal" = false || continue + ;; + nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested ++ # After this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else +@@ -5517,7 +5594,7 @@ else + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has ++ # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} +@@ -5721,7 +5798,7 @@ main () + return 0; + } + _ACEOF +-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 ++for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 + do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : +@@ -5761,8 +5838,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -5987,11 +6063,11 @@ else + int + main () + { +-/* FIXME: Include the comments suggested by Paul. */ ++ + #ifndef __cplusplus +- /* Ultrix mips cc rejects this. */ ++ /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; +- const charset cs; ++ const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; +@@ -6008,8 +6084,9 @@ main () + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; +- { /* SCO 3.2v4 cc rejects this. */ +- char *t; ++ { /* SCO 3.2v4 cc rejects this sort of thing. */ ++ char tx; ++ char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; +@@ -6025,10 +6102,10 @@ main () + iptr p = 0; + ++p; + } +- { /* AIX XL C 1.02.0.0 rejects this saying ++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; }; +- struct s *b; b->j = 5; ++ struct s { int j; const int *ap[3]; } bx; ++ struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +@@ -6169,6 +6246,8 @@ else + # ifdef _MSC_VER + # include <malloc.h> + # define alloca _alloca ++# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) ++# include <stdlib.h> + # else + # ifdef HAVE_ALLOCA_H + # include <alloca.h> +@@ -6272,23 +6351,20 @@ else + /* end confdefs.h. */ + $ac_includes_default + int +-find_stack_direction () ++find_stack_direction (int *addr, int depth) + { +- static char *addr = 0; +- auto char dummy; +- if (addr == 0) +- { +- addr = &dummy; +- return find_stack_direction (); +- } +- else +- return (&dummy > addr) ? 1 : -1; ++ int dir, dummy = 0; ++ if (! addr) ++ addr = &dummy; ++ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; ++ dir = depth ? find_stack_direction (addr, depth - 1) : 0; ++ return dir + dummy; + } + + int +-main () ++main (int argc, char **argv) + { +- return find_stack_direction () < 0; ++ return find_stack_direction (0, argc + !argv + 20) < 0; + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +@@ -6332,7 +6408,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AS="${ac_tool_prefix}as" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6372,7 +6448,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AS="as" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6424,7 +6500,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6464,7 +6540,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6516,7 +6592,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6556,7 +6632,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -6730,7 +6806,7 @@ do + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue ++ as_fn_executable_p "$ac_path_SED" || continue + # Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED + case `"$ac_path_SED" --version 2>&1` in +@@ -6809,7 +6885,7 @@ do + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue ++ as_fn_executable_p "$ac_path_FGREP" || continue + # Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP + case `"$ac_path_FGREP" --version 2>&1` in +@@ -7065,7 +7141,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7109,7 +7185,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7533,7 +7609,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7573,7 +7649,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7876,7 +7952,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -7916,7 +7992,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8016,7 +8092,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8060,7 +8136,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8185,7 +8261,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8225,7 +8301,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8284,7 +8360,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8324,7 +8400,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -8973,7 +9049,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9013,7 +9089,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9093,7 +9169,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9133,7 +9209,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9185,7 +9261,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9225,7 +9301,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9277,7 +9353,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9317,7 +9393,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9369,7 +9445,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9409,7 +9485,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9461,7 +9537,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9501,7 +9577,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13766,6 +13842,7 @@ VMIN=7 + + + ++ + 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. +@@ -13786,7 +13863,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13829,7 +13906,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13920,6 +13997,7 @@ requirement_elm="" + + + ++ + 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. +@@ -13940,7 +14018,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13983,7 +14061,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -14074,6 +14152,7 @@ if test -n "$EVIL_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14090,6 +14169,7 @@ if test -n "$EVIL_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14109,9 +14189,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil" 2>&1` ++ EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil" 2>&1` + else +- EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil" 2>&1` ++ EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EVIL_PKG_ERRORS" >&5 +@@ -14126,7 +14206,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables EVIL_CFLAGS + and EVIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details." "$LINENO" 5 +- + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -14142,7 +14221,6 @@ See the pkg-config man page for more det + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details" "$LINENO" 5; } +- + else + EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS + EVIL_LIBS=$pkg_cv_EVIL_LIBS +@@ -14179,6 +14257,7 @@ if test -n "$EVIL_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EVIL_CFLAGS=`$PKG_CONFIG --cflags "evil" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14195,6 +14274,7 @@ if test -n "$EVIL_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EVIL_LIBS=`$PKG_CONFIG --libs "evil" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14214,9 +14294,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil" 2>&1` ++ EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil" 2>&1` + else +- EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil" 2>&1` ++ EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EVIL_PKG_ERRORS" >&5 +@@ -14231,7 +14311,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables EVIL_CFLAGS + and EVIL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details." "$LINENO" 5 +- + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -14247,7 +14326,6 @@ See the pkg-config man page for more det + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details" "$LINENO" 5; } +- + else + EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS + EVIL_LIBS=$pkg_cv_EVIL_LIBS +@@ -14707,6 +14785,7 @@ if test -n "$ELEMENTARY_CFLAGS"; then + edje >= 1.7.7 + + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14750,6 +14829,7 @@ if test -n "$ELEMENTARY_LIBS"; then + edje >= 1.7.7 + + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14769,7 +14849,7 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + eina >= 1.7.7 + eet >= 1.7.7 + evas >= 1.7.7 +@@ -14780,7 +14860,7 @@ fi + + " 2>&1` + else +- ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ELEMENTARY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + eina >= 1.7.7 + eet >= 1.7.7 + evas >= 1.7.7 +@@ -14813,7 +14893,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables ELEMENTARY_CFLAGS + and ELEMENTARY_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details." "$LINENO" 5 +- + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -14829,7 +14908,6 @@ See the pkg-config man page for more det + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details" "$LINENO" 5; } +- + else + ELEMENTARY_CFLAGS=$pkg_cv_ELEMENTARY_CFLAGS + ELEMENTARY_LIBS=$pkg_cv_ELEMENTARY_LIBS +@@ -14855,6 +14933,7 @@ if test -n "$ELEMENTARY_ECORE_IMF_CFLAGS + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags "ecore-imf >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14871,6 +14950,7 @@ if test -n "$ELEMENTARY_ECORE_IMF_LIBS"; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_ECORE_IMF_LIBS=`$PKG_CONFIG --libs "ecore-imf >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14890,9 +14970,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-imf >= 1.7.7" 2>&1` ++ ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-imf >= 1.7.7" 2>&1` + else +- ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-imf >= 1.7.7" 2>&1` ++ ELEMENTARY_ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-imf >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_ECORE_IMF_PKG_ERRORS" >&5 +@@ -14942,6 +15022,7 @@ if test -n "$ELEMENTARY_ECORE_CON_CFLAGS + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_ECORE_CON_CFLAGS=`$PKG_CONFIG --cflags "ecore-con >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14958,6 +15039,7 @@ if test -n "$ELEMENTARY_ECORE_CON_LIBS"; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_ECORE_CON_LIBS=`$PKG_CONFIG --libs "ecore-con >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -14977,9 +15059,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-con >= 1.7.7" 2>&1` ++ ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-con >= 1.7.7" 2>&1` + else +- ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-con >= 1.7.7" 2>&1` ++ ELEMENTARY_ECORE_CON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-con >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_ECORE_CON_PKG_ERRORS" >&5 +@@ -15029,6 +15111,7 @@ if test -n "$EIO_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EIO_CFLAGS=`$PKG_CONFIG --cflags "eio" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15045,6 +15128,7 @@ if test -n "$EIO_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EIO_LIBS=`$PKG_CONFIG --libs "eio" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15064,9 +15148,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eio" 2>&1` ++ EIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eio" 2>&1` + else +- EIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "eio" 2>&1` ++ EIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eio" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EIO_PKG_ERRORS" >&5 +@@ -15123,6 +15207,7 @@ if test -n "$EMOTION_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EMOTION_CFLAGS=`$PKG_CONFIG --cflags "emotion" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15139,6 +15224,7 @@ if test -n "$EMOTION_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EMOTION_LIBS=`$PKG_CONFIG --libs "emotion" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15158,9 +15244,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EMOTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "emotion" 2>&1` ++ EMOTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "emotion" 2>&1` + else +- EMOTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "emotion" 2>&1` ++ EMOTION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "emotion" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EMOTION_PKG_ERRORS" >&5 +@@ -15218,6 +15304,7 @@ if test -n "$ELEMENTARY_X_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_X_CFLAGS=`$PKG_CONFIG --cflags "ecore-x >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15234,6 +15321,7 @@ if test -n "$ELEMENTARY_X_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_X_LIBS=`$PKG_CONFIG --libs "ecore-x >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15253,9 +15341,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-x >= 1.7.7" 2>&1` ++ ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-x >= 1.7.7" 2>&1` + else +- ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-x >= 1.7.7" 2>&1` ++ ELEMENTARY_X_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-x >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_X_PKG_ERRORS" >&5 +@@ -15312,6 +15400,7 @@ if test -n "$ELEMENTARY_FB_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_FB_CFLAGS=`$PKG_CONFIG --cflags "ecore-fb >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15328,6 +15417,7 @@ if test -n "$ELEMENTARY_FB_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_FB_LIBS=`$PKG_CONFIG --libs "ecore-fb >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15347,9 +15437,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-fb >= 1.7.7" 2>&1` ++ ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-fb >= 1.7.7" 2>&1` + else +- ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-fb >= 1.7.7" 2>&1` ++ ELEMENTARY_FB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-fb >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_FB_PKG_ERRORS" >&5 +@@ -15405,6 +15495,7 @@ if test -n "$ELEMENTARY_PSL1GHT_CFLAGS"; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_PSL1GHT_CFLAGS=`$PKG_CONFIG --cflags "ecore-psl1ght >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15421,6 +15512,7 @@ if test -n "$ELEMENTARY_PSL1GHT_LIBS"; t + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_PSL1GHT_LIBS=`$PKG_CONFIG --libs "ecore-psl1ght >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15440,9 +15532,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-psl1ght >= 1.7.7" 2>&1` ++ ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-psl1ght >= 1.7.7" 2>&1` + else +- ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-psl1ght >= 1.7.7" 2>&1` ++ ELEMENTARY_PSL1GHT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-psl1ght >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_PSL1GHT_PKG_ERRORS" >&5 +@@ -15498,6 +15590,7 @@ if test -n "$ELEMENTARY_SDL_CFLAGS"; the + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_SDL_CFLAGS=`$PKG_CONFIG --cflags "ecore-sdl >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15514,6 +15607,7 @@ if test -n "$ELEMENTARY_SDL_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_SDL_LIBS=`$PKG_CONFIG --libs "ecore-sdl >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15533,9 +15627,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-sdl >= 1.7.7" 2>&1` ++ ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-sdl >= 1.7.7" 2>&1` + else +- ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-sdl >= 1.7.7" 2>&1` ++ ELEMENTARY_SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-sdl >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_SDL_PKG_ERRORS" >&5 +@@ -15591,6 +15685,7 @@ if test -n "$ELEMENTARY_COCOA_CFLAGS"; t + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_COCOA_CFLAGS=`$PKG_CONFIG --cflags "ecore-cocoa >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15607,6 +15702,7 @@ if test -n "$ELEMENTARY_COCOA_LIBS"; the + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_COCOA_LIBS=`$PKG_CONFIG --libs "ecore-cocoa >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15626,9 +15722,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-cocoa >= 1.7.7" 2>&1` ++ ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-cocoa >= 1.7.7" 2>&1` + else +- ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-cocoa >= 1.7.7" 2>&1` ++ ELEMENTARY_COCOA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-cocoa >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_COCOA_PKG_ERRORS" >&5 +@@ -15684,6 +15780,7 @@ if test -n "$ELEMENTARY_WIN32_CFLAGS"; t + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_WIN32_CFLAGS=`$PKG_CONFIG --cflags "ecore-win32 >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15700,6 +15797,7 @@ if test -n "$ELEMENTARY_WIN32_LIBS"; the + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_WIN32_LIBS=`$PKG_CONFIG --libs "ecore-win32 >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15719,9 +15817,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-win32 >= 1.7.7" 2>&1` ++ ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-win32 >= 1.7.7" 2>&1` + else +- ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-win32 >= 1.7.7" 2>&1` ++ ELEMENTARY_WIN32_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-win32 >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_WIN32_PKG_ERRORS" >&5 +@@ -15777,6 +15875,7 @@ if test -n "$ELEMENTARY_WINCE_CFLAGS"; t + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_WINCE_CFLAGS=`$PKG_CONFIG --cflags "ecore-wince >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15793,6 +15892,7 @@ if test -n "$ELEMENTARY_WINCE_LIBS"; the + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_WINCE_LIBS=`$PKG_CONFIG --libs "ecore-wince >= 1.7.7" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15812,9 +15912,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-wince >= 1.7.7" 2>&1` ++ ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-wince >= 1.7.7" 2>&1` + else +- ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-wince >= 1.7.7" 2>&1` ++ ELEMENTARY_WINCE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-wince >= 1.7.7" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_WINCE_PKG_ERRORS" >&5 +@@ -15870,6 +15970,7 @@ if test -n "$ELEMENTARY_WAYLAND_CFLAGS"; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "ecore-wayland" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15886,6 +15987,7 @@ if test -n "$ELEMENTARY_WAYLAND_LIBS"; t + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ELEMENTARY_WAYLAND_LIBS=`$PKG_CONFIG --libs "ecore-wayland" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15905,9 +16007,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-wayland" 2>&1` ++ ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-wayland" 2>&1` + else +- ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-wayland" 2>&1` ++ ELEMENTARY_WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-wayland" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ELEMENTARY_WAYLAND_PKG_ERRORS" >&5 +@@ -15970,6 +16072,7 @@ if test -n "$ELEMENTARY_EDBUS_CFLAGS"; t + pkg_cv_ELEMENTARY_EDBUS_CFLAGS=`$PKG_CONFIG --cflags " + edbus >= 1.7.7 + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -15992,6 +16095,7 @@ if test -n "$ELEMENTARY_EDBUS_LIBS"; the + pkg_cv_ELEMENTARY_EDBUS_LIBS=`$PKG_CONFIG --libs " + edbus >= 1.7.7 + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16011,11 +16115,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + edbus >= 1.7.7 + " 2>&1` + else +- ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ELEMENTARY_EDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + edbus >= 1.7.7 + " 2>&1` + fi +@@ -16088,6 +16192,7 @@ if test -n "$ELEMENTARY_EFREET_CFLAGS"; + efreet-mime >= 1.7.7 + efreet-trash >= 1.7.7 + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16116,6 +16221,7 @@ if test -n "$ELEMENTARY_EFREET_LIBS"; th + efreet-mime >= 1.7.7 + efreet-trash >= 1.7.7 + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16135,13 +16241,13 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + efreet >= 1.7.7 + efreet-mime >= 1.7.7 + efreet-trash >= 1.7.7 + " 2>&1` + else +- ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ELEMENTARY_EFREET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + efreet >= 1.7.7 + efreet-mime >= 1.7.7 + efreet-trash >= 1.7.7 +@@ -16210,6 +16316,7 @@ if test -n "$ELEMENTARY_EWEATHER_CFLAGS" + pkg_cv_ELEMENTARY_EWEATHER_CFLAGS=`$PKG_CONFIG --cflags " + eweather + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16232,6 +16339,7 @@ if test -n "$ELEMENTARY_EWEATHER_LIBS"; + pkg_cv_ELEMENTARY_EWEATHER_LIBS=`$PKG_CONFIG --libs " + eweather + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16251,11 +16359,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + eweather + " 2>&1` + else +- ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ELEMENTARY_EWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + eweather + " 2>&1` + fi +@@ -16322,6 +16430,7 @@ if test -n "$ELEMENTARY_EMAP_CFLAGS"; th + pkg_cv_ELEMENTARY_EMAP_CFLAGS=`$PKG_CONFIG --cflags " + emap + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16344,6 +16453,7 @@ if test -n "$ELEMENTARY_EMAP_LIBS"; then + pkg_cv_ELEMENTARY_EMAP_LIBS=`$PKG_CONFIG --libs " + emap + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16363,11 +16473,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + emap + " 2>&1` + else +- ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ELEMENTARY_EMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + emap + " 2>&1` + fi +@@ -16436,6 +16546,7 @@ if test -n "$ELEMENTARY_ETHUMB_CFLAGS"; + pkg_cv_ELEMENTARY_ETHUMB_CFLAGS=`$PKG_CONFIG --cflags " + ethumb_client + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16458,6 +16569,7 @@ if test -n "$ELEMENTARY_ETHUMB_LIBS"; th + pkg_cv_ELEMENTARY_ETHUMB_LIBS=`$PKG_CONFIG --libs " + ethumb_client + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16477,11 +16589,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + ethumb_client + " 2>&1` + else +- ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ELEMENTARY_ETHUMB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + ethumb_client + " 2>&1` + fi +@@ -16548,6 +16660,7 @@ if test -n "$ELEMENTARY_WEB_CFLAGS"; the + pkg_cv_ELEMENTARY_WEB_CFLAGS=`$PKG_CONFIG --cflags " + ewebkit + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16570,6 +16683,7 @@ if test -n "$ELEMENTARY_WEB_LIBS"; then + pkg_cv_ELEMENTARY_WEB_LIBS=`$PKG_CONFIG --libs " + ewebkit + " 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -16589,11 +16703,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + ewebkit + " 2>&1` + else +- ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ELEMENTARY_WEB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + ewebkit + " 2>&1` + fi +@@ -16804,7 +16918,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_efl_have_doxygen="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -16853,7 +16967,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_efl_have_doxygen="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -17008,6 +17122,13 @@ fi + + + ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + $as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +@@ -17115,7 +17236,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -19090,14 +19211,15 @@ extern char **environ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : ++if ac_fn_c_try_link "$LINENO"; then : + + + $as_echo "#define HAVE_ENVIRON 1" >>confdefs.h + + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -19114,14 +19236,15 @@ clearenv(); + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : ++if ac_fn_c_try_link "$LINENO"; then : + + + $as_echo "#define HAVE_CLEARENV 1" >>confdefs.h + + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + ac_config_files="$ac_config_files Makefile elementary.spec elementary.pc doc/Makefile doc/Doxyfile doc/widgets/Makefile src/Makefile src/lib/Makefile src/lib/Elementary.h src/bin/Makefile src/modules/Makefile src/modules/access_output/Makefile src/modules/datetime_input_ctxpopup/Makefile src/modules/test_entry/Makefile src/modules/test_map/Makefile src/edje_externals/Makefile src/examples/Makefile data/Makefile data/themes/Makefile data/images/Makefile data/objects/Makefile data/desktop/Makefile data/edje_externals/Makefile config/Makefile config/default/Makefile config/standard/Makefile config/mobile/Makefile $po_makefile_in" + +@@ -19234,6 +19357,14 @@ LIBOBJS=$ac_libobjs + LTLIBOBJS=$ac_ltlibobjs + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 ++$as_echo_n "checking that generated files are newer than configure... " >&6; } ++ if test -n "$am_sleep_pid"; then ++ # Hide warnings about reused PIDs. ++ wait $am_sleep_pid 2>/dev/null ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 ++$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +@@ -19609,16 +19740,16 @@ if (echo >conf$$.file) 2>/dev/null; then + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -19678,28 +19809,16 @@ else + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -19721,7 +19840,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri + # values after options handling. + ac_log=" + This file was extended by elementary $as_me 1.7.7, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -19787,10 +19906,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + elementary config.status 1.7.7 +-configured by $0, generated by GNU Autoconf 2.68, ++configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2010 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -19881,7 +20000,7 @@ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' +@@ -20829,7 +20948,7 @@ $as_echo "$as_me: executing $ac_file com + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { +- # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in +@@ -20842,7 +20961,7 @@ $as_echo "$as_me: executing $ac_file com + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but ++ # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +@@ -20876,21 +20995,19 @@ $as_echo X"$mf" | + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. ++ # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue ++ test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || |