diff options
| author | Simon Howard | 2009-11-21 16:36:46 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-11-21 16:36:46 +0000 |
| commit | afa0c4c7979c1508605d0e79487f299cd03adda6 (patch) | |
| tree | 7df1745badf169e4490e3a56a89a28ac37977c14 /configure.in | |
| parent | 095bc1110b3c11fbf2e17bfd51bf78909fe34662 (diff) | |
| parent | 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f (diff) | |
| download | chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.gz chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.tar.bz2 chocolate-doom-afa0c4c7979c1508605d0e79487f299cd03adda6.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1737
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/configure.in b/configure.in index 16c7df8a..0f4b48a0 100644 --- a/configure.in +++ b/configure.in @@ -39,20 +39,43 @@ AM_PATH_SDL(1.1.3) CFLAGS="$CFLAGS $SDL_CFLAGS" LDFLAGS="$LDFLAGS $SDL_LIBS" -AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[ - SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer" -],[ - echo "*** Could not find SDL_mixer. Please install it." - exit -1 -]) +# On some platforms, SDL renames main() to SDL_main() using a #define, +# so that its own main, stored in the SDLmain library, can be run first. +# Unfortunately, this causes problems for autoconf, which builds +# test programs to probe the system. All library/header/symbol checks +# must be run in this block, that performs a workaround for the problem. + +AC_SDL_MAIN_WORKAROUND([ + + # Check for SDL_mixer. + + AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[ + SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer" + ],[ + echo "*** Could not find SDL_mixer. Please install it." + exit -1 + ]) + + # Check for SDL_net. + + AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[ + SDLNET_LIBS="$SDLNET_LIBS -lSDL_net" + ],[ + echo "*** Could not find SDL_net. Please install it." + exit -1 + ]) + + # Check for libsamplerate. -AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[ - SDLNET_LIBS="$SDLNET_LIBS -lSDL_net" -],[ - echo "*** Could not find SDL_net. Please install it." - exit -1 + AC_CHECK_LIB(samplerate, src_new) + + AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) + AC_CHECK_FUNCS(mmap sched_setaffinity) ]) +AC_CHECK_TOOL(WINDRES, windres, ) +AC_CHECK_TOOL(STRIP, strip, ) + # Windows CE build? WINDOWS_CE=false @@ -66,14 +89,6 @@ case "$host" in ;; esac -AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) -AC_CHECK_FUNCS(mmap sched_setaffinity) - -# DWF 2008-02-10: FIXME -AC_CHECK_LIB(samplerate, src_new) - -AC_CHECK_TOOL(WINDRES, windres, ) - AM_CONDITIONAL(WINDOWS_CE, $WINDOWS_CE) AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "") AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON) @@ -120,7 +135,9 @@ src/heretic/Makefile src/hexen/Makefile src/setup/Makefile pcsound/Makefile -pkg/wince/Makefile +pkg/Makefile +pkg/wince/GNUmakefile +pkg/win32/GNUmakefile src/resource.rc src/setup-res.rc src/setup/setup-manifest.xml |