We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] A simple patch

sdl.patch (text/plain), 61.18 KB, created by Steven Stewart-Gallus on 2014-04-19 23:30:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Stewart-Gallus

Created: 2014-04-19 23:30:07 UTC

Size: 61.18 KB

patch

obsolete

># HG changeset patch
># User Steven Stewart-Gallus <sstewartgallus00@mylangara.bc.ca>
># Date 1397949936 25200
># Node ID 21d0d1f8ef3e058e590c46b31df7c3177afa0ce4
># Parent  94af945dbb573f9de82036c3fa0759f495ac9a0a
>Set the tag type in libtool invocations
>
>Setting the tag type will let libtool work even when it cannot infer
>the type of the code being built. One way libtool may fail to infer
>the tag type is if one uses a mock compiler (such as for static
>analysis).
>
>diff -r 94af945dbb57 -r 21d0d1f8ef3e Makefile.in
>--- a/Makefile.in	Sat Apr 19 13:15:53 2014 -0700
>+++ b/Makefile.in	Sat Apr 19 16:25:36 2014 -0700
>@@ -123,7 +123,7 @@
> .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
> 
> $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
>-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
>+	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
> 
> $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
> 	$(AR) cru $@ $(SDLMAIN_OBJECTS)
>diff -r 94af945dbb57 -r 21d0d1f8ef3e configure
>--- a/configure	Sat Apr 19 13:15:53 2014 -0700
>+++ b/configure	Sat Apr 19 16:25:36 2014 -0700
>@@ -1,9 +1,11 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
>-# Generated by GNU Autoconf 2.69.
>+# Generated by GNU Autoconf 2.68.
> #
> #
>-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
>+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
>+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
>+# Foundation, Inc.
> #
> #
> # This configure script is free software; the Free Software Foundation
>@@ -132,31 +134,6 @@
> # 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
>@@ -190,8 +167,7 @@
> else
>   exitcode=1; echo positional parameters were not saved.
> fi
>-test x\$exitcode = x0 || exit 1
>-test -x / || exit 1"
>+test x\$exitcode = x0 || 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'\" &&
>@@ -244,25 +220,21 @@
> 
> 
>       if test "x$CONFIG_SHELL" != x; then :
>-  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
>+  # 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+"$@"}
> fi
> 
>     if test x$as_have_required = xno; then :
>@@ -364,14 +336,6 @@
> 
> 
> } # 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
>@@ -493,10 +457,6 @@
>   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).
>@@ -531,16 +491,16 @@
>     # ... 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 -pR'.
>+    # In both cases, we have to default to `cp -p'.
>     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
>-      as_ln_s='cp -pR'
>+      as_ln_s='cp -p'
>   elif ln conf$$.file conf$$ 2>/dev/null; then
>     as_ln_s=ln
>   else
>-    as_ln_s='cp -pR'
>-  fi
>-else
>-  as_ln_s='cp -pR'
>+    as_ln_s='cp -p'
>+  fi
>+else
>+  as_ln_s='cp -p'
> fi
> rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
> rmdir conf$$.dir 2>/dev/null
>@@ -552,8 +512,28 @@
>   as_mkdir_p=false
> fi
> 
>-as_test_x='test -x'
>-as_executable_p=as_fn_executable_p
>+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
> 
> # 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'"
>@@ -1320,6 +1300,8 @@
> 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
>@@ -1680,9 +1662,9 @@
> if $ac_init_version; then
>   cat <<\_ACEOF
> configure
>-generated by GNU Autoconf 2.69
>-
>-Copyright (C) 2012 Free Software Foundation, Inc.
>+generated by GNU Autoconf 2.68
>+
>+Copyright (C) 2010 Free Software Foundation, Inc.
> This configure script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it.
> _ACEOF
>@@ -1758,7 +1740,7 @@
> 	 test ! -s conftest.err
>        } && test -s conftest$ac_exeext && {
> 	 test "$cross_compiling" = yes ||
>-	 test -x conftest$ac_exeext
>+	 $as_test_x conftest$ac_exeext
>        }; then :
>   ac_retval=0
> else
>@@ -2056,7 +2038,7 @@
> 	 test ! -s conftest.err
>        } && test -s conftest$ac_exeext && {
> 	 test "$cross_compiling" = yes ||
>-	 test -x conftest$ac_exeext
>+	 $as_test_x conftest$ac_exeext
>        }; then :
>   ac_retval=0
> else
>@@ -2277,7 +2259,7 @@
> running configure, to aid debugging if configure makes a mistake.
> 
> It was created by $as_me, which was
>-generated by GNU Autoconf 2.69.  Invocation command line was
>+generated by GNU Autoconf 2.68.  Invocation command line was
> 
>   $ $0 $@
> 
>@@ -2871,7 +2853,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2911,7 +2893,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2964,7 +2946,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -3005,7 +2987,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -3063,7 +3045,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -3107,7 +3089,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -3553,7 +3535,8 @@
> /* end confdefs.h.  */
> #include <stdarg.h>
> #include <stdio.h>
>-struct stat;
>+#include <sys/types.h>
>+#include <sys/stat.h>
> /* 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);
>@@ -3660,7 +3643,7 @@
>     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"
>-      as_fn_executable_p "$ac_path_SED" || continue
>+      { test -f "$ac_path_SED" && $as_test_x "$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
>@@ -3736,7 +3719,7 @@
>     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"
>-      as_fn_executable_p "$ac_path_GREP" || continue
>+      { test -f "$ac_path_GREP" && $as_test_x "$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
>@@ -3802,7 +3785,7 @@
>     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"
>-      as_fn_executable_p "$ac_path_EGREP" || continue
>+      { test -f "$ac_path_EGREP" && $as_test_x "$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
>@@ -3869,7 +3852,7 @@
>     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"
>-      as_fn_executable_p "$ac_path_FGREP" || continue
>+      { test -f "$ac_path_FGREP" && $as_test_x "$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
>@@ -4125,7 +4108,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -4169,7 +4152,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -4593,7 +4576,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -4633,7 +4616,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -4938,7 +4921,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -4978,7 +4961,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -5079,7 +5062,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -5123,7 +5106,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -5248,7 +5231,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -5288,7 +5271,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -5347,7 +5330,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -5387,7 +5370,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -5491,7 +5474,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6078,7 +6061,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6118,7 +6101,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6198,7 +6181,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6238,7 +6221,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6290,7 +6273,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6330,7 +6313,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6382,7 +6365,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6422,7 +6405,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6474,7 +6457,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6514,7 +6497,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6566,7 +6549,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -6606,7 +6589,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -7111,7 +7094,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -7151,7 +7134,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -7203,7 +7186,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -7243,7 +7226,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -7295,7 +7278,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -7335,7 +7318,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -11429,7 +11412,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -11469,7 +11452,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -11522,7 +11505,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -11563,7 +11546,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -11621,7 +11604,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -11665,7 +11648,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -11861,7 +11844,8 @@
> /* end confdefs.h.  */
> #include <stdarg.h>
> #include <stdio.h>
>-struct stat;
>+#include <sys/types.h>
>+#include <sys/stat.h>
> /* 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);
>@@ -11974,7 +11958,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -12018,7 +12002,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -15441,7 +15425,7 @@
>     # by default.
>     for ac_prog in ginstall scoinst install; do
>       for ac_exec_ext in '' $ac_executable_extensions; do
>-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
>+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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.
>@@ -15545,7 +15529,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
>     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>@@ -15585,7 +15569,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_prog_ac_ct_WINDRES="windres"
>     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>@@ -15738,11 +15722,11 @@
> int
> main ()
> {
>-
>+/* FIXME: Include the comments suggested by Paul. */
> #ifndef __cplusplus
>-  /* Ultrix mips cc rejects this sort of thing.  */
>+  /* Ultrix mips cc rejects this.  */
>   typedef int charset[2];
>-  const charset cs = { 0, 0 };
>+  const charset cs;
>   /* SunOS 4.1.1 cc rejects this.  */
>   char const *const *pcpcc;
>   char **ppc;
>@@ -15759,9 +15743,8 @@
>   ++pcpcc;
>   ppc = (char**) pcpcc;
>   pcpcc = (char const *const *) ppc;
>-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
>-    char tx;
>-    char *t = &tx;
>+  { /* SCO 3.2v4 cc rejects this.  */
>+    char *t;
>     char const *s = 0 ? (char *) 0 : (char const *) 0;
> 
>     *t++ = 0;
>@@ -15777,10 +15760,10 @@
>     iptr p = 0;
>     ++p;
>   }
>-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
>+  { /* AIX XL C 1.02.0.0 rejects this saying
>        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
>-    struct s { int j; const int *ap[3]; } bx;
>-    struct s *b = &bx; b->j = 5;
>+    struct s { int j; const int *ap[3]; };
>+    struct s *b; b->j = 5;
>   }
>   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
>     const int foo = 10;
>@@ -16336,20 +16319,23 @@
> /* end confdefs.h.  */
> $ac_includes_default
> int
>-find_stack_direction (int *addr, int depth)
>-{
>-  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 (int argc, char **argv)
>-{
>-  return find_stack_direction (0, argc + !argv + 20) < 0;
>+find_stack_direction ()
>+{
>+  static char *addr = 0;
>+  auto char dummy;
>+  if (addr == 0)
>+    {
>+      addr = &dummy;
>+      return find_stack_direction ();
>+    }
>+  else
>+    return (&dummy > addr) ? 1 : -1;
>+}
>+
>+int
>+main ()
>+{
>+  return find_stack_direction () < 0;
> }
> _ACEOF
> if ac_fn_c_try_run "$LINENO"; then :
>@@ -17840,7 +17826,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_ESD_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
>@@ -18092,7 +18078,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -18201,7 +18187,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_ARTSCONFIG="$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
>@@ -18719,7 +18705,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -18865,7 +18851,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -20573,7 +20559,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_DIRECTFBCONFIG="$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
>@@ -20618,7 +20604,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -20765,7 +20751,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -21297,7 +21283,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -21405,6 +21391,10 @@
> fi
> 
>     case "$host" in
>+	 *-*-androideabi*)
>+            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
>+            pthread_lib=""
>+	    ;;
>         *-*-linux*|*-*-uclinux*)
>             pthread_cflags="-D_REENTRANT"
>             pthread_lib="-lpthread"
>@@ -22549,6 +22539,20 @@
>                     $as_echo "#define SDL_VIDEO_DRIVER_RPI 1" >>confdefs.h
>                 fi
>                 ;;
>+            *-*-androideabi*)
>+                # Android
>+                ARCH=android
>+                ANDROID_CFLAGS="-DGL_GLEXT_PROTOTYPES"
>+                CFLAGS="$CFLAGS $ANDROID_CFLAGS"
>+                SDL_CFLAGS="$SDL_CFLAGS $ANDROID_CFLAGS"
>+                EXTRA_CFLAGS="$EXTRA_CFLAGS $ANDROID_CFLAGS"
>+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl -lGLESv1_CM -lGLESv2 -llog -landroid"
>+
>+                if test x$enable_video = xyes; then
>+                    SOURCES="$SOURCES $srcdir/src/core/android/*.c $srcdir/src/video/android/*.c"
>+                    $as_echo "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
>+                fi
>+                ;;
>             *-*-linux*)         ARCH=linux ;;
>             *-*-uclinux*)       ARCH=linux ;;
>             *-*-kfreebsd*-gnu)  ARCH=kfreebsd-gnu ;;
>@@ -22619,6 +22623,13 @@
>                 SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
>                 have_audio=yes
>             ;;
>+            android)
>+
>+$as_echo "#define SDL_AUDIO_DRIVER_ANDROID 1" >>confdefs.h
>+
>+                SOURCES="$SOURCES $srcdir/src/audio/android/*.c"
>+                have_audio=yes
>+            ;;
>           esac
>         fi
>         # Set up files for the joystick library
>@@ -22631,6 +22642,13 @@
>                 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
>                 have_joystick=yes
>             ;;
>+            android)
>+
>+$as_echo "#define SDL_JOYSTICK_ANDROID 1" >>confdefs.h
>+
>+                SOURCES="$SOURCES $srcdir/src/joystick/android/*.c"
>+                have_joystick=yes
>+            ;;
>           esac
>         fi
>         # Set up files for the haptic library
>@@ -22657,6 +22675,13 @@
>                    SOURCES="$SOURCES $srcdir/src/power/linux/*.c"
>                    have_power=yes
>                ;;
>+               android)
>+
>+$as_echo "#define SDL_POWER_ANDROID 1" >>confdefs.h
>+
>+                   SOURCES="$SOURCES $srcdir/src/power/android/*.c"
>+                   have_power=yes
>+               ;;
>              esac
>         fi
>         # Set up files for the filesystem library
>@@ -23155,7 +23180,7 @@
>     OBJECTS=`echo "$OBJECTS" | sed 's,[^ ]*/$[^ ]*$\.'$EXT',$(objects)/\1.lo,g'`
>     DEPENDS=`echo "$DEPENDS" | sed "s,^\$[^ ]*\$/\$[^ ]*\$\\.$EXT\\$,\\\\
> \\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\
>-	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
>+	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> done
> 
> VERSION_OBJECTS=`echo $VERSION_SOURCES`
>@@ -23170,14 +23195,14 @@
> SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[^ ]*/$[^ ]*$\.c,$(objects)/\1.o,g'`
> SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\$[^ ]*\$/\$[^ ]*\$\\.c,\\\\
> \\$(objects)/\\2.o: \\1/\\2.c\\\\
>-	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
>+	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
> SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
> SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[^ ]*/$[^ ]*$\.c,$(objects)/\1.o,g'`
> SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\$[^ ]*\$/\$[^ ]*\$\\.c,\\\\
> \\$(objects)/\\2.o: \\1/\\2.c\\\\
>-	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
>+	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> # Set runtime shared library paths as needed
> 
>@@ -23682,16 +23707,16 @@
>     # ... 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 -pR'.
>+    # In both cases, we have to default to `cp -p'.
>     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
>-      as_ln_s='cp -pR'
>+      as_ln_s='cp -p'
>   elif ln conf$$.file conf$$ 2>/dev/null; then
>     as_ln_s=ln
>   else
>-    as_ln_s='cp -pR'
>-  fi
>-else
>-  as_ln_s='cp -pR'
>+    as_ln_s='cp -p'
>+  fi
>+else
>+  as_ln_s='cp -p'
> fi
> rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
> rmdir conf$$.dir 2>/dev/null
>@@ -23751,16 +23776,28 @@
>   as_mkdir_p=false
> fi
> 
>-
>-# 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
>+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
> 
> # 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'"
>@@ -23782,7 +23819,7 @@
> # values after options handling.
> ac_log="
> This file was extended by $as_me, which was
>-generated by GNU Autoconf 2.69.  Invocation command line was
>+generated by GNU Autoconf 2.68.  Invocation command line was
> 
>   CONFIG_FILES    = $CONFIG_FILES
>   CONFIG_HEADERS  = $CONFIG_HEADERS
>@@ -23848,10 +23885,10 @@
> ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
> ac_cs_version="\\
> config.status
>-configured by $0, generated by GNU Autoconf 2.69,
>+configured by $0, generated by GNU Autoconf 2.68,
>   with options \\"\$ac_cs_config\\"
> 
>-Copyright (C) 2012 Free Software Foundation, Inc.
>+Copyright (C) 2010 Free Software Foundation, Inc.
> This config.status script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it."
> 
>@@ -23941,7 +23978,7 @@
> _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'
>diff -r 94af945dbb57 -r 21d0d1f8ef3e configure.in
>--- a/configure.in	Sat Apr 19 13:15:53 2014 -0700
>+++ b/configure.in	Sat Apr 19 16:25:36 2014 -0700
>@@ -3166,7 +3166,7 @@
>     OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.'$EXT',$(objects)/\1.lo,g'`
>     DEPENDS=`echo "$DEPENDS" | sed "s,^\$[[^ ]]*\$/\$[[^ ]]*\$\\.$EXT\\$,\\\\
> \\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\
>-	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
>+	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> done
> 
> VERSION_OBJECTS=`echo $VERSION_SOURCES`
>@@ -3181,14 +3181,14 @@
> SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.o,g'`
> SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\$[[^ ]]*\$/\$[[^ ]]*\$\\.c,\\\\
> \\$(objects)/\\2.o: \\1/\\2.c\\\\
>-	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
>+	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
> SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
> SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.o,g'`
> SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\$[[^ ]]*\$/\$[[^ ]]*\$\\.c,\\\\
> \\$(objects)/\\2.o: \\1/\\2.c\\\\
>-	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
>+	\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> # Set runtime shared library paths as needed
> 
>diff -r 94af945dbb57 -r 21d0d1f8ef3e test/configure
>--- a/test/configure	Sat Apr 19 13:15:53 2014 -0700
>+++ b/test/configure	Sat Apr 19 16:25:36 2014 -0700
>@@ -1,9 +1,11 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
>-# Generated by GNU Autoconf 2.69.
>+# Generated by GNU Autoconf 2.68.
> #
> #
>-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
>+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
>+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
>+# Foundation, Inc.
> #
> #
> # This configure script is free software; the Free Software Foundation
>@@ -132,31 +134,6 @@
> # 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
>@@ -190,8 +167,7 @@
> else
>   exitcode=1; echo positional parameters were not saved.
> fi
>-test x\$exitcode = x0 || exit 1
>-test -x / || exit 1"
>+test x\$exitcode = x0 || 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'\" &&
>@@ -235,25 +211,21 @@
> 
> 
>       if test "x$CONFIG_SHELL" != x; then :
>-  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
>+  # 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+"$@"}
> fi
> 
>     if test x$as_have_required = xno; then :
>@@ -355,14 +327,6 @@
> 
> 
> } # 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
>@@ -484,10 +448,6 @@
>   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).
>@@ -522,16 +482,16 @@
>     # ... 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 -pR'.
>+    # In both cases, we have to default to `cp -p'.
>     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
>-      as_ln_s='cp -pR'
>+      as_ln_s='cp -p'
>   elif ln conf$$.file conf$$ 2>/dev/null; then
>     as_ln_s=ln
>   else
>-    as_ln_s='cp -pR'
>+    as_ln_s='cp -p'
>   fi
> else
>-  as_ln_s='cp -pR'
>+  as_ln_s='cp -p'
> fi
> rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
> rmdir conf$$.dir 2>/dev/null
>@@ -543,8 +503,28 @@
>   as_mkdir_p=false
> fi
> 
>-as_test_x='test -x'
>-as_executable_p=as_fn_executable_p
>+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
> 
> # 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'"
>@@ -1134,6 +1114,8 @@
> 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
>@@ -1388,9 +1370,9 @@
> if $ac_init_version; then
>   cat <<\_ACEOF
> configure
>-generated by GNU Autoconf 2.69
>-
>-Copyright (C) 2012 Free Software Foundation, Inc.
>+generated by GNU Autoconf 2.68
>+
>+Copyright (C) 2010 Free Software Foundation, Inc.
> This configure script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it.
> _ACEOF
>@@ -1508,7 +1490,7 @@
> 	 test ! -s conftest.err
>        } && test -s conftest$ac_exeext && {
> 	 test "$cross_compiling" = yes ||
>-	 test -x conftest$ac_exeext
>+	 $as_test_x conftest$ac_exeext
>        }; then :
>   ac_retval=0
> else
>@@ -1568,7 +1550,7 @@
> running configure, to aid debugging if configure makes a mistake.
> 
> It was created by $as_me, which was
>-generated by GNU Autoconf 2.69.  Invocation command line was
>+generated by GNU Autoconf 2.68.  Invocation command line was
> 
>   $ $0 $@
> 
>@@ -2040,7 +2022,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2080,7 +2062,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2133,7 +2115,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2174,7 +2156,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2232,7 +2214,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2276,7 +2258,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -2722,7 +2704,8 @@
> /* end confdefs.h.  */
> #include <stdarg.h>
> #include <stdio.h>
>-struct stat;
>+#include <sys/types.h>
>+#include <sys/stat.h>
> /* 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);
>@@ -2821,11 +2804,11 @@
> int
> main ()
> {
>-
>+/* FIXME: Include the comments suggested by Paul. */
> #ifndef __cplusplus
>-  /* Ultrix mips cc rejects this sort of thing.  */
>+  /* Ultrix mips cc rejects this.  */
>   typedef int charset[2];
>-  const charset cs = { 0, 0 };
>+  const charset cs;
>   /* SunOS 4.1.1 cc rejects this.  */
>   char const *const *pcpcc;
>   char **ppc;
>@@ -2842,9 +2825,8 @@
>   ++pcpcc;
>   ppc = (char**) pcpcc;
>   pcpcc = (char const *const *) ppc;
>-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
>-    char tx;
>-    char *t = &tx;
>+  { /* SCO 3.2v4 cc rejects this.  */
>+    char *t;
>     char const *s = 0 ? (char *) 0 : (char const *) 0;
> 
>     *t++ = 0;
>@@ -2860,10 +2842,10 @@
>     iptr p = 0;
>     ++p;
>   }
>-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
>+  { /* AIX XL C 1.02.0.0 rejects this saying
>        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
>-    struct s { int j; const int *ap[3]; } bx;
>-    struct s *b = &bx; b->j = 5;
>+    struct s { int j; const int *ap[3]; };
>+    struct s *b; b->j = 5;
>   }
>   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
>     const int foo = 10;
>@@ -2943,7 +2925,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_OSMESA_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
>@@ -3020,7 +3002,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -3063,7 +3045,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
>@@ -3251,7 +3233,7 @@
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>     for ac_exec_ext in '' $ac_executable_extensions; do
>-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
>     ac_cv_path_SDL_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
>@@ -4405,16 +4387,16 @@
>     # ... 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 -pR'.
>+    # In both cases, we have to default to `cp -p'.
>     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
>-      as_ln_s='cp -pR'
>+      as_ln_s='cp -p'
>   elif ln conf$$.file conf$$ 2>/dev/null; then
>     as_ln_s=ln
>   else
>-    as_ln_s='cp -pR'
>+    as_ln_s='cp -p'
>   fi
> else
>-  as_ln_s='cp -pR'
>+  as_ln_s='cp -p'
> fi
> rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
> rmdir conf$$.dir 2>/dev/null
>@@ -4474,16 +4456,28 @@
>   as_mkdir_p=false
> fi
> 
>-
>-# 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
>+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
> 
> # 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'"
>@@ -4505,7 +4499,7 @@
> # values after options handling.
> ac_log="
> This file was extended by $as_me, which was
>-generated by GNU Autoconf 2.69.  Invocation command line was
>+generated by GNU Autoconf 2.68.  Invocation command line was
> 
>   CONFIG_FILES    = $CONFIG_FILES
>   CONFIG_HEADERS  = $CONFIG_HEADERS
>@@ -4558,10 +4552,10 @@
> ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
> ac_cs_version="\\
> config.status
>-configured by $0, generated by GNU Autoconf 2.69,
>+configured by $0, generated by GNU Autoconf 2.68,
>   with options \\"\$ac_cs_config\\"
> 
>-Copyright (C) 2012 Free Software Foundation, Inc.
>+Copyright (C) 2010 Free Software Foundation, Inc.
> This config.status script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it."
> 
>@@ -4638,7 +4632,7 @@
> _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'

Actions: View | Diff

Attachments on bug 2495: 1629 | 1630

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.