--- uae/configure 2018/04/24 16:51:06 1.1.1.12 +++ uae/configure 2018/04/24 17:08:33 1.1.1.18 @@ -18,7 +18,11 @@ ac_help="$ac_help ac_help="$ac_help --with-svgalib Use SVGAlib for graphics output" ac_help="$ac_help - --with-ggi Use GGI for graphics output" + --with-sdl Use SDL library for low-level functions" +ac_help="$ac_help + --with-sdl-sound Use SDL library for sound" +ac_help="$ac_help + --with-sdl-gfx Use SDL library for graphics" ac_help="$ac_help --with-asciiart Use ncurses ascii art for graphics output" ac_help="$ac_help @@ -28,7 +32,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-ui Use a user interface if possible (default on)" ac_help="$ac_help - --with-elf Explicitly state that this system is ELF" + --with-hostcc=x Use a x as compiler for the host system" ac_help="$ac_help --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" ac_help="$ac_help @@ -40,7 +44,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-file-sound Enable sound output to file" ac_help="$ac_help - --enable-scsi-device Disable the uaescsi.device" + --enable-scsi-device Enable the uaescsi.device" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -556,7 +560,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:560: checking for $ac_word" >&5 +echo "configure:564: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -586,7 +590,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:590: checking for $ac_word" >&5 +echo "configure:594: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -637,7 +641,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:641: checking for $ac_word" >&5 +echo "configure:645: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -669,7 +673,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:673: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:677: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -680,12 +684,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 684 "configure" +#line 688 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -711,12 +715,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:715: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:719: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:720: checking whether we are using GNU C" >&5 +echo "configure:724: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -725,7 +729,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -744,7 +748,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:748: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:752: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -777,7 +781,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:781: checking how to run the C preprocessor" >&5 +echo "configure:785: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -792,13 +796,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -809,13 +813,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -826,13 +830,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -857,7 +861,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:861: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:865: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -886,7 +890,7 @@ fi # Extract the first word of "makedepend", so it can be a program name with args. set dummy makedepend; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:890: checking for $ac_word" >&5 +echo "configure:894: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKEDEPPRG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -922,7 +926,7 @@ fi # Extract the first word of "file", so it can be a program name with args. set dummy file; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:926: checking for $ac_word" >&5 +echo "configure:930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_FILEPRG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -958,7 +962,7 @@ fi # Extract the first word of "wrc", so it can be a program name with args. set dummy wrc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:962: checking for $ac_word" >&5 +echo "configure:966: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WRCPRG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -994,7 +998,7 @@ fi # Extract the first word of "rcl", so it can be a program name with args. set dummy rcl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:998: checking for $ac_word" >&5 +echo "configure:1002: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RCLPRG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1027,11 +1031,47 @@ else echo "$ac_t""no" 1>&6 fi +# Extract the first word of "sdl-config", so it can be a program name with args. +set dummy sdl-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1038: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$SDL_CONFIG" in + /*) + ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_SDL_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="not-found" + ;; +esac +fi +SDL_CONFIG="$ac_cv_path_SDL_CONFIG" +if test -n "$SDL_CONFIG"; then + echo "$ac_t""$SDL_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1033: checking for AIX" >&5 +echo "configure:1073: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1057: checking for POSIXized ISC" >&5 +echo "configure:1097: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1075,9 +1115,9 @@ fi echo $ac_n "checking for Watcom C""... $ac_c" 1>&6 -echo "configure:1079: checking for Watcom C" >&5 +echo "configure:1119: checking for Watcom C" >&5 cat > conftest.$ac_ext <&6 echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:1101: checking for Cygwin32 environment" >&5 +echo "configure:1141: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin32=yes else @@ -1126,19 +1166,19 @@ echo "$ac_t""$am_cv_cygwin32" 1>&6 CYGWIN32= test "$am_cv_cygwin32" = yes && CYGWIN32=yes echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 -echo "configure:1130: checking for Mingw32 environment" >&5 +echo "configure:1170: checking for Mingw32 environment" >&5 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_mingw32=yes else @@ -1157,7 +1197,7 @@ test "$am_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1161: checking for executable suffix" >&5 +echo "configure:1201: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1196,11 +1236,12 @@ OPTIMIZE_CFLAGS= WARNING_CFLAGS= DEBUG_CFLAGS= NO_SCHED_CFLAGS= +LDFLAGS="$LDFLAGS -L." HAVE_BEOS=no HAVE_POS=no echo $ac_n "checking for main in -lMedia_s""... $ac_c" 1>&6 -echo "configure:1204: checking for main in -lMedia_s" >&5 +echo "configure:1245: checking for main in -lMedia_s" >&5 ac_lib_var=`echo Media_s'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1208,14 +1249,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lMedia_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1237,7 +1278,7 @@ HAVE_MEDIA_LIB=no fi echo $ac_n "checking for main in -lNeXT_s""... $ac_c" 1>&6 -echo "configure:1241: checking for main in -lNeXT_s" >&5 +echo "configure:1282: checking for main in -lNeXT_s" >&5 ac_lib_var=`echo NeXT_s'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1245,14 +1286,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lNeXT_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1274,7 +1315,7 @@ HAVE_NEXT_LIB=no fi echo $ac_n "checking for cos in -lmoto""... $ac_c" 1>&6 -echo "configure:1278: checking for cos in -lmoto" >&5 +echo "configure:1319: checking for cos in -lmoto" >&5 ac_lib_var=`echo moto'_'cos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1282,7 +1323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmoto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1315,7 +1356,7 @@ HAVE_MOTO_LIB=no fi echo $ac_n "checking for OpenLibrary in -lamiga""... $ac_c" 1>&6 -echo "configure:1319: checking for OpenLibrary in -lamiga" >&5 +echo "configure:1360: checking for OpenLibrary in -lamiga" >&5 ac_lib_var=`echo amiga'_'OpenLibrary | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1323,7 +1364,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lamiga $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1356,7 +1397,7 @@ HAVE_AMIGA_LIB=n fi echo $ac_n "checking for vga_setmode in -lvga""... $ac_c" 1>&6 -echo "configure:1360: checking for vga_setmode in -lvga" >&5 +echo "configure:1401: checking for vga_setmode in -lvga" >&5 ac_lib_var=`echo vga'_'vga_setmode | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1364,7 +1405,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lvga $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1397,7 +1438,7 @@ HAVE_SVGA_LIB=no fi echo $ac_n "checking for AFOpenAudioConn in -lAF""... $ac_c" 1>&6 -echo "configure:1401: checking for AFOpenAudioConn in -lAF" >&5 +echo "configure:1442: checking for AFOpenAudioConn in -lAF" >&5 ac_lib_var=`echo AF'_'AFOpenAudioConn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1405,7 +1446,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lAF $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1438,7 +1479,7 @@ HAVE_AF_LIB=no fi echo $ac_n "checking for waveOutGetNumDevs in -lmme""... $ac_c" 1>&6 -echo "configure:1442: checking for waveOutGetNumDevs in -lmme" >&5 +echo "configure:1483: checking for waveOutGetNumDevs in -lmme" >&5 ac_lib_var=`echo mme'_'waveOutGetNumDevs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1446,7 +1487,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmme $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1479,7 +1520,7 @@ HAVE_MME_LIB=no fi echo $ac_n "checking for waddch in -lncurses""... $ac_c" 1>&6 -echo "configure:1483: checking for waddch in -lncurses" >&5 +echo "configure:1524: checking for waddch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'waddch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1487,7 +1528,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1520,7 +1561,7 @@ HAVE_NCURSES_LIB=no fi echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6 -echo "configure:1524: checking for sem_init in -lposix4" >&5 +echo "configure:1565: checking for sem_init in -lposix4" >&5 ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1528,7 +1569,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1561,7 +1602,7 @@ HAVE_POSIX4_LIB=no fi echo $ac_n "checking for sem_init in -lrt""... $ac_c" 1>&6 -echo "configure:1565: checking for sem_init in -lrt" >&5 +echo "configure:1606: checking for sem_init in -lrt" >&5 ac_lib_var=`echo rt'_'sem_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1569,7 +1610,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1601,47 +1642,6 @@ else HAVE_RT_LIB=no fi -echo $ac_n "checking for ggiInit in -lggi""... $ac_c" 1>&6 -echo "configure:1606: checking for ggiInit in -lggi" >&5 -ac_lib_var=`echo ggi'_'ggiInit | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lggi $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - HAVE_GGI_LIB=yes -else - echo "$ac_t""no" 1>&6 -HAVE_GGI_LIB=no -fi - echo $ac_n "checking for alOpenPort in -laudio""... $ac_c" 1>&6 echo "configure:1647: checking for alOpenPort in -laudio" >&5 ac_lib_var=`echo audio'_'alOpenPort | sed 'y%./+-%__p_%'` @@ -2830,7 +2830,7 @@ else fi done -for ac_hdr in scsi/sg.h +for ac_hdr in posix_opt.h sys/ioctl.h sys/ipc.h sys/shm.h sys/stat.h sys/utime.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -2870,7 +2870,7 @@ else fi done -for ac_hdr in posix_opt.h sys/ioctl.h sys/ipc.h sys/shm.h sys/stat.h sys/utime.h +for ac_hdr in windows.h ddraw.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -2910,99 +2910,19 @@ else fi done -for ac_hdr in ggi/libggi.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2918: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - -for ac_hdr in windows.h ddraw.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2958: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - ac_safe=`echo "be_math.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for be_math.h""... $ac_c" 1>&6 -echo "configure:2996: checking for be_math.h" >&5 +echo "configure:2916: checking for be_math.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3028,17 +2948,17 @@ for ac_hdr in machine/joystick.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3032: checking for $ac_hdr" >&5 +echo "configure:2952: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3068,17 +2988,17 @@ for ac_hdr in devices/ahi.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3072: checking for $ac_hdr" >&5 +echo "configure:2992: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3108,17 +3028,17 @@ for ac_hdr in dmedia/audio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3112: checking for $ac_hdr" >&5 +echo "configure:3032: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3148,17 +3068,17 @@ for ac_hdr in libraries/cybergraphics.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3152: checking for $ac_hdr" >&5 +echo "configure:3072: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3186,7 +3106,7 @@ done echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:3190: checking size of char" >&5 +echo "configure:3110: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3194,7 +3114,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -3205,7 +3125,7 @@ main() exit(0); } EOF -if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -3225,7 +3145,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3229: checking size of short" >&5 +echo "configure:3149: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3233,7 +3153,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -3244,7 +3164,7 @@ main() exit(0); } EOF -if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -3264,7 +3184,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3268: checking size of int" >&5 +echo "configure:3188: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3272,7 +3192,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -3283,7 +3203,7 @@ main() exit(0); } EOF -if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -3303,7 +3223,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3307: checking size of long" >&5 +echo "configure:3227: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3311,7 +3231,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -3322,7 +3242,7 @@ main() exit(0); } EOF -if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -3342,7 +3262,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3346: checking size of long long" >&5 +echo "configure:3266: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3350,7 +3270,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < main() @@ -3361,7 +3281,7 @@ main() exit(0); } EOF -if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -3381,7 +3301,7 @@ EOF echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:3385: checking size of __int64" >&5 +echo "configure:3305: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3389,7 +3309,7 @@ else ac_cv_sizeof___int64=8 else cat > conftest.$ac_ext < main() @@ -3400,7 +3320,7 @@ main() exit(0); } EOF -if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -3421,12 +3341,12 @@ EOF echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3425: checking for working const" >&5 +echo "configure:3345: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3496,21 +3416,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3500: checking for inline" >&5 +echo "configure:3420: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3539,12 +3459,12 @@ if [ "x$ac_cv_c_inline" = "xno" ]; then ac_cv_c_inline= fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3543: checking for mode_t" >&5 +echo "configure:3463: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3572,12 +3492,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3576: checking for off_t" >&5 +echo "configure:3496: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3605,12 +3525,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3609: checking for pid_t" >&5 +echo "configure:3529: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3638,12 +3558,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3642: checking for st_blocks in struct stat" >&5 +echo "configure:3562: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3651,7 +3571,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:3655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -3674,12 +3594,12 @@ else fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3678: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3598: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3688,7 +3608,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3709,12 +3629,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3713: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3633: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3722,7 +3642,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3745,13 +3665,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3749: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3669: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -3769,7 +3689,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -3791,7 +3711,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3795: checking for 8-bit clean memcmp" >&5 +echo "configure:3715: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3799,7 +3719,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3827,12 +3747,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3831: checking return type of signal handlers" >&5 +echo "configure:3751: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3849,7 +3769,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3868,7 +3788,7 @@ EOF echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:3872: checking whether utime accepts a null argument" >&5 +echo "configure:3792: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3878,7 +3798,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -3889,7 +3809,7 @@ exit(!(stat ("conftestdata", &s) == 0 && && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:3893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -3912,15 +3832,70 @@ EOF fi -for ac_func in getcwd getopt strdup gettimeofday sigaction mkdir rmdir select strerror strstr +for ac_func in getcwd getopt strdup gettimeofday sigaction mkdir rmdir +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3839: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +for ac_func in select strerror strstr isnan isinf setitimer do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3919: checking for $ac_func" >&5 +echo "configure:3894: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3970,12 +3945,12 @@ done for ac_func in tcgetattr cfmakeraw readdir_r vprintf vsprintf vfprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3974: checking for $ac_func" >&5 +echo "configure:3949: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4035,17 +4010,17 @@ sys/filsys.h sys/fs_types.h sys/fs/s5par do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4039: checking for $ac_hdr" >&5 +echo "configure:4014: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4077,12 +4052,12 @@ getcwd getmntinfo gettimeofday isascii l listmntent memcpy mkfifo strchr strerror strrchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4081: checking for $ac_func" >&5 +echo "configure:4056: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4137,7 +4112,7 @@ list_mounted_fs= # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware. echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6 -echo "configure:4141: checking for getmntent in -lsun" >&5 +echo "configure:4116: checking for getmntent in -lsun" >&5 ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4145,7 +4120,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4175,7 +4150,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6 -echo "configure:4179: checking for getmntent in -lseq" >&5 +echo "configure:4154: checking for getmntent in -lseq" >&5 ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4183,7 +4158,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lseq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4213,7 +4188,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6 -echo "configure:4217: checking for getmntent in -lgen" >&5 +echo "configure:4192: checking for getmntent in -lgen" >&5 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4221,7 +4196,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4257,12 +4232,12 @@ fi fi echo $ac_n "checking for getmntent""... $ac_c" 1>&6 -echo "configure:4261: checking for getmntent" >&5 +echo "configure:4236: checking for getmntent" >&5 if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getmntent=yes" else @@ -4320,13 +4295,13 @@ fi if test -z "$list_mounted_fs"; then # Cray UNICOS 9 echo $ac_n "checking for listmntent of Cray/Unicos-9""... $ac_c" 1>&6 -echo "configure:4324: checking for listmntent of Cray/Unicos-9" >&5 +echo "configure:4299: checking for listmntent of Cray/Unicos-9" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_cray_listmntent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else fu_cv_sys_mounted_cray_listmntent=no cat > conftest.$ac_ext <&6 -echo "configure:4368: checking for one-argument getmntent function" >&5 +echo "configure:4343: checking for one-argument getmntent function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4386,12 +4361,12 @@ fi if test -z "$list_mounted_fs"; then # SVR4 echo $ac_n "checking for two-argument getmntent function""... $ac_c" 1>&6 -echo "configure:4390: checking for two-argument getmntent function" >&5 +echo "configure:4365: checking for two-argument getmntent function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4426,12 +4401,12 @@ fi if test -z "$list_mounted_fs"; then # DEC Alpha running OSF/1. echo $ac_n "checking for getfsstat function""... $ac_c" 1>&6 -echo "configure:4430: checking for getfsstat function" >&5 +echo "configure:4405: checking for getfsstat function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getsstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4442,7 +4417,7 @@ struct statfs *stats; int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ; return 0; } EOF -if { (eval echo configure:4446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* fu_cv_sys_mounted_getsstat=yes else @@ -4467,17 +4442,17 @@ fi if test -z "$list_mounted_fs"; then # AIX. echo $ac_n "checking for mntctl function and struct vmount""... $ac_c" 1>&6 -echo "configure:4471: checking for mntctl function and struct vmount" >&5 +echo "configure:4446: checking for mntctl function and struct vmount" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_vmount'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4505,12 +4480,12 @@ fi if test -z "$list_mounted_fs"; then # SVR3 echo $ac_n "checking for FIXME existence of three headers""... $ac_c" 1>&6 -echo "configure:4509: checking for FIXME existence of three headers" >&5 +echo "configure:4484: checking for FIXME existence of three headers" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread_fstyp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4518,7 +4493,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4546,7 +4521,7 @@ fi if test -z "$list_mounted_fs"; then # 4.4BSD and DEC OSF/1. echo $ac_n "checking for getmntinfo function""... $ac_c" 1>&6 -echo "configure:4550: checking for getmntinfo function" >&5 +echo "configure:4525: checking for getmntinfo function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4554,7 +4529,7 @@ else ok= if test $ac_cv_func_getmntinfo = yes; then cat > conftest.$ac_ext < EOF @@ -4587,19 +4562,19 @@ fi if test -z "$list_mounted_fs"; then # Ultrix echo $ac_n "checking for getmnt function""... $ac_c" 1>&6 -echo "configure:4591: checking for getmnt function" >&5 +echo "configure:4566: checking for getmnt function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4627,17 +4602,17 @@ fi if test -z "$list_mounted_fs"; then # SVR2 echo $ac_n "checking whether it is possible to resort to fread on /etc/mnttab""... $ac_c" 1>&6 -echo "configure:4631: checking whether it is possible to resort to fread on /etc/mnttab" >&5 +echo "configure:4606: checking whether it is possible to resort to fread on /etc/mnttab" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4669,7 +4644,7 @@ if test -z "$list_mounted_fs"; then fi echo "checking how to get filesystem space usage" 1>&6 -echo "configure:4673: checking how to get filesystem space usage" >&5 +echo "configure:4648: checking how to get filesystem space usage" >&5 space=no # Perform only the link test since it seems there are no variants of the @@ -4681,12 +4656,12 @@ space=no if test $space = no; then # SVR4 echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6 -echo "configure:4685: checking statvfs function (SVR4)" >&5 +echo "configure:4660: checking statvfs function (SVR4)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4694,7 +4669,7 @@ int main() { struct statvfs fsd; statvfs (0, &fsd); ; return 0; } EOF -if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* fu_cv_sys_stat_statvfs=yes else @@ -4719,7 +4694,7 @@ fi if test $space = no; then # DEC Alpha running OSF/1 echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6 -echo "configure:4723: checking for 3-argument statfs function (DEC OSF/1)" >&5 +echo "configure:4698: checking for 3-argument statfs function (DEC OSF/1)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4727,7 +4702,7 @@ else fu_cv_sys_stat_statfs3_osf1=no else cat > conftest.$ac_ext < @@ -4740,7 +4715,7 @@ fsd.f_fsize = 0; exit (statfs (".", &fsd, sizeof (struct statfs))); } EOF -if { (eval echo configure:4744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs3_osf1=yes else @@ -4767,7 +4742,7 @@ fi if test $space = no; then # AIX echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6 -echo "configure:4771: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 +echo "configure:4746: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4775,7 +4750,7 @@ else fu_cv_sys_stat_statfs2_bsize=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_bsize=yes else @@ -4821,7 +4796,7 @@ fi if test $space = no; then # SVR3 echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6 -echo "configure:4825: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 +echo "configure:4800: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4829,7 +4804,7 @@ else fu_cv_sys_stat_statfs4=no else cat > conftest.$ac_ext < #include @@ -4839,7 +4814,7 @@ struct statfs fsd; exit (statfs (".", &fsd, sizeof fsd, 0)); } EOF -if { (eval echo configure:4843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs4=yes else @@ -4866,7 +4841,7 @@ fi if test $space = no; then # 4.4BSD and NetBSD echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6 -echo "configure:4870: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 +echo "configure:4845: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4874,7 +4849,7 @@ else fu_cv_sys_stat_statfs2_fsize=no else cat > conftest.$ac_ext < #ifdef HAVE_SYS_PARAM_H @@ -4890,7 +4865,7 @@ fsd.f_fsize = 0; exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:4894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_fsize=yes else @@ -4917,7 +4892,7 @@ fi if test $space = no; then # Ultrix echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6 -echo "configure:4921: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 +echo "configure:4896: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4925,7 +4900,7 @@ else fu_cv_sys_stat_fs_data=no else cat > conftest.$ac_ext < #ifdef HAVE_SYS_PARAM_H @@ -4945,7 +4920,7 @@ struct fs_data fsd; exit (statfs (".", &fsd) != 1); } EOF -if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_fs_data=yes else @@ -4972,12 +4947,12 @@ fi if test $space = no; then # SVR2 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5002,12 +4977,12 @@ fi for ac_func in ftruncate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5006: checking for $ac_func" >&5 +echo "configure:4981: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5058,12 +5033,12 @@ done if test "$ftruncate_missing" = yes; then echo $ac_n "checking fcntl emulation of ftruncate""... $ac_c" 1>&6 -echo "configure:5062: checking fcntl emulation of ftruncate" >&5 +echo "configure:5037: checking fcntl emulation of ftruncate" >&5 if eval "test \"`echo '$''{'fu_cv_sys_ftruncate_emulation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5076,7 +5051,7 @@ chsize(); ; return 0; } EOF -if { (eval echo configure:5080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* fu_cv_sys_ftruncate_emulation=yes else @@ -5104,12 +5079,12 @@ esac # If exists and struct statfs has a member named f_spare, # enable the work-around code in fsusage.c. echo $ac_n "checking for statfs that truncates block counts""... $ac_c" 1>&6 -echo "configure:5108: checking for statfs that truncates block counts" >&5 +echo "configure:5083: checking for statfs that truncates block counts" >&5 if eval "test \"`echo '$''{'fu_cv_sys_truncating_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* fu_cv_sys_truncating_statfs=yes else @@ -5142,7 +5117,7 @@ fi echo "$ac_t""$fu_cv_sys_truncating_statfs" 1>&6 echo "checking for AFS" 1>&6 -echo "configure:5146: checking for AFS" >&5 +echo "configure:5121: checking for AFS" >&5 test -d /afs && cat >> confdefs.h <<\EOF #define AFS 1 EOF @@ -5154,9 +5129,9 @@ if [ $target = "p.os" ]; then HAVE_POS=yes else echo $ac_n "checking for pOS""... $ac_c" 1>&6 -echo "configure:5158: checking for pOS" >&5 +echo "configure:5133: checking for pOS" >&5 cat > conftest.$ac_ext <&6 -echo "configure:5188: checking for attr_t in curses.h" >&5 +echo "configure:5172: checking for attr_t in curses.h" >&5 cat > conftest.$ac_ext < int main() { { attr_t a; a = A_NORMAL; } ; return 0; } EOF -if { (eval echo configure:5197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5210,16 +5194,16 @@ fi rm -f conftest* else echo $ac_n "checking for attr_t in ncurses.h""... $ac_c" 1>&6 -echo "configure:5214: checking for attr_t in ncurses.h" >&5 +echo "configure:5198: checking for attr_t in ncurses.h" >&5 cat > conftest.$ac_ext < int main() { { attr_t a; a = A_NORMAL; } ; return 0; } EOF -if { (eval echo configure:5223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5238,14 +5222,13 @@ rm -f conftest* fi fi - echo $ac_n "checking for pthread library""... $ac_c" 1>&6 -echo "configure:5244: checking for pthread library" >&5 +echo "configure:5227: checking for pthread library" >&5 TMP_SAVE_CFLAGS=$CFLAGS TMP_SAVE_LIBS=$LIBS LIBS="$LIBS -lpthread" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* HAVE_PTHREAD_LIB=yes echo "$ac_t""yes" 1>&6 @@ -5275,13 +5258,13 @@ CFLAGS=$TMP_SAVE_CFLAGS LIBS=$TMP_SAVE_LIBS echo $ac_n "checking for DirectX""... $ac_c" 1>&6 -echo "configure:5279: checking for DirectX" >&5 +echo "configure:5262: checking for DirectX" >&5 TMP_SAVE_CFLAGS=$CFLAGS TMP_SAVE_LIBS=$LIBS CFLAGS="$CFLAGS $X_CFLAGS" LIBS="$LIBS -lddraw" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* HAVE_DIRECTX=yes echo "$ac_t""yes" 1>&6 @@ -5313,14 +5296,12 @@ CFLAGS=$TMP_SAVE_CFLAGS LIBS=$TMP_SAVE_LIBS DO_PROFILING=no -WANT_GGI=dunno WANT_SVGALIB=dunno WANT_ASCIIART=dunno WANT_UI=dunno WANT_NCURSES_UI=no WANT_DGA=no WANT_VIDMODE=no -SYSTEM_IS_ELF=dunno # Check whether --enable-profiling or --disable-profiling was given. if test "${enable_profiling+set}" = set; then @@ -5334,10 +5315,22 @@ if test "${with_svgalib+set}" = set; the WANT_SVGALIB=$withval fi -# Check whether --with-ggi or --without-ggi was given. -if test "${with_ggi+set}" = set; then - withval="$with_ggi" - WANT_GGI=$withval +# Check whether --with-sdl or --without-sdl was given. +if test "${with_sdl+set}" = set; then + withval="$with_sdl" + WANT_SDL=$withval +fi + +# Check whether --with-sdl-sound or --without-sdl-sound was given. +if test "${with_sdl_sound+set}" = set; then + withval="$with_sdl_sound" + WANT_SDLSND=$withval +fi + +# Check whether --with-sdl-gfx or --without-sdl-gfx was given. +if test "${with_sdl_gfx+set}" = set; then + withval="$with_sdl_gfx" + WANT_SDLGFX=$withval fi # Check whether --with-asciiart or --without-asciiart was given. @@ -5364,17 +5357,44 @@ if test "${enable_ui+set}" = set; then WANT_UI=$enableval fi -# Check whether --with-elf or --without-elf was given. -if test "${with_elf+set}" = set; then - withval="$with_elf" - SYSTEM_IS_ELF=$withval +# Check whether --with-hostcc or --without-hostcc was given. +if test "${with_hostcc+set}" = set; then + withval="$with_hostcc" + HOSTCC=$withval +else + HOSTCC=$CC fi +if [ "x$WANT_SDLSND" = "xyes" -o "x$WANT_SDLGFX" = "xyes" ]; then + WANT_SDL=yes +fi + +if [ "x$WANT_SDL" = "xyes" ]; then + if [ "x$HAVE_SDL_LIB" = "xno" ]; then + echo "Could not find libSDL, disabling SDL support." + NR_ERRORS=`expr $NR_ERRORS + 1` + WANT_SDL=no + WANT_SDLSND=no + WANT_SDLGFX=no + else + LIBS="$LIBS $SDL_LIBS" + ADDITIONAL_CFLAGS="$ADDITIONAL_CFLAGS $SDL_CFLAGS -DUSE_SDL" + fi +fi + if [ "x$WANT_DGA" = "xyes" ]; then - if [ "x$WANT_SVGALIB" = "xyes" -o "x$WANT_GGI" = "xyes" -o "x$WANT_ASCIIART" = "xyes" ]; then - echo "You can't enable DGA for SVGAlib, GGI and ncurses targets!" + if [ "x$WANT_SVGALIB" = "xyes" -o "x$WANT_ASCIIART" = "xyes" -o "x$WANT_SDLGFX" = "xyes" ]; then + echo "You can't enable DGA for SVGAlib, SDL and ncurses targets!" + NR_ERRORS=`expr $NR_ERRORS + 1` + WANT_DGA=no + fi +fi + +if [ "x$WANT_SVGALIB" = "xyes" ]; then + if [ "x$WANT_ASCIIART" = "xyes" -o "x$WANT_SDLGFX" = "xyes" ]; then + echo "You can't enable both SVGAlib and other targets!" NR_ERRORS=`expr $NR_ERRORS + 1` WANT_DGA=no fi @@ -5403,27 +5423,12 @@ if [ "x$WANT_SVGALIB" = "xyes" ]; then fi fi -if [ "x$WANT_GGI" = "xyes" ]; then - if [ "x$HAVE_GGI_LIB" = "xno" ]; then - echo "Could not find libggi, disabling GGI support." - NR_ERRORS=`expr $NR_ERRORS + 1` - WANT_GGI=no - else if [ "x$WANT_SVGALIB" = "xyes" ]; then - echo "You can't configure for both SVGAlib and GGI. Disabling GGI." - NR_ERRORS=`expr $NR_ERRORS + 1` - WANT_GGI=no - else - no_x=yes - fi - fi -fi - if [ "x$WANT_ASCIIART" = "xyes" ]; then if [ "x$HAVE_NCURSES_LIB" = "xno" ]; then echo "Could not find libncurses, disabling ascii art support." NR_ERRORS=`expr $NR_ERRORS + 1` WANT_ASCIIART=no - else if [ "x$WANT_SVGALIB" = "xyes" -o "x$WANT_GGI" = "xyes" ]; then + else if [ "x$WANT_SVGALIB" = "xyes" -o "x$WANT_SDLGFX" = "xyes" ]; then echo "You can't configure for both ncurses and another target. Disabling ncurses." NR_ERRORS=`expr $NR_ERRORS + 1` WANT_ASCIIART=no @@ -5438,7 +5443,7 @@ if [ "x$WANT_DGA" = "xyes" ]; then TMP_SAVE_LIBS=$LIBS LIBS="$X_LIBS $LIBS" echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 -echo "configure:5442: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 +echo "configure:5447: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5446,7 +5451,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXxf86dga $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5490,7 +5495,7 @@ if [ "x$WANT_VIDMODE" = "xyes" ]; then TMP_SAVE_LIBS=$LIBS LIBS="$X_LIBS $LIBS" echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6 -echo "configure:5494: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo "configure:5499: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5498,7 +5503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXxf86vm $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5579,7 +5584,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5583: checking for $ac_word" >&5 +echo "configure:5588: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5614,7 +5619,7 @@ fi min_gtk_version=0.99.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5618: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:5623: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -5637,7 +5642,7 @@ echo "configure:5618: checking for GTK - echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5700,7 +5705,7 @@ main () } EOF -if { (eval echo configure:5704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5734,7 +5739,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -5744,7 +5749,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:5748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -5787,13 +5792,13 @@ rm -f conftest* SHM_SUPPORT_LINKS=0 if [ "x$no_x" != "xyes" -a "x$ac_cv_header_sys_ipc_h" = "xyes" -a "x$ac_cv_header_sys_shm_h" = "xyes" ]; then echo $ac_n "checking whether the X11 MIT-SHM extension can be compiled in""... $ac_c" 1>&6 -echo "configure:5791: checking whether the X11 MIT-SHM extension can be compiled in" >&5 +echo "configure:5796: checking whether the X11 MIT-SHM extension can be compiled in" >&5 TMP_SAVE_CFLAGS=$CFLAGS TMP_SAVE_LIBS=$LIBS CFLAGS="$CFLAGS $X_CFLAGS" LIBS="$X_LIBS $LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* SHM_SUPPORT_LINKS=1 echo "$ac_t""yes" 1>&6 @@ -5837,14 +5842,21 @@ MATHLIB=-lm DEBUGOBJS="debug.o" echo $ac_n "checking which target to use""... $ac_c" 1>&6 -echo "configure:5841: checking which target to use" >&5 +echo "configure:5846: checking which target to use" >&5 -if [ "x$HAVE_DIRECTX" = "xyes" ]; then +if [ "x$WANT_SDLGFX" = "xyes" ]; then + echo "$ac_t""SDL" 1>&6 + MATHLIB= + TARGET=x11 + GFXOBJS="sdlgfx.o" + # @@@ Kludge. This may get changed later. + TARGETDEP=t-x11.h +else if [ "x$HAVE_DIRECTX" = "xyes" ]; then echo "$ac_t""Win32/DirectX" 1>&6 MATHLIB= TARGET=win32 TARGETDEP=t-win32.h - GFXOBJS="osdep/win32.o osdep/win32gui.o osdep/parser.o osdep/keyboard.o osdep/posixemu.o" + GFXOBJS="osdep/win32.o osdep/parser.o osdep/keyboard.o osdep/posixemu.o" RESOBJS="osdep/winuae.res" else if [ "x$HAVE_BEOS" = "xyes" ]; then echo "$ac_t""BeOS" 1>&6 @@ -5852,53 +5864,38 @@ else if [ "x$HAVE_BEOS" = "xyes" ]; then TARGET=beos TARGETDEP=t-beos.h GFXOBJS=osdep/beos.o - GUIOBJS= OPTIMIZE_CFLAGS=-O7 else if [ "x$HAVE_POS" = "xyes" ]; then echo "$ac_t""p.OS" 1>&6 TARGET=p_os TARGETDEP=t-pos.h GFXOBJS="osdep/pos-win.o osdep/pos-disk.o osdep/pos-rexx.o" - GUIOBJS="osdep/pos-gui.o" else if [ "x$HAVE_AMIGA_LIB" = "xyes" ]; then echo "$ac_t""AmigaOS" 1>&6 TARGET=amigaos TARGETDEP=t-amiga.h GFXOBJS="osdep/ami-win.o osdep/ami-disk.o osdep/ami-rexx.o osdep/ami-appw.o" - GUIOBJS="osdep/ami-gui.o" else if [ "x$HAVE_NEXT_LIB" = "xyes" ]; then echo "$ac_t""NeXTStep" 1>&6 MATHLIB= TARGET=next GFXOBJS="NeXTwin.o" - GUIOBJS= TARGETDEP=t-next.h LIBRARIES="-sectcreate __ICON __header ../Uae.app/Uae.iconheader -segprot __ICON r r -sectcreate __ICON app ../Uae.app/Uae.tiff -lMedia_s -lNeXT_s" else if [ "x$no_x" = "xyes" ]; then - if [ "x$WANT_SVGALIB" != "xyes" -a "x$WANT_GGI" != "xyes" -a "x$WANT_ASCIIART" != "xyes" ]; then + if [ "x$WANT_SVGALIB" != "xyes" -a "x$WANT_ASCIIART" != "xyes" ]; then if [ "x$WANT_SVGALIB" != "xno" -a "x$HAVE_SVGA_LIB" = "xyes" ]; then WANT_SVGALIB=yes - else if [ "x$WANT_GGI" != "xno" -a "x$HAVE_GGI_LIB" = "xyes" ]; then - WANT_GGI=yes else if [ "x$WANT_ASCIIART" != "xno" -a "x$HAVE_NCURSES_LIB" = "xyes" ]; then WANT_ASCIIART=yes fi fi - fi fi fi - if [ "x$WANT_GGI" = "xyes" ]; then - echo "$ac_t""GGI" 1>&6 - TARGET=ggilib - TARGETDEP=t-ggi.h - WANT_NCURSES_UI=yes - GFXOBJS=ggi.o - LIBRARIES="-ldl -lggi" - LDFLAGS="-rdynamic $LDFLAGS" - else if [ "x$WANT_SVGALIB" = "xyes" ]; then + if [ "x$WANT_SVGALIB" = "xyes" ]; then echo "$ac_t""SVGAlib" 1>&6 TARGET=svgalib TARGETDEP=t-svgalib.h @@ -5910,7 +5907,7 @@ else TARGET=asciiart TARGETDEP=t-ascii.h GFXOBJS="ncurses.o" - GUIOBJS="tui.o svgancui.o" + WANT_NCURSES_UI=yes LIBRARIES="-lncurses" else if [ "x$no_x" = "xyes" ]; then echo "$ac_t""Ummm...." 1>&6 @@ -5921,7 +5918,6 @@ else TARGET=x11 TARGETDEP=t-x11.h GFXOBJS=xwin.o - GUIOBJS=nogui.o LIBRARIES="$X_LIBS $X_PRE_LIBS" if [ "x$WANT_DGA" = "xyes" ]; then @@ -5933,23 +5929,6 @@ else fi fi LIBRARIES="$LIBRARIES -lXext -lX11 $X_EXTRA_LIBS" - - if [ "x$WANT_UI" != "xno" ]; then - if [ "x$no_gtk" = "xyes" ]; then - echo "Did not find gtk+, disabling user interface" - GTK_CFLAGS= - GTK_LIBS= - if [ "x$WANT_UI" = "xyes" ]; then - NR_ERRORS=`expr $NR_ERRORS + 1` - fi - else - echo "Using gtk+ GUI." - NEED_THREAD_SUPPORT=yes - ADDITIONAL_CFLAGS="$ADDITIONAL_CFLAGS -DUSING_GTK_GUI" - GUIOBJS=gtkui.o - fi - fi - fi fi fi fi @@ -5958,29 +5937,67 @@ fi fi fi fi +fi -if [ "x$WANT_NCURSES_UI" = "xyes" ]; then - if [ "x$HAVE_NCURSES_LIB" = "xno" ]; then - if [ "x$WANT_UI" = "xyes" ]; then +if [ "x$HAVE_DIRECTX" = "xyes" ]; then + TARGETDEP=t-win32.h + TARGET=win32 +fi + +if [ "x$WANT_UI" != "xno" ]; then + if [ "x$HAVE_DIRECTX" = "xyes" ]; then + GUIOBJS=osdep/win32gui.o + else if [ "x$HAVE_AMIGA_LIB" = "xyes" ]; then + GUIOBJS="osdep/ami-gui.o" + else if [ "x$HAVE_POS" = "xyes" ]; then + GUIOBJS="osdep/pos-gui.o" + else if [ "x$WANT_NCURSES_UI" = "xyes" ]; then + if [ "x$HAVE_NCURSES_LIB" = "xno" ]; then echo "ncurses is unavailable, can't provide a user interface" - NR_ERRORS=`expr $NR_ERRORS + 1` + if [ "x$WANT_UI" = "xyes" ]; then + NR_ERRORS=`expr $NR_ERRORS + 1` + fi + WANT_UI=no + GUIOBJS=nogui.o + else + GUIOBJS="tui.o svgancui.o" + LIBRARIES="$LIBRARIES -lncurses" + ADDITIONAL_CFLAGS="$ADDITIONAL_CFLAGS -DUSING_CURSES_UI" + if [ "x$ac_cv_header_ncurses_h" = "xno" ]; then + echo "Found libncurses, but no ncurses.h. This is normal with recent versions" + echo "of ncurses, but it might indicate a problem with older versions." + NR_WARNINGS=`expr $NR_WARNINGS + 1` + fi fi - WANT_UI=no - fi - if [ "x$WANT_UI" != "xno" ]; then - GUIOBJS="tui.o svgancui.o" - LIBRARIES="$LIBRARIES -lncurses" - ADDITIONAL_CFLAGS="$ADDITIONAL_CFLAGS -DUSING_CURSES_UI" - if [ "x$ac_cv_header_ncurses_h" = "xno" ]; then - echo "Found libncurses, but no ncurses.h. This is normal with recent versions" - echo "of ncurses, but it might indicate a problem with older versions." - NR_WARNINGS=`expr $NR_WARNINGS + 1` + else if [ "x$no_x" != "xno" ]; then + if [ "x$no_gtk" = "xyes" ]; then + echo "Did not find gtk+, disabling user interface" + GTK_CFLAGS= + GUIOBJS=nogui.o + if [ "x$WANT_UI" = "xyes" ]; then + NR_ERRORS=`expr $NR_ERRORS + 1` + fi + else + echo "Using gtk+ GUI." + NEED_THREAD_SUPPORT=yes + DDITIONAL_CFLAGS="$ADDITIONAL_CFLAGS -DUSING_GTK_GUI" + GUIOBJS=gtkui.o + fi + else + if [ "x$WANT_UI" = "xyes" ]; then + echo "GUI requested, but no suitable libraries found." + NR_ERRORS=`expr $NR_ERRORS + 1` fi - else GUIOBJS=nogui.o fi + fi + fi + fi + fi +else + GUIOBJS=nogui.o fi - + GFXOBJS="$GFXOBJS $GUIOBJS" @@ -5999,7 +6016,6 @@ USE_UNDERSCORE=dunno HAVELINUX=no HAVEBSD=no HAVEGCC27=no -HAVEGAS=no HAVEI386=no HAVE68K=no HAVEPPC=no @@ -6009,9 +6025,9 @@ ASMOBJS= CPUOBJS=cpuemu.o echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6 -echo "configure:6013: checking for GCC 2.7 or higher" >&5 +echo "configure:6029: checking for GCC 2.7 or higher" >&5 cat > conftest.$ac_ext < 1 || __GNUC_MINOR__ - 1 > 5 yes @@ -6042,9 +6058,9 @@ fi if [ "x$ac_cv_header_features_h" = "xyes" ]; then echo $ac_n "checking for glibc-2.0 or higher""... $ac_c" 1>&6 -echo "configure:6046: checking for glibc-2.0 or higher" >&5 +echo "configure:6062: checking for glibc-2.0 or higher" >&5 cat > conftest.$ac_ext < #if __GLIBC__ - 1 >= 1 @@ -6091,9 +6107,9 @@ else fi echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6 -echo "configure:6095: checking for x86 target CPU" >&5 +echo "configure:6111: checking for x86 target CPU" >&5 cat > conftest.$ac_ext <&6 -echo "configure:6117: checking for m68k target CPU" >&5 +echo "configure:6133: checking for m68k target CPU" >&5 cat > conftest.$ac_ext <&6 -echo "configure:6139: checking for ppc target CPU" >&5 +echo "configure:6155: checking for ppc target CPU" >&5 cat > conftest.$ac_ext </dev/null`; then fi -echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6 -echo "configure:6170: checking for GAS .p2align feature" >&5 -cat >conftest.S << EOF - .text - .p2align 5 -EOF -if $CC conftest.S -c -o conftest.o >/dev/null 2>&1 ; then HAVEGAS=yes; fi -echo "$ac_t""$HAVEGAS" 1>&6 - echo $ac_n "checking whether assembler symbols need an underscore""... $ac_c" 1>&6 -echo "configure:6179: checking whether assembler symbols need an underscore" >&5 +echo "configure:6186: checking whether assembler symbols need an underscore" >&5 cat >conftest1.S << EOF .text .globl _symbol @@ -6207,53 +6214,19 @@ if test "${enable_threads+set}" = set; t fi -if [ "x$NEED_THREAD_SUPPORT" = "xyes" ]; then - if [ "x$USE_THREADS" != "xyes" ]; then - echo "The gtk+ GUI needs threads; enabling thread support." - fi -fi - -if [ "x$USE_THREADS" = "xyes" -o "x$NEED_THREAD_SUPPORT" = "xyes" ]; then - if [ "x$HAVE_PTHREAD_LIB" = "xyes" ]; then - THREADDEP=td-posix - CFLAGS="$CFLAGS -DSUPPORT_THREADS -D_REENTRANT" - LIBS="$LIBS -lpthread" - if [ "x$HAVE_POSIX4_LIB" = "xyes" ]; then - LIBS="$LIBS -lposix4" - fi - - if [ "x$USE_THREADS" = "xyes" ]; then - CFLAGS="$CFLAGS -DUAE_FILESYS_THREADS" - fi - - if [ "x$HAVELINUX" = "xno" -o "x$HAVEGLIBC2" = "xno" ]; then - echo "Thread support has only been tested on Linux systems with glibc-2.0" - NR_WARNINGS=`expr $NR_WARNINGS + 1` - fi - if [ "x$TARGET" = "xsvgalib" ]; then - echo "If you didn't compile a fixed version of SVGAlib then thread support" - echo "in UAE will lock your machine real hard." - NR_WARNINGS=`expr $NR_WARNINGS + 1` - fi - else - echo "You tried to enable threads, but I couldn't find a thread library!" - NR_ERRORS=`expr $NR_ERRORS + 1` - fi -fi - if [ "x$HAVEGCC27" = "xyes" -a "x$HAVEI386" = "xyes" ]; then SAVECFLAGS=$CFLAGS CFLAGS="$CFLAGS -mno-schedule-prologue" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NO_SCHED_CFLAGS="-mno-schedule-prologue" else @@ -6268,14 +6241,14 @@ if [ "x$HAVEGCC27" = "xyes" -a "x$HAVEI3 SAVECFLAGS=$CFLAGS CFLAGS="$CFLAGS -mpreferred-stack-boundary=2" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SAVECFLAGS=$CFLAGS else @@ -6292,14 +6265,14 @@ if [ "x$HAVEGCC27" = "xyes" -a "x$HAVEI3 CFLAGS="$CFLAGS -fno-exceptions" NOEXCEPTIONS=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NOEXCEPTIONS=yes else @@ -6318,12 +6291,9 @@ if [ "x$HAVEGCC27" = "xyes" -a "x$HAVEI3 MACHDEP=md-i386-gcc CFLAGS="$CFLAGS -DUNALIGNED_PROFITABLE -fno-strength-reduce -DREGPARAM=\"__attribute__((regparm(3)))\"" - if [ "x$HAVEGAS" = "xyes" ]; then - CFLAGS="$CFLAGS -DX86_ASSEMBLY" - ASMOBJS=md-X86.o - - CPUOBJS=cpufast.o - fi + CFLAGS="$CFLAGS -DX86_ASSEMBLY -DOPTIMIZED_FLAGS" + ASMOBJS=md-X86.o + CPUOBJS=cpufast.o else if test $uae_cv_prog_cc_watcom = yes; then MACHDEP=md-i386-watcom echo CFLAGS before: $CFLAGS @@ -6390,8 +6360,10 @@ fi fi fi +FSDBOBJS=fsdb_unix.o if [ "x$TARGET" = "xwin32" ]; then OSDEP=od-win32 + FSDBOBJS=osdep/fsdb_win32.o if test $ac_cv_prog_gcc = yes; then LIBS="$LIBS -lddraw -lwinmm -lcomctl32 -lcomdlg32 -luser32 -lgdi32 -lkernel32 -ladvapi32 -lshell32" else if test $uae_cv_prog_cc_watcom = yes; then @@ -6400,23 +6372,20 @@ if [ "x$TARGET" = "xwin32" ]; then fi else if [ "x$HAVELINUX" = "xyes" ]; then OSDEP=od-linux - if [ "x$HAVEGLIBC2" = "xyes" -a "x$HAVEI386" = "xyes" ]; then - CFLAGS="$CFLAGS -DHAVE_GLIBC_2_LINUX" - fi fi fi if [ "x$TARGET" = "xx11" -o "x$TARGET" = "xsvgalib" -o "x$TARGET" = "xamigaos" \ - -o "x$TARGET" = "xbeos" -o "x$TARGET" = "xasciiart" -o "x$TARGET" = "xggilib" -o "x$TARGET" = "xp_os" ]; then + -o "x$TARGET" = "xbeos" -o "x$TARGET" = "xasciiart" -o "x$TARGET" = "xp_os" ]; then CFLAGS="$CFLAGS -DUSE_ZFILE" fi HAVE_USS_SOUND=no if [ "x$ac_cv_header_sys_soundcard_h" = "xyes" -o "x$ac_cv_header_machine_soundcard_h" = "xyes" ]; then echo $ac_n "checking whether sys/soundcard.h or machine/soundcard.h works""... $ac_c" 1>&6 -echo "configure:6418: checking whether sys/soundcard.h or machine/soundcard.h works" >&5 +echo "configure:6387: checking whether sys/soundcard.h or machine/soundcard.h works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_USS_SOUND=yes @@ -6449,7 +6418,7 @@ if [ "x$ac_cv_header_dmedia_audio.h" = " fi echo $ac_n "checking which sound system to use""... $ac_c" 1>&6 -echo "configure:6453: checking which sound system to use" >&5 +echo "configure:6422: checking which sound system to use" >&5 # Check whether --enable-file-sound or --disable-file-sound was given. if test "${enable_file_sound+set}" = set; then enableval="$enable_file_sound" @@ -6461,6 +6430,11 @@ if [ "x$USE_FILE_SOUND" = "xyes" ]; then echo "$ac_t""file output" 1>&6 SOUNDDEP=sd-file USE_SOUND=yes +else if [ "x$WANT_SDLSND" = "xyes" ]; then + echo "$ac_t""SDL" 1>&6 + SOUNDDEP=sd-sdl + USE_SOUND=yes + NEED_THREAD_SUPPORT=yes else if [ "x$HAVE_USS_SOUND" = "xyes" ]; then echo "$ac_t""USS" 1>&6 SOUNDDEP=sd-uss @@ -6517,39 +6491,104 @@ fi fi fi fi +fi + +if [ "x$NEED_THREAD_SUPPORT" = "xyes" ]; then + if [ "x$USE_THREADS" != "xyes" ]; then + echo "Threads are needed for this configuration; enabling thread support." + fi +fi + +if [ "x$USE_THREADS" = "xyes" -o "x$NEED_THREAD_SUPPORT" = "xyes" ]; then + if [ "x$WANT_SDL" = "xyes" ]; then + THREADDEP=td-sdl + else if [ "x$HAVE_PTHREAD_LIB" = "xyes" ]; then + THREADDEP=td-posix + CFLAGS="$CFLAGS -DSUPPORT_THREADS -D_REENTRANT" + LIBS="$LIBS -lpthread" + if [ "x$HAVE_POSIX4_LIB" = "xyes" ]; then + LIBS="$LIBS -lposix4" + fi + + if [ "x$USE_THREADS" = "xyes" ]; then + CFLAGS="$CFLAGS -DUAE_FILESYS_THREADS" + fi + + if [ "x$HAVELINUX" = "xno" -o "x$HAVEGLIBC2" = "xno" ]; then + echo "Thread support has only been tested on Linux systems with glibc-2.0" + NR_WARNINGS=`expr $NR_WARNINGS + 1` + fi + if [ "x$TARGET" = "xsvgalib" ]; then + echo "If you didn't compile a fixed version of SVGAlib then thread support" + echo "in UAE will lock your machine real hard." + NR_WARNINGS=`expr $NR_WARNINGS + 1` + fi + else + echo "You tried to enable threads, but I couldn't find a thread library!" + NR_ERRORS=`expr $NR_ERRORS + 1` + fi + fi +fi SCSIOBJS=scsi-none.o -SCSIDEP=scg-none # Check whether --enable-scsi-device or --disable-scsi-device was given. if test "${enable_scsi_device+set}" = set; then enableval="$enable_scsi_device" USE_SCSI_DEVICE=$enableval fi - if [ "x$USE_SCSI_DEVICE" = "xyes" ]; then - echo $ac_n "checking which scsi system to use""... $ac_c" 1>&6 -echo "configure:6533: checking which scsi system to use" >&5 - if [ "x$ac_cv_header_scsi_sg_h" = "xyes" ]; then - echo "$ac_t""Linux SG" 1>&6 + echo $ac_n "checking "availability of libscg headers and lib"""... $ac_c" 1>&6 +echo "configure:6543: checking "availability of libscg headers and lib"" >&5 + OLDLIBS="$LIBS" + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Isrc/include" + LIBS="-Lsrc $LIBS -lscg -lschily" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + echo "$ac_t""available" 1>&6 SCSIOBJS=scsidev.o - SCSIDEP=scg-linux-sg - else - echo "$ac_t""SCSI not supported for this system" 1>&6 - fi + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""not available" 1>&6 + NR_WARNINGS=`expr $NR_WARNINGS + 1` + echo "Please refer to the UAE SCSI device section in docs/README for installation instructions." + LIBS="$OLDLIBS" + +fi +rm -f conftest* + CFLAGS="$OLDCFLAGS" fi -if [ "x$HAVE_MACHINE_JOYSTICK_H" = "xyes" ]; then - cat > conftest.$ac_ext < conftest.$ac_ext < int main() { { struct joystick a; } ; return 0; } EOF -if { (eval echo configure:6553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* OD_JOYSTICK=od-linux/joystick.c else @@ -6560,6 +6599,7 @@ rm -f conftest* else OD_JOYSTICK=$OSDEP/joystick.c fi +fi rm -f src/machdep rm -f src/osdep @@ -6576,13 +6616,13 @@ rm -f src/scsi-support.c if [ "x$TARGET" = "xamigaos" -o "x$TARGET" = "xp_os" ]; then echo $ac_n "checking which CPU to use""... $ac_c" 1>&6 -echo "configure:6580: checking which CPU to use" >&5 +echo "configure:6620: checking which CPU to use" >&5 cpu=`cpu | cut -d' ' -f2` echo "$ac_t""$cpu" 1>&6 CFLAGS="$CFLAGS -m$cpu" echo $ac_n "checking which FPU to use""... $ac_c" 1>&6 -echo "configure:6586: checking which FPU to use" >&5 +echo "configure:6626: checking which FPU to use" >&5 fpu=`cpu | cut -d' ' -f3 | grep '^688812$'` if [ "x$fpu" != "x" ]; then echo "$ac_t""68881" 1>&6 @@ -6609,6 +6649,7 @@ fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -6748,6 +6789,7 @@ s%@MAKEDEPPRG@%$MAKEDEPPRG%g s%@FILEPRG@%$FILEPRG%g s%@WRCPRG@%$WRCPRG%g s%@RCLPRG@%$RCLPRG%g +s%@SDL_CONFIG@%$SDL_CONFIG%g s%@EXEEXT@%$EXEEXT%g s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g @@ -6758,7 +6800,6 @@ s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g s%@ac_cv_c_inline@%$ac_cv_c_inline%g -s%@WRC@%$WRC%g s%@NO_SCHED_CFLAGS@%$NO_SCHED_CFLAGS%g s%@LIBRARIES@%$LIBRARIES%g s%@TARGET@%$TARGET%g @@ -6768,6 +6809,7 @@ s%@ASMOBJS@%$ASMOBJS%g s%@SCSIOBJS@%$SCSIOBJS%g s%@CPUOBJS@%$CPUOBJS%g s%@DEBUGOBJS@%$DEBUGOBJS%g +s%@FSDBOBJS@%$FSDBOBJS%g s%@MATHLIB@%$MATHLIB%g s%@SHM_SUPPORT_LINKS@%$SHM_SUPPORT_LINKS%g s%@top_srcdir@%$top_srcdir%g @@ -7016,15 +7058,17 @@ echo "#include \"$abssrcdir/src/$SOUNDDE echo "#include \"$abssrcdir/src/$OD_JOYSTICK\"" >src/od-joy.c echo "#include \"$abssrcdir/src/$MACHDEP/support.c\"" >src/md-support.c -if [ "x$SCSIDEP" != "xscg-none" ]; then - echo "#include \"$abssrcdir/src/$SCSIDEP/scsi.h\"" >src/scsi-support.c - echo "#include \"$abssrcdir/src/$SCSIDEP/scsi.c\"" >>src/scsi-support.c -fi if [ "x$MACHDEP" = "xmd-i386-gcc" ]; then echo "#include \"machdep/X86.S\"" >src/md-X86.S fi echo "#include \"$abssrcdir/src/include/$FPP_H\"" >src/md-fpp.h +mkdir -p src/tools +progname=$0 +srcd=`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +topsrcdir=`cd $srcd; pwd` +cd src/tools +CC=$HOSTCC $topsrcdir/src/tools/configure echo echo