Fixed check for SDL_ttf with SDL 2.0
authorSam Lantinga <slouken@libsdl.org>
Tue, 23 Oct 2012 15:28:27 -0700
changeset 659881d643a61b54
parent 6597 d359909f8121
child 6599 86d7a8a2e74c
Fixed check for SDL_ttf with SDL 2.0
test/configure
test/configure.in
     1.1 --- a/test/configure	Sun Oct 21 22:38:09 2012 -0700
     1.2 +++ b/test/configure	Tue Oct 23 15:28:27 2012 -0700
     1.3 @@ -1,9 +1,11 @@
     1.4  #! /bin/sh
     1.5  # Guess values for system-dependent variables and create Makefiles.
     1.6 -# Generated by GNU Autoconf 2.69.
     1.7 +# Generated by GNU Autoconf 2.68.
     1.8  #
     1.9  #
    1.10 -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
    1.11 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    1.12 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    1.13 +# Foundation, Inc.
    1.14  #
    1.15  #
    1.16  # This configure script is free software; the Free Software Foundation
    1.17 @@ -132,31 +134,6 @@
    1.18  # CDPATH.
    1.19  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
    1.20  
    1.21 -# Use a proper internal environment variable to ensure we don't fall
    1.22 -  # into an infinite loop, continuously re-executing ourselves.
    1.23 -  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
    1.24 -    _as_can_reexec=no; export _as_can_reexec;
    1.25 -    # We cannot yet assume a decent shell, so we have to provide a
    1.26 -# neutralization value for shells without unset; and this also
    1.27 -# works around shells that cannot unset nonexistent variables.
    1.28 -# Preserve -v and -x to the replacement shell.
    1.29 -BASH_ENV=/dev/null
    1.30 -ENV=/dev/null
    1.31 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    1.32 -case $- in # ((((
    1.33 -  *v*x* | *x*v* ) as_opts=-vx ;;
    1.34 -  *v* ) as_opts=-v ;;
    1.35 -  *x* ) as_opts=-x ;;
    1.36 -  * ) as_opts= ;;
    1.37 -esac
    1.38 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    1.39 -# Admittedly, this is quite paranoid, since all the known shells bail
    1.40 -# out after a failed `exec'.
    1.41 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    1.42 -as_fn_exit 255
    1.43 -  fi
    1.44 -  # We don't want this to propagate to other subprocesses.
    1.45 -          { _as_can_reexec=; unset _as_can_reexec;}
    1.46  if test "x$CONFIG_SHELL" = x; then
    1.47    as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
    1.48    emulate sh
    1.49 @@ -190,8 +167,7 @@
    1.50  else
    1.51    exitcode=1; echo positional parameters were not saved.
    1.52  fi
    1.53 -test x\$exitcode = x0 || exit 1
    1.54 -test -x / || exit 1"
    1.55 +test x\$exitcode = x0 || exit 1"
    1.56    as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
    1.57    as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
    1.58    eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
    1.59 @@ -235,25 +211,21 @@
    1.60  
    1.61  
    1.62        if test "x$CONFIG_SHELL" != x; then :
    1.63 -  export CONFIG_SHELL
    1.64 -             # We cannot yet assume a decent shell, so we have to provide a
    1.65 -# neutralization value for shells without unset; and this also
    1.66 -# works around shells that cannot unset nonexistent variables.
    1.67 -# Preserve -v and -x to the replacement shell.
    1.68 -BASH_ENV=/dev/null
    1.69 -ENV=/dev/null
    1.70 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    1.71 -case $- in # ((((
    1.72 -  *v*x* | *x*v* ) as_opts=-vx ;;
    1.73 -  *v* ) as_opts=-v ;;
    1.74 -  *x* ) as_opts=-x ;;
    1.75 -  * ) as_opts= ;;
    1.76 -esac
    1.77 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
    1.78 -# Admittedly, this is quite paranoid, since all the known shells bail
    1.79 -# out after a failed `exec'.
    1.80 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
    1.81 -exit 255
    1.82 +  # We cannot yet assume a decent shell, so we have to provide a
    1.83 +	# neutralization value for shells without unset; and this also
    1.84 +	# works around shells that cannot unset nonexistent variables.
    1.85 +	# Preserve -v and -x to the replacement shell.
    1.86 +	BASH_ENV=/dev/null
    1.87 +	ENV=/dev/null
    1.88 +	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    1.89 +	export CONFIG_SHELL
    1.90 +	case $- in # ((((
    1.91 +	  *v*x* | *x*v* ) as_opts=-vx ;;
    1.92 +	  *v* ) as_opts=-v ;;
    1.93 +	  *x* ) as_opts=-x ;;
    1.94 +	  * ) as_opts= ;;
    1.95 +	esac
    1.96 +	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
    1.97  fi
    1.98  
    1.99      if test x$as_have_required = xno; then :
   1.100 @@ -355,14 +327,6 @@
   1.101  
   1.102  
   1.103  } # as_fn_mkdir_p
   1.104 -
   1.105 -# as_fn_executable_p FILE
   1.106 -# -----------------------
   1.107 -# Test if FILE is an executable regular file.
   1.108 -as_fn_executable_p ()
   1.109 -{
   1.110 -  test -f "$1" && test -x "$1"
   1.111 -} # as_fn_executable_p
   1.112  # as_fn_append VAR VALUE
   1.113  # ----------------------
   1.114  # Append the text in VALUE to the end of the definition contained in VAR. Take
   1.115 @@ -484,10 +448,6 @@
   1.116    chmod +x "$as_me.lineno" ||
   1.117      { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
   1.118  
   1.119 -  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   1.120 -  # already done that, so ensure we don't try to do so again and fall
   1.121 -  # in an infinite loop.  This has already happened in practice.
   1.122 -  _as_can_reexec=no; export _as_can_reexec
   1.123    # Don't try to exec as it changes $[0], causing all sort of problems
   1.124    # (the dirname of $[0] is not the place where we might find the
   1.125    # original and so on.  Autoconf is especially sensitive to this).
   1.126 @@ -522,16 +482,16 @@
   1.127      # ... but there are two gotchas:
   1.128      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
   1.129      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
   1.130 -    # In both cases, we have to default to `cp -pR'.
   1.131 +    # In both cases, we have to default to `cp -p'.
   1.132      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
   1.133 -      as_ln_s='cp -pR'
   1.134 +      as_ln_s='cp -p'
   1.135    elif ln conf$$.file conf$$ 2>/dev/null; then
   1.136      as_ln_s=ln
   1.137    else
   1.138 -    as_ln_s='cp -pR'
   1.139 +    as_ln_s='cp -p'
   1.140    fi
   1.141  else
   1.142 -  as_ln_s='cp -pR'
   1.143 +  as_ln_s='cp -p'
   1.144  fi
   1.145  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
   1.146  rmdir conf$$.dir 2>/dev/null
   1.147 @@ -543,8 +503,28 @@
   1.148    as_mkdir_p=false
   1.149  fi
   1.150  
   1.151 -as_test_x='test -x'
   1.152 -as_executable_p=as_fn_executable_p
   1.153 +if test -x / >/dev/null 2>&1; then
   1.154 +  as_test_x='test -x'
   1.155 +else
   1.156 +  if ls -dL / >/dev/null 2>&1; then
   1.157 +    as_ls_L_option=L
   1.158 +  else
   1.159 +    as_ls_L_option=
   1.160 +  fi
   1.161 +  as_test_x='
   1.162 +    eval sh -c '\''
   1.163 +      if test -d "$1"; then
   1.164 +	test -d "$1/.";
   1.165 +      else
   1.166 +	case $1 in #(
   1.167 +	-*)set "./$1";;
   1.168 +	esac;
   1.169 +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
   1.170 +	???[sx]*):;;*)false;;esac;fi
   1.171 +    '\'' sh
   1.172 +  '
   1.173 +fi
   1.174 +as_executable_p=$as_test_x
   1.175  
   1.176  # Sed expression to map a string onto a valid CPP name.
   1.177  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
   1.178 @@ -1131,6 +1111,8 @@
   1.179  if test "x$host_alias" != x; then
   1.180    if test "x$build_alias" = x; then
   1.181      cross_compiling=maybe
   1.182 +    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
   1.183 +    If a cross compiler is detected then cross compile mode will be used" >&2
   1.184    elif test "x$build_alias" != "x$host_alias"; then
   1.185      cross_compiling=yes
   1.186    fi
   1.187 @@ -1385,9 +1367,9 @@
   1.188  if $ac_init_version; then
   1.189    cat <<\_ACEOF
   1.190  configure
   1.191 -generated by GNU Autoconf 2.69
   1.192 -
   1.193 -Copyright (C) 2012 Free Software Foundation, Inc.
   1.194 +generated by GNU Autoconf 2.68
   1.195 +
   1.196 +Copyright (C) 2010 Free Software Foundation, Inc.
   1.197  This configure script is free software; the Free Software Foundation
   1.198  gives unlimited permission to copy, distribute and modify it.
   1.199  _ACEOF
   1.200 @@ -1505,7 +1487,7 @@
   1.201  	 test ! -s conftest.err
   1.202         } && test -s conftest$ac_exeext && {
   1.203  	 test "$cross_compiling" = yes ||
   1.204 -	 test -x conftest$ac_exeext
   1.205 +	 $as_test_x conftest$ac_exeext
   1.206         }; then :
   1.207    ac_retval=0
   1.208  else
   1.209 @@ -1565,7 +1547,7 @@
   1.210  running configure, to aid debugging if configure makes a mistake.
   1.211  
   1.212  It was created by $as_me, which was
   1.213 -generated by GNU Autoconf 2.69.  Invocation command line was
   1.214 +generated by GNU Autoconf 2.68.  Invocation command line was
   1.215  
   1.216    $ $0 $@
   1.217  
   1.218 @@ -2037,7 +2019,7 @@
   1.219    IFS=$as_save_IFS
   1.220    test -z "$as_dir" && as_dir=.
   1.221      for ac_exec_ext in '' $ac_executable_extensions; do
   1.222 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.223 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.224      ac_cv_prog_CC="${ac_tool_prefix}gcc"
   1.225      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.226      break 2
   1.227 @@ -2077,7 +2059,7 @@
   1.228    IFS=$as_save_IFS
   1.229    test -z "$as_dir" && as_dir=.
   1.230      for ac_exec_ext in '' $ac_executable_extensions; do
   1.231 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.232 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.233      ac_cv_prog_ac_ct_CC="gcc"
   1.234      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.235      break 2
   1.236 @@ -2130,7 +2112,7 @@
   1.237    IFS=$as_save_IFS
   1.238    test -z "$as_dir" && as_dir=.
   1.239      for ac_exec_ext in '' $ac_executable_extensions; do
   1.240 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.241 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.242      ac_cv_prog_CC="${ac_tool_prefix}cc"
   1.243      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.244      break 2
   1.245 @@ -2171,7 +2153,7 @@
   1.246    IFS=$as_save_IFS
   1.247    test -z "$as_dir" && as_dir=.
   1.248      for ac_exec_ext in '' $ac_executable_extensions; do
   1.249 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.250 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.251      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
   1.252         ac_prog_rejected=yes
   1.253         continue
   1.254 @@ -2229,7 +2211,7 @@
   1.255    IFS=$as_save_IFS
   1.256    test -z "$as_dir" && as_dir=.
   1.257      for ac_exec_ext in '' $ac_executable_extensions; do
   1.258 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.259 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.260      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
   1.261      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.262      break 2
   1.263 @@ -2273,7 +2255,7 @@
   1.264    IFS=$as_save_IFS
   1.265    test -z "$as_dir" && as_dir=.
   1.266      for ac_exec_ext in '' $ac_executable_extensions; do
   1.267 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.268 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.269      ac_cv_prog_ac_ct_CC="$ac_prog"
   1.270      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.271      break 2
   1.272 @@ -2719,7 +2701,8 @@
   1.273  /* end confdefs.h.  */
   1.274  #include <stdarg.h>
   1.275  #include <stdio.h>
   1.276 -struct stat;
   1.277 +#include <sys/types.h>
   1.278 +#include <sys/stat.h>
   1.279  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
   1.280  struct buf { int x; };
   1.281  FILE * (*rcsopen) (struct buf *, struct stat *, int);
   1.282 @@ -2818,11 +2801,11 @@
   1.283  int
   1.284  main ()
   1.285  {
   1.286 -
   1.287 +/* FIXME: Include the comments suggested by Paul. */
   1.288  #ifndef __cplusplus
   1.289 -  /* Ultrix mips cc rejects this sort of thing.  */
   1.290 +  /* Ultrix mips cc rejects this.  */
   1.291    typedef int charset[2];
   1.292 -  const charset cs = { 0, 0 };
   1.293 +  const charset cs;
   1.294    /* SunOS 4.1.1 cc rejects this.  */
   1.295    char const *const *pcpcc;
   1.296    char **ppc;
   1.297 @@ -2839,9 +2822,8 @@
   1.298    ++pcpcc;
   1.299    ppc = (char**) pcpcc;
   1.300    pcpcc = (char const *const *) ppc;
   1.301 -  { /* SCO 3.2v4 cc rejects this sort of thing.  */
   1.302 -    char tx;
   1.303 -    char *t = &tx;
   1.304 +  { /* SCO 3.2v4 cc rejects this.  */
   1.305 +    char *t;
   1.306      char const *s = 0 ? (char *) 0 : (char const *) 0;
   1.307  
   1.308      *t++ = 0;
   1.309 @@ -2857,10 +2839,10 @@
   1.310      iptr p = 0;
   1.311      ++p;
   1.312    }
   1.313 -  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
   1.314 +  { /* AIX XL C 1.02.0.0 rejects this saying
   1.315         "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
   1.316 -    struct s { int j; const int *ap[3]; } bx;
   1.317 -    struct s *b = &bx; b->j = 5;
   1.318 +    struct s { int j; const int *ap[3]; };
   1.319 +    struct s *b; b->j = 5;
   1.320    }
   1.321    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
   1.322      const int foo = 10;
   1.323 @@ -2940,7 +2922,7 @@
   1.324    IFS=$as_save_IFS
   1.325    test -z "$as_dir" && as_dir=.
   1.326      for ac_exec_ext in '' $ac_executable_extensions; do
   1.327 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.328 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.329      ac_cv_path_OSMESA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.330      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.331      break 2
   1.332 @@ -3017,7 +2999,7 @@
   1.333    IFS=$as_save_IFS
   1.334    test -z "$as_dir" && as_dir=.
   1.335      for ac_exec_ext in '' $ac_executable_extensions; do
   1.336 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.337 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.338      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.339      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.340      break 2
   1.341 @@ -3060,7 +3042,7 @@
   1.342    IFS=$as_save_IFS
   1.343    test -z "$as_dir" && as_dir=.
   1.344      for ac_exec_ext in '' $ac_executable_extensions; do
   1.345 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.346 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.347      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.348      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.349      break 2
   1.350 @@ -3248,7 +3230,7 @@
   1.351    IFS=$as_save_IFS
   1.352    test -z "$as_dir" && as_dir=.
   1.353      for ac_exec_ext in '' $ac_executable_extensions; do
   1.354 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   1.355 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.356      ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.357      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.358      break 2
   1.359 @@ -3865,39 +3847,52 @@
   1.360  
   1.361  
   1.362  
   1.363 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL_ttf" >&5
   1.364 -$as_echo_n "checking for SDL_ttf... " >&6; }
   1.365 -have_SDL_ttf=no
   1.366 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTF_Init in -lSDL2_ttf" >&5
   1.367 +$as_echo_n "checking for TTF_Init in -lSDL2_ttf... " >&6; }
   1.368 +if ${ac_cv_lib_SDL2_ttf_TTF_Init+:} false; then :
   1.369 +  $as_echo_n "(cached) " >&6
   1.370 +else
   1.371 +  ac_check_lib_save_LIBS=$LIBS
   1.372 +LIBS="-lSDL2_ttf  $LIBS"
   1.373  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.374  /* end confdefs.h.  */
   1.375  
   1.376 - #include "SDL_ttf.h"
   1.377 -
   1.378 +/* Override any GCC internal prototype to avoid an error.
   1.379 +   Use char because int might match the return type of a GCC
   1.380 +   builtin and then its argument prototype would still apply.  */
   1.381 +#ifdef __cplusplus
   1.382 +extern "C"
   1.383 +#endif
   1.384 +char TTF_Init ();
   1.385  int
   1.386  main ()
   1.387  {
   1.388 -
   1.389 -
   1.390 +return TTF_Init ();
   1.391    ;
   1.392    return 0;
   1.393  }
   1.394  _ACEOF
   1.395 -if ac_fn_c_try_compile "$LINENO"; then :
   1.396 -
   1.397 -have_SDL_ttf=yes
   1.398 -
   1.399 +if ac_fn_c_try_link "$LINENO"; then :
   1.400 +  ac_cv_lib_SDL2_ttf_TTF_Init=yes
   1.401 +else
   1.402 +  ac_cv_lib_SDL2_ttf_TTF_Init=no
   1.403  fi
   1.404 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   1.405 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_SDL_ttf" >&5
   1.406 -$as_echo "$have_SDL_ttf" >&6; }
   1.407 +rm -f core conftest.err conftest.$ac_objext \
   1.408 +    conftest$ac_exeext conftest.$ac_ext
   1.409 +LIBS=$ac_check_lib_save_LIBS
   1.410 +fi
   1.411 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL2_ttf_TTF_Init" >&5
   1.412 +$as_echo "$ac_cv_lib_SDL2_ttf_TTF_Init" >&6; }
   1.413 +if test "x$ac_cv_lib_SDL2_ttf_TTF_Init" = xyes; then :
   1.414 +  have_SDL_ttf=yes
   1.415 +fi
   1.416  
   1.417  if test x$have_SDL_ttf = xyes; then
   1.418      CFLAGS="$CFLAGS -DHAVE_SDL_TTF"
   1.419 -    SDL_TTF_LIB="-lSDL_ttf"
   1.420 +    SDL_TTF_LIB="-lSDL2_ttf"
   1.421  fi
   1.422  
   1.423  
   1.424 -
   1.425  ac_config_files="$ac_config_files Makefile"
   1.426  
   1.427  cat >confcache <<\_ACEOF
   1.428 @@ -4343,16 +4338,16 @@
   1.429      # ... but there are two gotchas:
   1.430      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
   1.431      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
   1.432 -    # In both cases, we have to default to `cp -pR'.
   1.433 +    # In both cases, we have to default to `cp -p'.
   1.434      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
   1.435 -      as_ln_s='cp -pR'
   1.436 +      as_ln_s='cp -p'
   1.437    elif ln conf$$.file conf$$ 2>/dev/null; then
   1.438      as_ln_s=ln
   1.439    else
   1.440 -    as_ln_s='cp -pR'
   1.441 +    as_ln_s='cp -p'
   1.442    fi
   1.443  else
   1.444 -  as_ln_s='cp -pR'
   1.445 +  as_ln_s='cp -p'
   1.446  fi
   1.447  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
   1.448  rmdir conf$$.dir 2>/dev/null
   1.449 @@ -4412,16 +4407,28 @@
   1.450    as_mkdir_p=false
   1.451  fi
   1.452  
   1.453 -
   1.454 -# as_fn_executable_p FILE
   1.455 -# -----------------------
   1.456 -# Test if FILE is an executable regular file.
   1.457 -as_fn_executable_p ()
   1.458 -{
   1.459 -  test -f "$1" && test -x "$1"
   1.460 -} # as_fn_executable_p
   1.461 -as_test_x='test -x'
   1.462 -as_executable_p=as_fn_executable_p
   1.463 +if test -x / >/dev/null 2>&1; then
   1.464 +  as_test_x='test -x'
   1.465 +else
   1.466 +  if ls -dL / >/dev/null 2>&1; then
   1.467 +    as_ls_L_option=L
   1.468 +  else
   1.469 +    as_ls_L_option=
   1.470 +  fi
   1.471 +  as_test_x='
   1.472 +    eval sh -c '\''
   1.473 +      if test -d "$1"; then
   1.474 +	test -d "$1/.";
   1.475 +      else
   1.476 +	case $1 in #(
   1.477 +	-*)set "./$1";;
   1.478 +	esac;
   1.479 +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
   1.480 +	???[sx]*):;;*)false;;esac;fi
   1.481 +    '\'' sh
   1.482 +  '
   1.483 +fi
   1.484 +as_executable_p=$as_test_x
   1.485  
   1.486  # Sed expression to map a string onto a valid CPP name.
   1.487  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
   1.488 @@ -4443,7 +4450,7 @@
   1.489  # values after options handling.
   1.490  ac_log="
   1.491  This file was extended by $as_me, which was
   1.492 -generated by GNU Autoconf 2.69.  Invocation command line was
   1.493 +generated by GNU Autoconf 2.68.  Invocation command line was
   1.494  
   1.495    CONFIG_FILES    = $CONFIG_FILES
   1.496    CONFIG_HEADERS  = $CONFIG_HEADERS
   1.497 @@ -4496,10 +4503,10 @@
   1.498  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
   1.499  ac_cs_version="\\
   1.500  config.status
   1.501 -configured by $0, generated by GNU Autoconf 2.69,
   1.502 +configured by $0, generated by GNU Autoconf 2.68,
   1.503    with options \\"\$ac_cs_config\\"
   1.504  
   1.505 -Copyright (C) 2012 Free Software Foundation, Inc.
   1.506 +Copyright (C) 2010 Free Software Foundation, Inc.
   1.507  This config.status script is free software; the Free Software Foundation
   1.508  gives unlimited permission to copy, distribute and modify it."
   1.509  
   1.510 @@ -4576,7 +4583,7 @@
   1.511  _ACEOF
   1.512  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   1.513  if \$ac_cs_recheck; then
   1.514 -  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   1.515 +  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   1.516    shift
   1.517    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   1.518    CONFIG_SHELL='$SHELL'
     2.1 --- a/test/configure.in	Sun Oct 21 22:38:09 2012 -0700
     2.2 +++ b/test/configure.in	Tue Oct 23 15:28:27 2012 -0700
     2.3 @@ -143,21 +143,11 @@
     2.4  AC_SUBST(GLLIB)
     2.5  
     2.6  dnl Check for SDL_ttf
     2.7 -AC_MSG_CHECKING(for SDL_ttf)
     2.8 -have_SDL_ttf=no
     2.9 -AC_TRY_COMPILE([
    2.10 - #include "SDL_ttf.h"
    2.11 -],[
    2.12 -],[
    2.13 -have_SDL_ttf=yes
    2.14 -])
    2.15 -AC_MSG_RESULT($have_SDL_ttf)
    2.16 -
    2.17 +AC_CHECK_LIB(SDL2_ttf, TTF_Init, have_SDL_ttf=yes)
    2.18  if test x$have_SDL_ttf = xyes; then
    2.19      CFLAGS="$CFLAGS -DHAVE_SDL_TTF"
    2.20 -    SDL_TTF_LIB="-lSDL_ttf"
    2.21 +    SDL_TTF_LIB="-lSDL2_ttf"
    2.22  fi
    2.23 -
    2.24  AC_SUBST(SDL_TTF_LIB)
    2.25  
    2.26  dnl Finally create all the generated files