configure
changeset 6235 d169541f5049
parent 6219 8e94af244f2c
child 6250 cce0ddcf6747
     1.1 --- a/configure	Wed Jan 18 22:45:49 2012 -0500
     1.2 +++ b/configure	Thu Jan 19 01:55:51 2012 -0500
     1.3 @@ -2025,7 +2025,7 @@
     1.4  ac_compiler_gnu=$ac_cv_c_compiler_gnu
     1.5  
     1.6  
     1.7 -ac_config_headers="$ac_config_headers include/SDL_config_generated.h"
     1.8 +ac_config_headers="$ac_config_headers include/SDL_config.h"
     1.9  
    1.10  
    1.11  cat >>confdefs.h <<\_ACEOF
    1.12 @@ -15529,11 +15529,11 @@
    1.13  elif test -d .hg; then
    1.14      { { echo "$as_me:$LINENO: error:
    1.15  *** When building from Mercurial you should configure and build in a
    1.16 -    separate directory so you don't clobber SDL_revision.h
    1.17 +    separate directory so you don't clobber SDL_config.h, SDL_revision.h
    1.18  " >&5
    1.19  echo "$as_me: error:
    1.20  *** When building from Mercurial you should configure and build in a
    1.21 -    separate directory so you don't clobber SDL_revision.h
    1.22 +    separate directory so you don't clobber SDL_config.h, SDL_revision.h
    1.23  " >&2;}
    1.24     { (exit 1); exit 1; }; }
    1.25  fi
    1.26 @@ -15551,7 +15551,7 @@
    1.27  # Uncomment the following line if you want to force SDL and applications
    1.28  # built with it to be compiled for a particular architecture.
    1.29  #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]")
    1.30 -BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DGENERATED_CONFIG_H"
    1.31 +BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DUSING_GENERATED_CONFIG_H"
    1.32  # The default optimization for SDL 1.3 is -O3 (Bug #31)
    1.33  if test x$orig_CFLAGS = x; then
    1.34      BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'`
    1.35 @@ -28871,7 +28871,7 @@
    1.36  for ac_config_target in $ac_config_targets
    1.37  do
    1.38    case $ac_config_target in
    1.39 -    "include/SDL_config_generated.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config_generated.h" ;;
    1.40 +    "include/SDL_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config.h" ;;
    1.41      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
    1.42      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;;
    1.43      "sdl-config") CONFIG_FILES="$CONFIG_FILES sdl-config" ;;