configure
changeset 418 40798dcfe7f2
parent 405 e39e48acccd9
child 425 361ab0371a02
     1.1 --- a/configure	Tue Jul 30 23:33:37 2013 -0700
     1.2 +++ b/configure	Wed Jul 31 21:45:15 2013 -0700
     1.3 @@ -777,7 +777,7 @@
     1.4  LIBWEBP_CFLAGS
     1.5  LIBPNG_LIBS
     1.6  LIBPNG_CFLAGS
     1.7 -SDL_CONFIG
     1.8 +SDL2_CONFIG
     1.9  SDL_LIBS
    1.10  SDL_CFLAGS
    1.11  PKG_CONFIG
    1.12 @@ -12287,21 +12287,21 @@
    1.13      sdl_pc=no
    1.14      if test x$sdl_exec_prefix != x ; then
    1.15        sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
    1.16 -      if test x${SDL_CONFIG+set} != xset ; then
    1.17 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
    1.18 +      if test x${SDL2_CONFIG+set} != xset ; then
    1.19 +        SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config
    1.20        fi
    1.21      fi
    1.22      if test x$sdl_prefix != x ; then
    1.23        sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
    1.24 -      if test x${SDL_CONFIG+set} != xset ; then
    1.25 -        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
    1.26 +      if test x${SDL2_CONFIG+set} != xset ; then
    1.27 +        SDL2_CONFIG=$sdl_prefix/bin/sdl2-config
    1.28        fi
    1.29      fi
    1.30    fi
    1.31  
    1.32    if test "x$sdl_pc" = xyes ; then
    1.33      no_sdl=""
    1.34 -    SDL_CONFIG="pkg-config sdl2"
    1.35 +    SDL2_CONFIG="pkg-config sdl2"
    1.36    else
    1.37      as_save_PATH="$PATH"
    1.38      if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
    1.39 @@ -12311,12 +12311,12 @@
    1.40  set dummy sdl2-config; ac_word=$2
    1.41  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    1.42  $as_echo_n "checking for $ac_word... " >&6; }
    1.43 -if ${ac_cv_path_SDL_CONFIG+:} false; then :
    1.44 -  $as_echo_n "(cached) " >&6
    1.45 -else
    1.46 -  case $SDL_CONFIG in
    1.47 +if ${ac_cv_path_SDL2_CONFIG+:} false; then :
    1.48 +  $as_echo_n "(cached) " >&6
    1.49 +else
    1.50 +  case $SDL2_CONFIG in
    1.51    [\\/]* | ?:[\\/]*)
    1.52 -  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
    1.53 +  ac_cv_path_SDL2_CONFIG="$SDL2_CONFIG" # Let the user override the test with a path.
    1.54    ;;
    1.55    *)
    1.56    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    1.57 @@ -12326,7 +12326,7 @@
    1.58    test -z "$as_dir" && as_dir=.
    1.59      for ac_exec_ext in '' $ac_executable_extensions; do
    1.60    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    1.61 -    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    1.62 +    ac_cv_path_SDL2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    1.63      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    1.64      break 2
    1.65    fi
    1.66 @@ -12334,14 +12334,14 @@
    1.67    done
    1.68  IFS=$as_save_IFS
    1.69  
    1.70 -  test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
    1.71 -  ;;
    1.72 -esac
    1.73 -fi
    1.74 -SDL_CONFIG=$ac_cv_path_SDL_CONFIG
    1.75 -if test -n "$SDL_CONFIG"; then
    1.76 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
    1.77 -$as_echo "$SDL_CONFIG" >&6; }
    1.78 +  test -z "$ac_cv_path_SDL2_CONFIG" && ac_cv_path_SDL2_CONFIG="no"
    1.79 +  ;;
    1.80 +esac
    1.81 +fi
    1.82 +SDL2_CONFIG=$ac_cv_path_SDL2_CONFIG
    1.83 +if test -n "$SDL2_CONFIG"; then
    1.84 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL2_CONFIG" >&5
    1.85 +$as_echo "$SDL2_CONFIG" >&6; }
    1.86  else
    1.87    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    1.88  $as_echo "no" >&6; }
    1.89 @@ -12353,17 +12353,17 @@
    1.90  $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
    1.91      no_sdl=""
    1.92  
    1.93 -    if test "$SDL_CONFIG" = "no" ; then
    1.94 +    if test "$SDL2_CONFIG" = "no" ; then
    1.95        no_sdl=yes
    1.96      else
    1.97 -      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
    1.98 -      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
    1.99 -
   1.100 -      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
   1.101 +      SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
   1.102 +      SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
   1.103 +
   1.104 +      sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
   1.105               sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
   1.106 -      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
   1.107 +      sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \
   1.108               sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
   1.109 -      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   1.110 +      sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \
   1.111               sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
   1.112        if test "x$enable_sdltest" = "xyes" ; then
   1.113          ac_save_CFLAGS="$CFLAGS"
   1.114 @@ -12428,7 +12428,7 @@
   1.115        printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   1.116        printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
   1.117        printf("*** best to upgrade to the required version.\n");
   1.118 -      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
   1.119 +      printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n");
   1.120        printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
   1.121        printf("*** config.cache before re-running configure\n");
   1.122        return 1;
   1.123 @@ -12462,10 +12462,10 @@
   1.124    if test "x$no_sdl" = x ; then
   1.125       :
   1.126    else
   1.127 -     if test "$SDL_CONFIG" = "no" ; then
   1.128 +     if test "$SDL2_CONFIG" = "no" ; then
   1.129         echo "*** The sdl2-config script installed by SDL could not be found"
   1.130         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
   1.131 -       echo "*** your path, or set the SDL_CONFIG environment variable to the"
   1.132 +       echo "*** your path, or set the SDL2_CONFIG environment variable to the"
   1.133         echo "*** full path to sdl2-config."
   1.134       else
   1.135         if test -f conf.sdltest ; then
   1.136 @@ -12508,7 +12508,7 @@
   1.137     echo "*** The test program failed to compile or link. See the file config.log for the"
   1.138            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
   1.139            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
   1.140 -          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG"
   1.141 +          echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG"
   1.142  fi
   1.143  rm -f core conftest.err conftest.$ac_objext \
   1.144      conftest$ac_exeext conftest.$ac_ext