Ran autogen.sh after updating sdl2.m4
authorSam Lantinga <slouken@libsdl.org>
Wed, 31 Jul 2013 21:45:15 -0700
changeset 41840798dcfe7f2
parent 417 da14f44e72bb
child 419 e108e1228d62
Ran autogen.sh after updating sdl2.m4
Makefile.in
configure
     1.1 --- a/Makefile.in	Tue Jul 30 23:33:37 2013 -0700
     1.2 +++ b/Makefile.in	Wed Jul 31 21:45:15 2013 -0700
     1.3 @@ -305,8 +305,8 @@
     1.4  PATH_SEPARATOR = @PATH_SEPARATOR@
     1.5  PKG_CONFIG = @PKG_CONFIG@
     1.6  RANLIB = @RANLIB@
     1.7 +SDL2_CONFIG = @SDL2_CONFIG@
     1.8  SDL_CFLAGS = @SDL_CFLAGS@
     1.9 -SDL_CONFIG = @SDL_CONFIG@
    1.10  SDL_LIBS = @SDL_LIBS@
    1.11  SDL_VERSION = @SDL_VERSION@
    1.12  SED = @SED@
     2.1 --- a/configure	Tue Jul 30 23:33:37 2013 -0700
     2.2 +++ b/configure	Wed Jul 31 21:45:15 2013 -0700
     2.3 @@ -777,7 +777,7 @@
     2.4  LIBWEBP_CFLAGS
     2.5  LIBPNG_LIBS
     2.6  LIBPNG_CFLAGS
     2.7 -SDL_CONFIG
     2.8 +SDL2_CONFIG
     2.9  SDL_LIBS
    2.10  SDL_CFLAGS
    2.11  PKG_CONFIG
    2.12 @@ -12287,21 +12287,21 @@
    2.13      sdl_pc=no
    2.14      if test x$sdl_exec_prefix != x ; then
    2.15        sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
    2.16 -      if test x${SDL_CONFIG+set} != xset ; then
    2.17 -        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
    2.18 +      if test x${SDL2_CONFIG+set} != xset ; then
    2.19 +        SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config
    2.20        fi
    2.21      fi
    2.22      if test x$sdl_prefix != x ; then
    2.23        sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
    2.24 -      if test x${SDL_CONFIG+set} != xset ; then
    2.25 -        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
    2.26 +      if test x${SDL2_CONFIG+set} != xset ; then
    2.27 +        SDL2_CONFIG=$sdl_prefix/bin/sdl2-config
    2.28        fi
    2.29      fi
    2.30    fi
    2.31  
    2.32    if test "x$sdl_pc" = xyes ; then
    2.33      no_sdl=""
    2.34 -    SDL_CONFIG="pkg-config sdl2"
    2.35 +    SDL2_CONFIG="pkg-config sdl2"
    2.36    else
    2.37      as_save_PATH="$PATH"
    2.38      if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
    2.39 @@ -12311,12 +12311,12 @@
    2.40  set dummy sdl2-config; ac_word=$2
    2.41  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2.42  $as_echo_n "checking for $ac_word... " >&6; }
    2.43 -if ${ac_cv_path_SDL_CONFIG+:} false; then :
    2.44 -  $as_echo_n "(cached) " >&6
    2.45 -else
    2.46 -  case $SDL_CONFIG in
    2.47 +if ${ac_cv_path_SDL2_CONFIG+:} false; then :
    2.48 +  $as_echo_n "(cached) " >&6
    2.49 +else
    2.50 +  case $SDL2_CONFIG in
    2.51    [\\/]* | ?:[\\/]*)
    2.52 -  ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
    2.53 +  ac_cv_path_SDL2_CONFIG="$SDL2_CONFIG" # Let the user override the test with a path.
    2.54    ;;
    2.55    *)
    2.56    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2.57 @@ -12326,7 +12326,7 @@
    2.58    test -z "$as_dir" && as_dir=.
    2.59      for ac_exec_ext in '' $ac_executable_extensions; do
    2.60    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2.61 -    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    2.62 +    ac_cv_path_SDL2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    2.63      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2.64      break 2
    2.65    fi
    2.66 @@ -12334,14 +12334,14 @@
    2.67    done
    2.68  IFS=$as_save_IFS
    2.69  
    2.70 -  test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
    2.71 -  ;;
    2.72 -esac
    2.73 -fi
    2.74 -SDL_CONFIG=$ac_cv_path_SDL_CONFIG
    2.75 -if test -n "$SDL_CONFIG"; then
    2.76 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
    2.77 -$as_echo "$SDL_CONFIG" >&6; }
    2.78 +  test -z "$ac_cv_path_SDL2_CONFIG" && ac_cv_path_SDL2_CONFIG="no"
    2.79 +  ;;
    2.80 +esac
    2.81 +fi
    2.82 +SDL2_CONFIG=$ac_cv_path_SDL2_CONFIG
    2.83 +if test -n "$SDL2_CONFIG"; then
    2.84 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL2_CONFIG" >&5
    2.85 +$as_echo "$SDL2_CONFIG" >&6; }
    2.86  else
    2.87    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2.88  $as_echo "no" >&6; }
    2.89 @@ -12353,17 +12353,17 @@
    2.90  $as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
    2.91      no_sdl=""
    2.92  
    2.93 -    if test "$SDL_CONFIG" = "no" ; then
    2.94 +    if test "$SDL2_CONFIG" = "no" ; then
    2.95        no_sdl=yes
    2.96      else
    2.97 -      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
    2.98 -      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
    2.99 -
   2.100 -      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
   2.101 +      SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
   2.102 +      SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
   2.103 +
   2.104 +      sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
   2.105               sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
   2.106 -      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
   2.107 +      sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \
   2.108               sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
   2.109 -      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
   2.110 +      sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \
   2.111               sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
   2.112        if test "x$enable_sdltest" = "xyes" ; then
   2.113          ac_save_CFLAGS="$CFLAGS"
   2.114 @@ -12428,7 +12428,7 @@
   2.115        printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
   2.116        printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro);
   2.117        printf("*** best to upgrade to the required version.\n");
   2.118 -      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
   2.119 +      printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n");
   2.120        printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
   2.121        printf("*** config.cache before re-running configure\n");
   2.122        return 1;
   2.123 @@ -12462,10 +12462,10 @@
   2.124    if test "x$no_sdl" = x ; then
   2.125       :
   2.126    else
   2.127 -     if test "$SDL_CONFIG" = "no" ; then
   2.128 +     if test "$SDL2_CONFIG" = "no" ; then
   2.129         echo "*** The sdl2-config script installed by SDL could not be found"
   2.130         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
   2.131 -       echo "*** your path, or set the SDL_CONFIG environment variable to the"
   2.132 +       echo "*** your path, or set the SDL2_CONFIG environment variable to the"
   2.133         echo "*** full path to sdl2-config."
   2.134       else
   2.135         if test -f conf.sdltest ; then
   2.136 @@ -12508,7 +12508,7 @@
   2.137     echo "*** The test program failed to compile or link. See the file config.log for the"
   2.138            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
   2.139            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
   2.140 -          echo "*** may want to edit the sdl2-config script: $SDL_CONFIG"
   2.141 +          echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG"
   2.142  fi
   2.143  rm -f core conftest.err conftest.$ac_objext \
   2.144      conftest$ac_exeext conftest.$ac_ext