equal
deleted
inserted
replaced
2023 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
2023 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
2024 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
2024 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
2025 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
2025 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
2026 |
2026 |
2027 |
2027 |
2028 ac_config_headers="$ac_config_headers include/SDL_config.h" |
2028 ac_config_headers="$ac_config_headers include/SDL_config_generated.h" |
2029 |
2029 |
2030 |
2030 |
2031 cat >>confdefs.h <<\_ACEOF |
2031 cat >>confdefs.h <<\_ACEOF |
2032 #define _GNU_SOURCE 1 |
2032 #define _GNU_SOURCE 1 |
2033 _ACEOF |
2033 _ACEOF |
15523 fi |
15523 fi |
15524 |
15524 |
15525 |
15525 |
15526 INCLUDE="-I$srcdir/include" |
15526 INCLUDE="-I$srcdir/include" |
15527 if test x$srcdir != x.; then |
15527 if test x$srcdir != x.; then |
15528 # Remove SDL_config.h from the source directory, since it's the |
|
15529 # default one, and we want to include the one that we generate. |
|
15530 if test -f $srcdir/include/SDL_config.h; then |
|
15531 rm $srcdir/include/SDL_config.h |
|
15532 fi |
|
15533 INCLUDE="-Iinclude $INCLUDE" |
15528 INCLUDE="-Iinclude $INCLUDE" |
|
15529 elif test -d .hg; then |
|
15530 { { echo "$as_me:$LINENO: error: |
|
15531 *** When building from Mercurial you should configure and build in a |
|
15532 separate directory so you don't clobber SDL_revision.h |
|
15533 " >&5 |
|
15534 echo "$as_me: error: |
|
15535 *** When building from Mercurial you should configure and build in a |
|
15536 separate directory so you don't clobber SDL_revision.h |
|
15537 " >&2;} |
|
15538 { (exit 1); exit 1; }; } |
15534 fi |
15539 fi |
15535 case "$host" in |
15540 case "$host" in |
15536 *-*-cygwin*) |
15541 *-*-cygwin*) |
15537 # We build SDL on cygwin without the UNIX emulation layer |
15542 # We build SDL on cygwin without the UNIX emulation layer |
15538 BASE_CFLAGS="-I/usr/include/mingw -mno-cygwin" |
15543 BASE_CFLAGS="-I/usr/include/mingw -mno-cygwin" |
15544 ;; |
15549 ;; |
15545 esac |
15550 esac |
15546 # Uncomment the following line if you want to force SDL and applications |
15551 # Uncomment the following line if you want to force SDL and applications |
15547 # built with it to be compiled for a particular architecture. |
15552 # built with it to be compiled for a particular architecture. |
15548 #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]") |
15553 #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]") |
15549 BUILD_CFLAGS="$CFLAGS $CPPFLAGS" |
15554 BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DGENERATED_CONFIG_H" |
15550 # The default optimization for SDL 1.3 is -O3 (Bug #31) |
15555 # The default optimization for SDL 1.3 is -O3 (Bug #31) |
15551 if test x$orig_CFLAGS = x; then |
15556 if test x$orig_CFLAGS = x; then |
15552 BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'` |
15557 BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'` |
15553 fi |
15558 fi |
15554 EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS" |
15559 EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS" |
28803 |
28808 |
28804 # Handling of arguments. |
28809 # Handling of arguments. |
28805 for ac_config_target in $ac_config_targets |
28810 for ac_config_target in $ac_config_targets |
28806 do |
28811 do |
28807 case $ac_config_target in |
28812 case $ac_config_target in |
28808 "include/SDL_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config.h" ;; |
28813 "include/SDL_config_generated.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config_generated.h" ;; |
28809 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |
28814 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |
28810 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;; |
28815 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;; |
28811 "sdl-config") CONFIG_FILES="$CONFIG_FILES sdl-config" ;; |
28816 "sdl-config") CONFIG_FILES="$CONFIG_FILES sdl-config" ;; |
28812 "SDL.spec") CONFIG_FILES="$CONFIG_FILES SDL.spec" ;; |
28817 "SDL.spec") CONFIG_FILES="$CONFIG_FILES SDL.spec" ;; |
28813 "sdl.pc") CONFIG_FILES="$CONFIG_FILES sdl.pc" ;; |
28818 "sdl.pc") CONFIG_FILES="$CONFIG_FILES sdl.pc" ;; |