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 /graphics/evas | |
| 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 'graphics/evas')
| -rw-r--r-- | graphics/evas/Makefile | 4 | ||||
| -rw-r--r-- | graphics/evas/Makefile.common | 25 | ||||
| -rw-r--r-- | graphics/evas/PLIST | 6 | ||||
| -rw-r--r-- | graphics/evas/buildlink3.mk | 6 | ||||
| -rw-r--r-- | graphics/evas/distinfo | 14 | ||||
| -rw-r--r-- | graphics/evas/patches/patch-configure | 2678 | ||||
| -rw-r--r-- | graphics/evas/patches/patch-configure.ac | 12 | ||||
| -rw-r--r-- | graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c | 4 |
8 files changed, 2708 insertions, 41 deletions
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile index d4c199b8b58..f2ed5d9f66b 100644 --- a/graphics/evas/Makefile +++ b/graphics/evas/Makefile @@ -1,7 +1,5 @@ -# $NetBSD: Makefile,v 1.13 2013/06/04 22:16:16 tron Exp $ +# $NetBSD: Makefile,v 1.14 2013/06/16 18:56:05 sno Exp $ -PKGNAME= evas-${EVAS_VERSION} -PKGREVISION= 2 COMMENT= Enlightened Canvas Library .include "Makefile.common" diff --git a/graphics/evas/Makefile.common b/graphics/evas/Makefile.common index b70f6d0fa23..cae1f69f282 100644 --- a/graphics/evas/Makefile.common +++ b/graphics/evas/Makefile.common @@ -1,7 +1,20 @@ -# $NetBSD: Makefile.common,v 1.12 2012/10/06 14:10:47 asau Exp $ +# $NetBSD: Makefile.common,v 1.13 2013/06/16 18:56:05 sno Exp $ + +# used by graphics/evas-buffer/Makefile +# used by graphics/evas-edb/Makefile +# used by graphics/evas-eet/Makefile +# used by graphics/evas-gif/Makefile +# used by graphics/evas-jpeg/Makefile +# used by graphics/evas-pmaps/Makefile # used by graphics/evas-png/Makefile +# used by graphics/evas-sdl/Makefile +# used by graphics/evas-sdl-16/Makefile +# used by graphics/evas-software-x11/Makefile +# used by graphics/evas-svg/Makefile +# used by graphics/evas-tiff/Makefile +# used by graphics/evas-xpm/Makefile -EVAS_VERSION= 1.1.0 +EVAS_VERSION= 1.7.7 DISTNAME= evas-${EVAS_VERSION} CATEGORIES= graphics MASTER_SITES= http://download.enlightenment.org/releases/ @@ -9,6 +22,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://enlightenment.org/ +LICENSE= 2-clause-bsd DISTINFO_FILE= ${.CURDIR}/../../graphics/evas/distinfo PATCHDIR= ${.CURDIR}/../../graphics/evas/patches @@ -20,7 +34,7 @@ USE_TOOLS+= gmake pkg-config .for mod in software-ddraw software-16-ddraw direct3d software-16-wince \ software-xlib software-16-x11 software-xcb directfb sdl \ sdl-primitive fb buffer software-qtopia gl-xlib quartz gl-glew \ - xrender-x11 xrender-xcb glitz-x11 + xrender-x11 xrender-xcb glitz-x11 wayland-shm wayland-egl . if defined(EVAS_ENGINES) && !empty(EVAS_ENGINES:M${mod}) CONFIGURE_ARGS+= --enable-${mod} . else @@ -36,13 +50,16 @@ CONFIGURE_ARGS+= --disable-image-loader-${mod} . endif .endfor +CONFIGURE_ENV+= ACLOCAL=: AUTOCONF=: AUTOMAKE=: + .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:M*-powerpc) CONFIGURE_ARGS+= --enable-cpu-altivec .endif -MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-1.1.0 +# currently it is like it is +MODULE_ARCH= ${LOWER_OPSYS}-${LOWER_ARCH}-${EVAS_VERSION} PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH} PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") } diff --git a/graphics/evas/PLIST b/graphics/evas/PLIST index a3ae3d8627b..c9be75f2717 100644 --- a/graphics/evas/PLIST +++ b/graphics/evas/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2011/12/05 17:33:32 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2013/06/16 18:56:05 sno Exp $ include/evas-1/Evas.h +include/evas-1/Evas_GL.h lib/evas/modules/engines/software_generic/${MODULE_ARCH}/module.la lib/evas/modules/loaders/bmp/${MODULE_ARCH}/module.la lib/evas/modules/loaders/generic/${MODULE_ARCH}/module.la @@ -11,6 +12,7 @@ lib/libevas.la lib/pkgconfig/evas.pc share/doc/evas/AUTHORS share/doc/evas/COPYING +share/evas/checkme share/evas/examples/aspect.edc share/evas/examples/cube1.png share/evas/examples/enlightenment.png @@ -21,9 +23,11 @@ share/evas/examples/evas-events.c share/evas/examples/evas-hints.c share/evas/examples/evas-images.c share/evas/examples/evas-images2.c +share/evas/examples/evas-images3.c share/evas/examples/evas-init-shutdown.c share/evas/examples/evas-map-utils.c share/evas/examples/evas-object-manipulation.c +share/evas/examples/evas-smart-interface.c share/evas/examples/evas-smart-object.c share/evas/examples/evas-stacking.c share/evas/examples/evas-text.c diff --git a/graphics/evas/buildlink3.mk b/graphics/evas/buildlink3.mk index e323a430955..3417e2925cd 100644 --- a/graphics/evas/buildlink3.mk +++ b/graphics/evas/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2013/06/04 22:16:16 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2013/06/16 18:56:05 sno Exp $ BUILDLINK_TREE+= evas .if !defined(EVAS_BUILDLINK3_MK) EVAS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.evas+= evas>=1.1.0beta -BUILDLINK_ABI_DEPENDS.evas?= evas>=1.1.0nb2 +BUILDLINK_API_DEPENDS.evas+= evas>=1.7.7 +BUILDLINK_ABI_DEPENDS.evas?= evas>=1.7.7 BUILDLINK_PKGSRCDIR.evas?= ../../graphics/evas .include "../../devel/eet/buildlink3.mk" diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo index 591d4a3bca1..cd2d408b5e2 100644 --- a/graphics/evas/distinfo +++ b/graphics/evas/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2012/09/27 13:20:42 jperkin Exp $ +$NetBSD: distinfo,v 1.13 2013/06/16 18:56:05 sno Exp $ -SHA1 (evas-1.1.0.tar.bz2) = e09daebd5aa14ecdff94bca0ff30a4cf70b3b84b -RMD160 (evas-1.1.0.tar.bz2) = ebad0e5b4f3987ee9a29b39f329afb650eafeb20 -Size (evas-1.1.0.tar.bz2) = 9235732 bytes -SHA1 (patch-configure) = 134e4585671677a7e06b36f8915ca7e1fe78e52b -SHA1 (patch-configure.ac) = 890c2e38922ed2c3d85de1660cad6634e6b2e742 -SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = e65edd1214a926986a1a8206c955f5351308c306 +SHA1 (evas-1.7.7.tar.bz2) = 680e85a60363df84b81298138cc19629f9f139bc +RMD160 (evas-1.7.7.tar.bz2) = 306b36018c5ab07712553a554e4a2deac13854ed +Size (evas-1.7.7.tar.bz2) = 9408256 bytes +SHA1 (patch-configure) = b7bda6085449a0fdcc51d58371101bb2f8bbc232 +SHA1 (patch-configure.ac) = d9330c131859794beb29414c9afe66a08b6fe55d +SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 386f375a68eb4d49b05cc69c041641d11c306082 diff --git a/graphics/evas/patches/patch-configure b/graphics/evas/patches/patch-configure index 473794eec13..ab1cb8a5ea8 100644 --- a/graphics/evas/patches/patch-configure +++ b/graphics/evas/patches/patch-configure @@ -1,25 +1,2677 @@ -$NetBSD: patch-configure,v 1.5 2012/09/27 13:20:42 jperkin Exp $ +$NetBSD: patch-configure,v 1.6 2013/06/16 18:56:05 sno Exp $ ---- configure.orig Fri Dec 2 07:42:00 2011 -+++ configure Thu Sep 27 13:05:49 2012 -@@ -12100,8 +12100,11 @@ +Recreated using autoreconf -i because of applying failed + +--- configure.orig 2013-06-15 09:41:05.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 evas 1.7.7. ++# Generated by GNU Autoconf 2.69 for evas 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'" +@@ -1721,8 +1741,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 +@@ -1890,10 +1908,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] +@@ -2254,9 +2274,9 @@ test -n "$ac_init_help" && exit $ac_stat + if $ac_init_version; then + cat <<\_ACEOF + evas 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 +@@ -2533,7 +2553,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 +@@ -2684,7 +2704,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 +@@ -2805,7 +2825,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 +@@ -2841,7 +2861,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= 0)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2857,7 +2878,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2883,7 +2905,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) < 0)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2899,7 +2922,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -2933,7 +2957,8 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0 ++test_array [0] = 0; ++return test_array [0]; + + ; + return 0; +@@ -3106,7 +3131,7 @@ This file contains any messages produced + running configure, to aid debugging if configure makes a mistake. + + It was created by evas $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 $@ + +@@ -3462,7 +3487,7 @@ ac_config_headers="$ac_config_headers co + + + +-am__api_version='1.11' ++am__api_version='1.13' + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +@@ -3530,7 +3555,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. +@@ -3588,9 +3613,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=' +@@ -3601,32 +3623,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 +@@ -3638,6 +3668,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. +@@ -3660,12 +3700,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 +@@ -3677,10 +3717,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. +@@ -3699,7 +3739,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 +@@ -3739,7 +3779,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 +@@ -3790,7 +3830,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) '* | \ +@@ -3819,12 +3859,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. +@@ -3843,7 +3877,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 +@@ -3907,6 +3941,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." +@@ -3957,27 +4030,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 +@@ -4028,7 +4112,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 +@@ -4094,7 +4178,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 +@@ -4134,7 +4218,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 +@@ -4187,7 +4271,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 +@@ -4228,7 +4312,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 +@@ -4286,7 +4370,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 +@@ -4330,7 +4414,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 +@@ -4776,8 +4860,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); +@@ -4873,8 +4956,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 +@@ -4909,16 +4992,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 +@@ -4927,8 +5010,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 +@@ -4936,7 +5019,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} +@@ -5145,7 +5228,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 +@@ -5211,7 +5294,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 +@@ -5418,8 +5501,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 () + { +@@ -5543,7 +5626,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 +@@ -5583,7 +5666,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 +@@ -5635,7 +5718,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 +@@ -5675,7 +5758,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 +@@ -5727,7 +5810,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 +@@ -5767,7 +5850,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 +@@ -5941,7 +6024,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 +@@ -6020,7 +6103,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 +@@ -6276,7 +6359,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 +@@ -6320,7 +6403,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 +@@ -6744,7 +6827,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 +@@ -6784,7 +6867,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 +@@ -7087,7 +7170,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 +@@ -7127,7 +7210,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 +@@ -7227,7 +7310,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 +@@ -7271,7 +7354,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 +@@ -7396,7 +7479,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 +@@ -7436,7 +7519,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 +@@ -7495,7 +7578,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 +@@ -7535,7 +7618,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 +@@ -8184,7 +8267,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 +@@ -8224,7 +8307,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 +@@ -8304,7 +8387,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 +@@ -8344,7 +8427,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 +@@ -8396,7 +8479,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 +@@ -8436,7 +8519,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 +@@ -8488,7 +8571,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 +@@ -8528,7 +8611,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 +@@ -8580,7 +8663,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 +@@ -8620,7 +8703,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 +@@ -8672,7 +8755,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 +@@ -8712,7 +8795,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 +@@ -12977,8 +13060,11 @@ case "$host_os" in mingw32ce*) MODULE_ARCH="$host_os-$host_cpu" ;; + solaris*) -+ MODULE_ARCH="solaris-$host_cpu-1.1.0" ++ MODULE_ARCH="solaris-$host_cpu-1.7.7" + ;; *) -- MODULE_ARCH="$host_os-$host_cpu-1.1.0" -+ MODULE_ARCH="${host_os%-gnu}-$host_cpu-1.1.0" +- MODULE_ARCH="$host_os-$host_cpu-1.7.7" ++ MODULE_ARCH="${host_os%-gnu}-$host_cpu-1.7.7" ;; esac -@@ -19846,6 +19849,7 @@ - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -13130,7 +13216,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_OBJC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13174,7 +13260,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_OBJC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13368,8 +13454,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 +@@ -13402,16 +13488,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 +@@ -13420,8 +13506,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 +@@ -13429,7 +13515,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} +@@ -13495,8 +13581,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 +@@ -13529,16 +13615,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 +@@ -13547,8 +13633,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 +@@ -13556,7 +13642,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} +@@ -13681,7 +13767,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_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13725,7 +13811,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_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -13921,8 +14007,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 +@@ -13957,16 +14043,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 +@@ -13975,8 +14061,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 +@@ -13984,7 +14070,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} +@@ -17263,7 +17349,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 +@@ -17303,7 +17389,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 +@@ -17356,7 +17442,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 +@@ -17397,7 +17483,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 +@@ -17455,7 +17541,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 +@@ -17499,7 +17585,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 +@@ -17695,8 +17781,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); +@@ -17792,8 +17877,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 +@@ -17828,16 +17913,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 +@@ -17846,8 +17931,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 +@@ -17855,7 +17940,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} +@@ -17917,6 +18002,7 @@ 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. +@@ -17937,7 +18023,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 +@@ -17980,7 +18066,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 +@@ -18087,7 +18173,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 +@@ -18136,7 +18222,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 +@@ -18220,6 +18306,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 >= 1.0.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18236,6 +18323,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 >= 1.0.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18255,9 +18343,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 >= 1.0.0" 2>&1` ++ EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evil >= 1.0.0" 2>&1` + else +- EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1` ++ EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evil >= 1.0.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EVIL_PKG_ERRORS" >&5 +@@ -18272,7 +18360,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; } +@@ -18288,7 +18375,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 +@@ -18320,6 +18406,7 @@ if test -n "$EXOTIC_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EXOTIC_CFLAGS=`$PKG_CONFIG --cflags "exotic" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18336,6 +18423,7 @@ if test -n "$EXOTIC_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EXOTIC_LIBS=`$PKG_CONFIG --libs "exotic" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18355,9 +18443,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exotic" 2>&1` ++ EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "exotic" 2>&1` + else +- EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors "exotic" 2>&1` ++ EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "exotic" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EXOTIC_PKG_ERRORS" >&5 +@@ -18409,6 +18497,7 @@ if test -n "$EINA_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.6.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18425,6 +18514,7 @@ if test -n "$EINA_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.6.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18444,9 +18534,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina >= 1.6.0" 2>&1` ++ EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eina >= 1.6.0" 2>&1` + else +- EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina >= 1.6.0" 2>&1` ++ EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eina >= 1.6.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EINA_PKG_ERRORS" >&5 +@@ -18461,7 +18551,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables EINA_CFLAGS + and EINA_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details." "$LINENO" 5 +- + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -18477,7 +18566,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 + EINA_CFLAGS=$pkg_cv_EINA_CFLAGS + EINA_LIBS=$pkg_cv_EINA_LIBS +@@ -18539,6 +18627,7 @@ if test -n "$FREETYPE_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 9.3.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18555,6 +18644,7 @@ if test -n "$FREETYPE_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 9.3.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18574,9 +18664,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2 >= 9.3.0" 2>&1` ++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 >= 9.3.0" 2>&1` + else +- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2 >= 9.3.0" 2>&1` ++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 >= 9.3.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FREETYPE_PKG_ERRORS" >&5 +@@ -18591,7 +18681,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables FREETYPE_CFLAGS + and FREETYPE_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; } +@@ -18607,7 +18696,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 + FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS + FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS +@@ -18651,6 +18739,7 @@ if test -n "$FONTCONFIG_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.5.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18667,6 +18756,7 @@ if test -n "$FONTCONFIG_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.5.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18686,9 +18776,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig >= 2.5.0" 2>&1` ++ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig >= 2.5.0" 2>&1` + else +- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig >= 2.5.0" 2>&1` ++ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig >= 2.5.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FONTCONFIG_PKG_ERRORS" >&5 +@@ -18788,6 +18878,7 @@ if test -n "$FRIBIDI_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FRIBIDI_CFLAGS=`$PKG_CONFIG --cflags "fribidi >= 0.19.2" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18804,6 +18895,7 @@ if test -n "$FRIBIDI_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FRIBIDI_LIBS=`$PKG_CONFIG --libs "fribidi >= 0.19.2" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18823,9 +18915,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fribidi >= 0.19.2" 2>&1` ++ FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fribidi >= 0.19.2" 2>&1` + else +- FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors "fribidi >= 0.19.2" 2>&1` ++ FRIBIDI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fribidi >= 0.19.2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FRIBIDI_PKG_ERRORS" >&5 +@@ -18930,6 +19022,7 @@ if test -n "$HARFBUZZ_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HARFBUZZ_CFLAGS=`$PKG_CONFIG --cflags "harfbuzz >= 0.9.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18946,6 +19039,7 @@ if test -n "$HARFBUZZ_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_HARFBUZZ_LIBS=`$PKG_CONFIG --libs "harfbuzz >= 0.9.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -18965,9 +19059,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "harfbuzz >= 0.9.0" 2>&1` ++ HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "harfbuzz >= 0.9.0" 2>&1` + else +- HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors "harfbuzz >= 0.9.0" 2>&1` ++ HARFBUZZ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "harfbuzz >= 0.9.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HARFBUZZ_PKG_ERRORS" >&5 +@@ -19059,6 +19153,7 @@ if test -n "$PIXMAN_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "pixman-1" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -19075,6 +19170,7 @@ if test -n "$PIXMAN_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PIXMAN_LIBS=`$PKG_CONFIG --libs "pixman-1" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -19094,9 +19190,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pixman-1" 2>&1` ++ PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pixman-1" 2>&1` + else +- PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "pixman-1" 2>&1` ++ PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pixman-1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PIXMAN_PKG_ERRORS" >&5 +@@ -19427,11 +19523,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; +@@ -19448,8 +19544,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; +@@ -19465,10 +19562,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; +@@ -19870,7 +19967,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 : +@@ -19910,8 +20007,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); +@@ -20309,6 +20405,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> +@@ -20412,23 +20510,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 : +@@ -21681,6 +21776,7 @@ if test -n "$SDL_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -21697,6 +21793,7 @@ if test -n "$SDL_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -21716,9 +21813,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1` ++ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + else +- SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1` ++ SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SDL_PKG_ERRORS" >&5 +@@ -21733,7 +21830,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables SDL_CFLAGS + and SDL_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; } +@@ -21749,7 +21845,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 + SDL_CFLAGS=$pkg_cv_SDL_CFLAGS + SDL_LIBS=$pkg_cv_SDL_LIBS +@@ -22063,6 +22158,7 @@ if test -n "$GL_EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -22079,6 +22175,7 @@ if test -n "$GL_EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -22098,9 +22195,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + else +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_EET_PKG_ERRORS" >&5 +@@ -22346,6 +22443,7 @@ if test -n "$DIRECTFB_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.16" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -22362,6 +22460,7 @@ if test -n "$DIRECTFB_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.16" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -22381,9 +22480,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= 0.9.16" 2>&1` ++ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "directfb >= 0.9.16" 2>&1` + else +- DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= 0.9.16" 2>&1` ++ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "directfb >= 0.9.16" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DIRECTFB_PKG_ERRORS" >&5 +@@ -22398,7 +22497,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables DIRECTFB_CFLAGS + and DIRECTFB_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; } +@@ -22414,7 +22512,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 + DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS + DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS +@@ -22550,6 +22647,7 @@ if test -n "$XCB_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -22566,6 +22664,7 @@ if test -n "$XCB_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -22585,9 +22684,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` ++ XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + else +- XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` ++ XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XCB_PKG_ERRORS" >&5 +@@ -23735,6 +23834,7 @@ if test -n "$SDL_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -23751,6 +23851,7 @@ if test -n "$SDL_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -23770,9 +23871,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1` ++ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + else +- SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1` ++ SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SDL_PKG_ERRORS" >&5 +@@ -23787,7 +23888,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables SDL_CFLAGS + and SDL_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; } +@@ -23803,7 +23903,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 + SDL_CFLAGS=$pkg_cv_SDL_CFLAGS + SDL_LIBS=$pkg_cv_SDL_LIBS +@@ -24042,6 +24141,7 @@ if test -n "$WAYLAND_EGL_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WAYLAND_EGL_CFLAGS=`$PKG_CONFIG --cflags "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -24058,6 +24158,7 @@ if test -n "$WAYLAND_EGL_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -24077,9 +24178,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` ++ WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` + else +- WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` ++ WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$WAYLAND_EGL_PKG_ERRORS" >&5 +@@ -24124,6 +24225,7 @@ if test -n "$GL_EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -24140,6 +24242,7 @@ if test -n "$GL_EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -24159,9 +24262,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + else +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_EET_PKG_ERRORS" >&5 +@@ -24417,6 +24520,7 @@ if test -n "$XCB_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -24433,6 +24537,7 @@ if test -n "$XCB_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -24452,9 +24557,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` ++ XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + else +- XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` ++ XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb xcb-shm xcb-image >= 0.2.1 pixman-1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XCB_PKG_ERRORS" >&5 +@@ -26490,6 +26595,7 @@ if test -n "$XCB_GL_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XCB_GL_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -26506,6 +26612,7 @@ if test -n "$XCB_GL_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XCB_GL_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -26525,9 +26632,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XCB_GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` ++ XCB_GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` + else +- XCB_GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` ++ XCB_GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XCB_GL_PKG_ERRORS" >&5 +@@ -26576,6 +26683,7 @@ if test -n "$GL_EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -26592,6 +26700,7 @@ if test -n "$GL_EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -26611,9 +26720,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + else +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_EET_PKG_ERRORS" >&5 +@@ -26720,6 +26829,7 @@ if test -n "$GL_EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -26736,6 +26846,7 @@ if test -n "$GL_EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -26755,9 +26866,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + else +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_EET_PKG_ERRORS" >&5 +@@ -27811,6 +27922,7 @@ if test -n "$GL_EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -27827,6 +27939,7 @@ if test -n "$GL_EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -27846,9 +27959,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + else +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_EET_PKG_ERRORS" >&5 +@@ -27960,6 +28073,7 @@ if test -n "$GL_EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -27976,6 +28090,7 @@ if test -n "$GL_EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GL_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.99" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -27995,9 +28110,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + else +- GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.99" 2>&1` ++ GL_EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.99" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_EET_PKG_ERRORS" >&5 +@@ -28393,6 +28508,7 @@ if test -n "$EDB_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EDB_CFLAGS=`$PKG_CONFIG --cflags "edb" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -28409,6 +28525,7 @@ if test -n "$EDB_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EDB_LIBS=`$PKG_CONFIG --libs "edb" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -28428,9 +28545,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "edb" 2>&1` ++ EDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "edb" 2>&1` + else +- EDB_PKG_ERRORS=`$PKG_CONFIG --print-errors "edb" 2>&1` ++ EDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "edb" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EDB_PKG_ERRORS" >&5 +@@ -28575,6 +28692,7 @@ if test -n "$EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -28591,6 +28709,7 @@ if test -n "$EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -28610,9 +28729,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.0" 2>&1` ++ EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + else +- EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.0" 2>&1` ++ EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EET_PKG_ERRORS" >&5 +@@ -28735,6 +28854,7 @@ if test -n "$EET_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.6.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -28751,6 +28871,7 @@ if test -n "$EET_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.6.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -28770,9 +28891,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= 1.6.0" 2>&1` ++ EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + else +- EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= 1.6.0" 2>&1` ++ EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= 1.6.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EET_PKG_ERRORS" >&5 +@@ -29385,6 +29506,7 @@ if test -n "$PNG_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2.10" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29401,6 +29523,7 @@ if test -n "$PNG_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2.10" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29420,9 +29543,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng >= 1.2.10" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2.10" 2>&1` + else +- PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng >= 1.2.10" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2.10" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PNG_PKG_ERRORS" >&5 +@@ -29456,6 +29579,7 @@ if test -n "$PNG_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng15" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29472,6 +29596,7 @@ if test -n "$PNG_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng15" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29491,9 +29616,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng15" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng15" 2>&1` + else +- PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng15" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng15" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PNG_PKG_ERRORS" >&5 +@@ -29528,6 +29653,7 @@ if test -n "$PNG_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng14" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29544,6 +29670,7 @@ if test -n "$PNG_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng14" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29563,9 +29690,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng14" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng14" 2>&1` + else +- PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng14" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng14" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PNG_PKG_ERRORS" >&5 +@@ -29600,6 +29727,7 @@ if test -n "$PNG_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng12 >= 1.2.10" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29616,6 +29744,7 @@ if test -n "$PNG_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng12 >= 1.2.10" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29635,9 +29764,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng12 >= 1.2.10" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng12 >= 1.2.10" 2>&1` + else +- PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng12 >= 1.2.10" 2>&1` ++ PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng12 >= 1.2.10" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PNG_PKG_ERRORS" >&5 +@@ -29784,6 +29913,7 @@ if test -n "$SVG_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SVG_CFLAGS=`$PKG_CONFIG --cflags "esvg >= 0.0.16" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29800,6 +29930,7 @@ if test -n "$SVG_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SVG_LIBS=`$PKG_CONFIG --libs "esvg >= 0.0.16" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -29819,9 +29950,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "esvg >= 0.0.16" 2>&1` ++ SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "esvg >= 0.0.16" 2>&1` + else +- SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "esvg >= 0.0.16" 2>&1` ++ SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "esvg >= 0.0.16" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SVG_PKG_ERRORS" >&5 +@@ -32793,6 +32924,7 @@ if test -n "$VALGRIND_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind >= 2.4.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -32809,6 +32941,7 @@ if test -n "$VALGRIND_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind >= 2.4.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -32828,9 +32961,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "valgrind >= 2.4.0" 2>&1` ++ VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind >= 2.4.0" 2>&1` + else +- VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors "valgrind >= 2.4.0" 2>&1` ++ VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind >= 2.4.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$VALGRIND_PKG_ERRORS" >&5 +@@ -32914,6 +33047,7 @@ if test -n "$ECORE_EVAS_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ECORE_EVAS_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas ecore" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -32930,6 +33064,7 @@ if test -n "$ECORE_EVAS_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ECORE_EVAS_LIBS=`$PKG_CONFIG --libs "ecore-evas ecore" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -32949,9 +33084,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas ecore" 2>&1` ++ ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore-evas ecore" 2>&1` + else +- ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas ecore" 2>&1` ++ ECORE_EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore-evas ecore" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ECORE_EVAS_PKG_ERRORS" >&5 +@@ -32983,6 +33118,7 @@ if test -n "$EDJE_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EDJE_CFLAGS=`$PKG_CONFIG --cflags "edje" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -32999,6 +33135,7 @@ if test -n "$EDJE_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_EDJE_LIBS=`$PKG_CONFIG --libs "edje" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -33018,9 +33155,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "edje" 2>&1` ++ EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "edje" 2>&1` + else +- EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors "edje" 2>&1` ++ EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "edje" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$EDJE_PKG_ERRORS" >&5 +@@ -33097,6 +33234,7 @@ if test -n "$CHECK_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -33113,6 +33251,7 @@ if test -n "$CHECK_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes + fi +@@ -33132,9 +33271,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1` ++ CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.5" 2>&1` + else +- CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1` ++ CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.5" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$CHECK_PKG_ERRORS" >&5 +@@ -33222,7 +33361,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_have_lcov="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -33413,6 +33552,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='#' +@@ -34136,16 +34283,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 +@@ -34205,28 +34352,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'" +@@ -34248,7 +34383,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri + # values after options handling. + ac_log=" + This file was extended by evas $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 +@@ -34314,10 +34449,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + evas 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." + +@@ -34408,7 +34543,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' +@@ -35523,7 +35658,7 @@ $as_echo "$as_me: executing $ac_file com -+#include <sys/stat.h> - #include <sys/types.h> - #include <sys/mman.h> - #include <fcntl.h> + 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 +@@ -35536,7 +35671,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. +@@ -35570,21 +35705,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" || diff --git a/graphics/evas/patches/patch-configure.ac b/graphics/evas/patches/patch-configure.ac index 1225ef4dae1..8b86bca7687 100644 --- a/graphics/evas/patches/patch-configure.ac +++ b/graphics/evas/patches/patch-configure.ac @@ -1,4 +1,6 @@ -$NetBSD: patch-configure.ac,v 1.3 2012/09/27 13:20:42 jperkin Exp $ +$NetBSD: patch-configure.ac,v 1.4 2013/06/16 18:56:05 sno Exp $ + +Patch for solaris nice name --- configure.ac.orig Thu Nov 17 03:25:24 2011 +++ configure.ac Thu Sep 27 13:04:34 2012 @@ -15,11 +17,3 @@ $NetBSD: patch-configure.ac,v 1.3 2012/09/27 13:20:42 jperkin Exp $ ;; esac AC_SUBST(MODULE_ARCH) -@@ -569,6 +572,7 @@ - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -+#include <sys/stat.h> - #include <sys/types.h> - #include <sys/mman.h> - #include <fcntl.h> diff --git a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c index 5e07b74d72c..0cb0390560d 100644 --- a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c +++ b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c @@ -1,4 +1,6 @@ -$NetBSD: patch-src_modules_loaders_psd_evas__image__load__psd.c,v 1.2 2012/09/27 13:20:42 jperkin Exp $ +$NetBSD: patch-src_modules_loaders_psd_evas__image__load__psd.c,v 1.3 2013/06/16 18:56:05 sno Exp $ + +jperkin knows o.O (but didn't use pkglint) --- src/modules/loaders/psd/evas_image_load_psd.c.orig 2011-08-11 07:46:01.000000000 +0200 +++ src/modules/loaders/psd/evas_image_load_psd.c 2011-12-27 15:15:11.097276116 +0100 |