From 95411985d727758c24bca2dabff7e744926cca7e Mon Sep 17 00:00:00 2001 From: Sjoerd van der Berg Date: Tue, 8 Jul 2003 18:24:36 +0000 Subject: [PATCH] Screenshot will now be disabled if there's no libpng else enabled default Checking fo SDL_net if softmodem can be enabled. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1101 --- configure.in | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/configure.in b/configure.in index 655c9e37..fafa8333 100644 --- a/configure.in +++ b/configure.in @@ -72,25 +72,33 @@ AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[ fi ],) -AH_TEMPLATE(C_SSHOT,[Define to 1 to enable screenshots, requires libpng]) -AC_ARG_ENABLE(shots,AC_HELP_STRING([--enable-shots],[Enable screenshot support]),[ - AC_CHECK_HEADER(png.h,have_png_h=yes,) - AC_CHECK_LIB(png, png_check_sig, have_png_lib=yes, ,-lz) - if test x$have_png_lib = xyes -a x$have_png_h = xyes ; then - LIBS="$LIBS -lpng -lz" - AC_DEFINE(C_SSHOT,1) - else - AC_MSG_WARN([Can't enable screenshots without libpng]) - fi -],) - - AH_TEMPLATE(C_FPU,[Define to 1 to enable floating point emulation]) AC_ARG_ENABLE(fpu,AC_HELP_STRING([--disable-fpu],[Disable FPU support]), AC_MSG_RESULT([FPU support has been disabled]), AC_DEFINE(C_FPU,1) ) +AH_TEMPLATE(C_SSHOT,[Define to 1 to enable screenshots, requires libpng]) +AC_CHECK_HEADER(png.h,have_png_h=yes,) +AC_CHECK_LIB(png, png_check_sig, have_png_lib=yes, ,-lz) +if test x$have_png_lib = xyes -a x$have_png_h = xyes ; then + LIBS="$LIBS -lpng -lz" + AC_DEFINE(C_SSHOT,1) +else + AC_MSG_WARN([Can't find libpng, screenshot support disabled]) +fi + +AH_TEMPLATE(C_MODEM,[Define to 1 to enable internal modem support, requires SDL_net]) +AC_CHECK_HEADER(SDL/SDL_net.h,have_sdl_net_h=yes,) +AC_CHECK_LIB(SDL_net, SDLNet_Init, have_sdl_net_lib=yes, , ) +if test x$have_sdl_net_lib = xyes -a x$have_sdl_net_h = xyes ; then + LIBS="$LIBS -lSDL_net" + AC_DEFINE(C_MODEM,1) +else + AC_MSG_WARN([Can't find SDL_net, internal modem disabled]) +fi + + dnl Some host detection and actions for them case "$target" in *-*-cygwin* | *-*-mingw32*)