test/configure
changeset 6250 cce0ddcf6747
parent 6188 e82023802002
child 6390 3047baa4a5e0
     1.1 --- a/test/configure	Sun Jan 22 01:29:26 2012 -0500
     1.2 +++ b/test/configure	Sun Jan 22 17:21:00 2012 -0500
     1.3 @@ -632,9 +632,12 @@
     1.4  OSMESA_CONFIG
     1.5  EXE
     1.6  MATHLIB
     1.7 -SDL_CONFIG
     1.8 +PKG_CONFIG
     1.9 +PKG_CONFIG_PATH
    1.10 +PKG_CONFIG_LIBDIR
    1.11  SDL_CFLAGS
    1.12  SDL_LIBS
    1.13 +SDL_CONFIG
    1.14  XMKMF
    1.15  CPP
    1.16  GLLIB
    1.17 @@ -650,6 +653,11 @@
    1.18  LDFLAGS
    1.19  LIBS
    1.20  CPPFLAGS
    1.21 +PKG_CONFIG
    1.22 +PKG_CONFIG_PATH
    1.23 +PKG_CONFIG_LIBDIR
    1.24 +SDL_CFLAGS
    1.25 +SDL_LIBS
    1.26  XMKMF
    1.27  CPP'
    1.28  
    1.29 @@ -1245,6 +1253,13 @@
    1.30    LIBS        libraries to pass to the linker, e.g. -l<library>
    1.31    CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
    1.32                you have headers in a nonstandard directory <include dir>
    1.33 +  PKG_CONFIG  path to pkg-config utility
    1.34 +  PKG_CONFIG_PATH
    1.35 +              directories to add to pkg-config's search path
    1.36 +  PKG_CONFIG_LIBDIR
    1.37 +              path overriding pkg-config's built-in search path
    1.38 +  SDL_CFLAGS  C compiler flags for SDL, overriding pkg-config
    1.39 +  SDL_LIBS    linker flags for SDL, overriding pkg-config
    1.40    XMKMF       Path to xmkmf, Makefile generator for X Window System
    1.41    CPP         C preprocessor
    1.42  
    1.43 @@ -2906,7 +2921,130 @@
    1.44  
    1.45  
    1.46  
    1.47 -SDL_VERSION=1.3.0
    1.48 +SDL_VERSION=2.0.0
    1.49 +
    1.50 +
    1.51 +
    1.52 +
    1.53 +
    1.54 +
    1.55 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
    1.56 +	if test -n "$ac_tool_prefix"; then
    1.57 +  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
    1.58 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
    1.59 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    1.60 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    1.61 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    1.62 +  echo $ECHO_N "(cached) $ECHO_C" >&6
    1.63 +else
    1.64 +  case $PKG_CONFIG in
    1.65 +  [\\/]* | ?:[\\/]*)
    1.66 +  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
    1.67 +  ;;
    1.68 +  *)
    1.69 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    1.70 +for as_dir in $PATH
    1.71 +do
    1.72 +  IFS=$as_save_IFS
    1.73 +  test -z "$as_dir" && as_dir=.
    1.74 +  for ac_exec_ext in '' $ac_executable_extensions; do
    1.75 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    1.76 +    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    1.77 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    1.78 +    break 2
    1.79 +  fi
    1.80 +done
    1.81 +done
    1.82 +IFS=$as_save_IFS
    1.83 +
    1.84 +  ;;
    1.85 +esac
    1.86 +fi
    1.87 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
    1.88 +if test -n "$PKG_CONFIG"; then
    1.89 +  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
    1.90 +echo "${ECHO_T}$PKG_CONFIG" >&6; }
    1.91 +else
    1.92 +  { echo "$as_me:$LINENO: result: no" >&5
    1.93 +echo "${ECHO_T}no" >&6; }
    1.94 +fi
    1.95 +
    1.96 +
    1.97 +fi
    1.98 +if test -z "$ac_cv_path_PKG_CONFIG"; then
    1.99 +  ac_pt_PKG_CONFIG=$PKG_CONFIG
   1.100 +  # Extract the first word of "pkg-config", so it can be a program name with args.
   1.101 +set dummy pkg-config; ac_word=$2
   1.102 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
   1.103 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
   1.104 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   1.105 +  echo $ECHO_N "(cached) $ECHO_C" >&6
   1.106 +else
   1.107 +  case $ac_pt_PKG_CONFIG in
   1.108 +  [\\/]* | ?:[\\/]*)
   1.109 +  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
   1.110 +  ;;
   1.111 +  *)
   1.112 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   1.113 +for as_dir in $PATH
   1.114 +do
   1.115 +  IFS=$as_save_IFS
   1.116 +  test -z "$as_dir" && as_dir=.
   1.117 +  for ac_exec_ext in '' $ac_executable_extensions; do
   1.118 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   1.119 +    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   1.120 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
   1.121 +    break 2
   1.122 +  fi
   1.123 +done
   1.124 +done
   1.125 +IFS=$as_save_IFS
   1.126 +
   1.127 +  ;;
   1.128 +esac
   1.129 +fi
   1.130 +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
   1.131 +if test -n "$ac_pt_PKG_CONFIG"; then
   1.132 +  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
   1.133 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
   1.134 +else
   1.135 +  { echo "$as_me:$LINENO: result: no" >&5
   1.136 +echo "${ECHO_T}no" >&6; }
   1.137 +fi
   1.138 +
   1.139 +  if test "x$ac_pt_PKG_CONFIG" = x; then
   1.140 +    PKG_CONFIG=""
   1.141 +  else
   1.142 +    case $cross_compiling:$ac_tool_warned in
   1.143 +yes:)
   1.144 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
   1.145 +whose name does not start with the host triplet.  If you think this
   1.146 +configuration is useful to you, please write to autoconf@gnu.org." >&5
   1.147 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
   1.148 +whose name does not start with the host triplet.  If you think this
   1.149 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
   1.150 +ac_tool_warned=yes ;;
   1.151 +esac
   1.152 +    PKG_CONFIG=$ac_pt_PKG_CONFIG
   1.153 +  fi
   1.154 +else
   1.155 +  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
   1.156 +fi
   1.157 +
   1.158 +fi
   1.159 +if test -n "$PKG_CONFIG"; then
   1.160 +	_pkg_min_version=0.9.0
   1.161 +	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
   1.162 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
   1.163 +	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
   1.164 +		{ echo "$as_me:$LINENO: result: yes" >&5
   1.165 +echo "${ECHO_T}yes" >&6; }
   1.166 +	else
   1.167 +		{ echo "$as_me:$LINENO: result: no" >&5
   1.168 +echo "${ECHO_T}no" >&6; }
   1.169 +		PKG_CONFIG=""
   1.170 +	fi
   1.171 +fi
   1.172  
   1.173  # Check whether --with-sdl-prefix was given.
   1.174  if test "${with_sdl_prefix+set}" = set; then
   1.175 @@ -2931,24 +3069,104 @@
   1.176  fi
   1.177  
   1.178  
   1.179 -  if test x$sdl_exec_prefix != x ; then
   1.180 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
   1.181 -    if test x${SDL_CONFIG+set} != xset ; then
   1.182 -       SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
   1.183 +  min_sdl_version=$SDL_VERSION
   1.184 +
   1.185 +  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
   1.186 +
   1.187 +pkg_failed=no
   1.188 +{ echo "$as_me:$LINENO: checking for SDL" >&5
   1.189 +echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
   1.190 +
   1.191 +if test -n "$SDL_CFLAGS"; then
   1.192 +    pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
   1.193 + elif test -n "$PKG_CONFIG"; then
   1.194 +    if test -n "$PKG_CONFIG" && \
   1.195 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
   1.196 +  ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
   1.197 +  ac_status=$?
   1.198 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.199 +  (exit $ac_status); }; then
   1.200 +  pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $min_sdl_version" 2>/dev/null`
   1.201 +else
   1.202 +  pkg_failed=yes
   1.203 +fi
   1.204 + else
   1.205 +    pkg_failed=untried
   1.206 +fi
   1.207 +if test -n "$SDL_LIBS"; then
   1.208 +    pkg_cv_SDL_LIBS="$SDL_LIBS"
   1.209 + elif test -n "$PKG_CONFIG"; then
   1.210 +    if test -n "$PKG_CONFIG" && \
   1.211 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
   1.212 +  ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
   1.213 +  ac_status=$?
   1.214 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   1.215 +  (exit $ac_status); }; then
   1.216 +  pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $min_sdl_version" 2>/dev/null`
   1.217 +else
   1.218 +  pkg_failed=yes
   1.219 +fi
   1.220 + else
   1.221 +    pkg_failed=untried
   1.222 +fi
   1.223 +
   1.224 +
   1.225 +
   1.226 +if test $pkg_failed = yes; then
   1.227 +   	{ echo "$as_me:$LINENO: result: no" >&5
   1.228 +echo "${ECHO_T}no" >&6; }
   1.229 +
   1.230 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
   1.231 +        _pkg_short_errors_supported=yes
   1.232 +else
   1.233 +        _pkg_short_errors_supported=no
   1.234 +fi
   1.235 +        if test $_pkg_short_errors_supported = yes; then
   1.236 +	        SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl2 >= $min_sdl_version" 2>&1`
   1.237 +        else
   1.238 +	        SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl2 >= $min_sdl_version" 2>&1`
   1.239 +        fi
   1.240 +	# Put the nasty error message in config.log where it belongs
   1.241 +	echo "$SDL_PKG_ERRORS" >&5
   1.242 +
   1.243 +	sdl_pc=no
   1.244 +elif test $pkg_failed = untried; then
   1.245 +     	{ echo "$as_me:$LINENO: result: no" >&5
   1.246 +echo "${ECHO_T}no" >&6; }
   1.247 +	sdl_pc=no
   1.248 +else
   1.249 +	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
   1.250 +	SDL_LIBS=$pkg_cv_SDL_LIBS
   1.251 +        { echo "$as_me:$LINENO: result: yes" >&5
   1.252 +echo "${ECHO_T}yes" >&6; }
   1.253 +	sdl_pc=yes
   1.254 +fi
   1.255 +  else
   1.256 +    sdl_pc=no
   1.257 +    if test x$sdl_exec_prefix != x ; then
   1.258 +      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
   1.259 +      if test x${SDL_CONFIG+set} != xset ; then
   1.260 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
   1.261 +      fi
   1.262 +    fi
   1.263 +    if test x$sdl_prefix != x ; then
   1.264 +      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
   1.265 +      if test x${SDL_CONFIG+set} != xset ; then
   1.266 +        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
   1.267 +      fi
   1.268      fi
   1.269    fi
   1.270 -  if test x$sdl_prefix != x ; then
   1.271 -    sdl_args="$sdl_args --prefix=$sdl_prefix"
   1.272 -    if test x${SDL_CONFIG+set} != xset ; then
   1.273 -       SDL_CONFIG=$sdl_prefix/bin/sdl-config
   1.274 +
   1.275 +  if test "x$sdl_pc" = xyes ; then
   1.276 +    no_sdl=""
   1.277 +    SDL_CONFIG="pkg-config sdl2"
   1.278 +  else
   1.279 +    as_save_PATH="$PATH"
   1.280 +    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
   1.281 +      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   1.282      fi
   1.283 -  fi
   1.284 -
   1.285 -  if test "x$prefix" != xNONE; then
   1.286 -    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
   1.287 -  fi
   1.288 -  # Extract the first word of "sdl-config", so it can be a program name with args.
   1.289 -set dummy sdl-config; ac_word=$2
   1.290 +    # Extract the first word of "sdl2-config", so it can be a program name with args.
   1.291 +set dummy sdl2-config; ac_word=$2
   1.292  { echo "$as_me:$LINENO: checking for $ac_word" >&5
   1.293  echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
   1.294  if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
   1.295 @@ -2988,29 +3206,30 @@
   1.296  fi
   1.297  
   1.298  
   1.299 -  min_sdl_version=$SDL_VERSION
   1.300 -  { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
   1.301 +    PATH="$as_save_PATH"
   1.302 +    { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
   1.303  echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
   1.304 -  no_sdl=""
   1.305 -  if test "$SDL_CONFIG" = "no" ; then
   1.306 -    no_sdl=yes
   1.307 -  else
   1.308 -    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
   1.309 -    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
   1.310 -
   1.311 -    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
   1.312 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
   1.313 -    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
   1.314 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
   1.315 -    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   1.316 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
   1.317 -    if test "x$enable_sdltest" = "xyes" ; then
   1.318 -      ac_save_CFLAGS="$CFLAGS"
   1.319 -      ac_save_CXXFLAGS="$CXXFLAGS"
   1.320 -      ac_save_LIBS="$LIBS"
   1.321 -      CFLAGS="$CFLAGS $SDL_CFLAGS"
   1.322 -      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   1.323 -      LIBS="$LIBS $SDL_LIBS"
   1.324 +    no_sdl=""
   1.325 +
   1.326 +    if test "$SDL_CONFIG" = "no" ; then
   1.327 +      no_sdl=yes
   1.328 +    else
   1.329 +      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
   1.330 +      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
   1.331 +
   1.332 +      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
   1.333 +             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
   1.334 +      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
   1.335 +             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
   1.336 +      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   1.337 +             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
   1.338 +      if test "x$enable_sdltest" = "xyes" ; then
   1.339 +        ac_save_CFLAGS="$CFLAGS"
   1.340 +        ac_save_CXXFLAGS="$CXXFLAGS"
   1.341 +        ac_save_LIBS="$LIBS"
   1.342 +        CFLAGS="$CFLAGS $SDL_CFLAGS"
   1.343 +        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
   1.344 +        LIBS="$LIBS $SDL_LIBS"
   1.345        rm -f conf.sdltest
   1.346        if test "$cross_compiling" = yes; then
   1.347    echo $ac_n "cross compiling; assumed OK... $ac_c"
   1.348 @@ -3068,11 +3287,11 @@
   1.349      }
   1.350    else
   1.351      {
   1.352 -      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   1.353 -      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
   1.354 +      printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   1.355 +      printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
   1.356        printf("*** best to upgrade to the required version.\n");
   1.357 -      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
   1.358 -      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
   1.359 +      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
   1.360 +      printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
   1.361        printf("*** config.cache before re-running configure\n");
   1.362        return 1;
   1.363      }
   1.364 @@ -3113,23 +3332,27 @@
   1.365  fi
   1.366  
   1.367  
   1.368 -       CFLAGS="$ac_save_CFLAGS"
   1.369 -       CXXFLAGS="$ac_save_CXXFLAGS"
   1.370 -       LIBS="$ac_save_LIBS"
   1.371 -     fi
   1.372 +        CFLAGS="$ac_save_CFLAGS"
   1.373 +        CXXFLAGS="$ac_save_CXXFLAGS"
   1.374 +        LIBS="$ac_save_LIBS"
   1.375 +      fi
   1.376 +    fi
   1.377 +    if test "x$no_sdl" = x ; then
   1.378 +      { echo "$as_me:$LINENO: result: yes" >&5
   1.379 +echo "${ECHO_T}yes" >&6; }
   1.380 +    else
   1.381 +      { echo "$as_me:$LINENO: result: no" >&5
   1.382 +echo "${ECHO_T}no" >&6; }
   1.383 +    fi
   1.384    fi
   1.385    if test "x$no_sdl" = x ; then
   1.386 -     { echo "$as_me:$LINENO: result: yes" >&5
   1.387 -echo "${ECHO_T}yes" >&6; }
   1.388       :
   1.389    else
   1.390 -     { echo "$as_me:$LINENO: result: no" >&5
   1.391 -echo "${ECHO_T}no" >&6; }
   1.392       if test "$SDL_CONFIG" = "no" ; then
   1.393 -       echo "*** The sdl-config script installed by SDL could not be found"
   1.394 +       echo "*** The sdl2-config script installed by SDL could not be found"
   1.395         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
   1.396         echo "*** your path, or set the SDL_CONFIG environment variable to the"
   1.397 -       echo "*** full path to sdl-config."
   1.398 +       echo "*** full path to sdl2-config."
   1.399       else
   1.400         if test -f conf.sdltest ; then
   1.401          :
   1.402 @@ -3195,7 +3418,7 @@
   1.403  	 echo "*** The test program failed to compile or link. See the file config.log for the"
   1.404            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
   1.405            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
   1.406 -          echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
   1.407 +          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG"
   1.408  fi
   1.409  
   1.410  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
   1.411 @@ -4567,9 +4790,12 @@
   1.412  OSMESA_CONFIG!$OSMESA_CONFIG$ac_delim
   1.413  EXE!$EXE$ac_delim
   1.414  MATHLIB!$MATHLIB$ac_delim
   1.415 -SDL_CONFIG!$SDL_CONFIG$ac_delim
   1.416 +PKG_CONFIG!$PKG_CONFIG$ac_delim
   1.417 +PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
   1.418 +PKG_CONFIG_LIBDIR!$PKG_CONFIG_LIBDIR$ac_delim
   1.419  SDL_CFLAGS!$SDL_CFLAGS$ac_delim
   1.420  SDL_LIBS!$SDL_LIBS$ac_delim
   1.421 +SDL_CONFIG!$SDL_CONFIG$ac_delim
   1.422  XMKMF!$XMKMF$ac_delim
   1.423  CPP!$CPP$ac_delim
   1.424  GLLIB!$GLLIB$ac_delim
   1.425 @@ -4578,7 +4804,7 @@
   1.426  LTLIBOBJS!$LTLIBOBJS$ac_delim
   1.427  _ACEOF
   1.428  
   1.429 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
   1.430 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
   1.431      break
   1.432    elif $ac_last_try; then
   1.433      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5