--- uae/configure 2018/04/24 16:38:19 1.1.1.1 +++ uae/configure 2018/04/24 16:38:36 1.1.1.2 @@ -13,6 +13,10 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --with-x use the X Window System" +ac_help="$ac_help +--disable-gui Don't use the Tcl/Tk GUI" +ac_help="$ac_help +--disable-DGA Don't use the DGA extension" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -447,7 +451,7 @@ echo > confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=amiga/transdisk.c +ac_unique_file=amiga/source/transdisk.c # Find the source files, if location was not specified. if test -z "$srcdir"; then @@ -601,7 +605,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:605: \"$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:609: \"$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 @@ -654,13 +658,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:664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -669,13 +673,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:679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -724,7 +728,7 @@ fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -810,7 +814,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lNeXT_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -845,7 +849,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lvga $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -884,7 +888,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lAF $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -980,12 +984,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1052,7 +1056,7 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1181,7 +1185,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1229,7 +1233,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1268,7 +1272,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1312,7 +1316,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1355,7 +1359,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1400,7 +1404,7 @@ if eval "test \"`echo '$''{'ac_cv_header echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1409,7 +1413,7 @@ int t() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1440,7 +1444,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1479,7 +1483,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1520,11 +1524,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -1542,7 +1546,7 @@ if eval "test \"`echo '$''{'ac_cv_header echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1550,7 +1554,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1565,7 +1569,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1583,7 +1587,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1604,7 +1608,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1615,7 +1619,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -{ (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then : else @@ -1642,12 +1646,12 @@ if eval "test \"`echo '$''{'ac_cv_header 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:1651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1671,7 +1675,7 @@ else fi done -for ac_hdr in sys/vfs.h sys/mount.h sys/param.h sys/statfs.h sys/statvfs.h sys/stat.h linux/joystick.h +for ac_hdr in sys/vfs.h sys/mount.h sys/select.h sys/param.h sys/statfs.h sys/statvfs.h sys/stat.h linux/joystick.h do ac_safe=`echo "$ac_hdr" | tr './\055' '___'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1679,12 +1683,12 @@ if eval "test \"`echo '$''{'ac_cv_header 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:1688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1729,7 +1733,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1740,7 +1744,7 @@ main() exit(0); } EOF -{ (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_char=`cat conftestval` else @@ -1763,7 +1767,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1774,7 +1778,7 @@ main() exit(0); } EOF -{ (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_short=`cat conftestval` else @@ -1797,7 +1801,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1808,7 +1812,7 @@ main() exit(0); } EOF -{ (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_int=`cat conftestval` else @@ -1831,7 +1835,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1842,7 +1846,7 @@ main() exit(0); } EOF -{ (eval echo configure:1846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_long=`cat conftestval` else @@ -1865,7 +1869,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1876,7 +1880,7 @@ main() exit(0); } EOF -{ (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_long_long=`cat conftestval` else @@ -1897,7 +1901,7 @@ if eval "test \"`echo '$''{'ac_cv_c_cons echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1973,7 +1977,7 @@ 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:1989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break fi @@ -2009,7 +2013,7 @@ if eval "test \"`echo '$''{'ac_cv_type_m echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2040,7 +2044,7 @@ if eval "test \"`echo '$''{'ac_cv_type_o echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2071,7 +2075,7 @@ if eval "test \"`echo '$''{'ac_cv_type_p echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2102,7 +2106,7 @@ if eval "test \"`echo '$''{'ac_cv_struct echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2111,7 +2115,7 @@ int t() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2137,7 +2141,7 @@ if eval "test \"`echo '$''{'ac_cv_header echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2147,7 +2151,7 @@ int t() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2171,7 +2175,7 @@ if eval "test \"`echo '$''{'ac_cv_struct echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2180,7 +2184,7 @@ int t() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2207,7 +2211,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_g else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -2225,7 +2229,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -2254,7 +2258,7 @@ else ac_cv_func_memcmp=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_memcmp=yes else @@ -2282,7 +2286,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2300,7 +2304,7 @@ int t() { int i; ; return 0; } EOF -if { (eval echo configure:2304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2327,7 +2331,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2338,7 +2342,7 @@ exit(!(stat ("conftestdata", &s) == 0 && && t.st_mtime - s.st_mtime < 120)); } EOF -{ (eval echo configure:2342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_utime_null=yes else @@ -2364,7 +2368,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2414,19 +2418,25 @@ done echo $ac_n "checking how many args statfs takes""... $ac_c" 1>&6 if [ $ac_cv_func_statfs = "yes" ]; then cat > conftest.$ac_ext < +#endif +#ifdef HAVE_SYS_PARAM_H +#include +#endif #ifdef HAVE_SYS_MOUNT_H #include #endif +#ifdef HAVE_SYS_SELECT_H +#include +#endif #ifdef HAVE_SYS_VFS_H #include #endif -#ifdef HAVE_SYS_PARAM_H -#include -#endif #ifdef HAVE_SYS_STATFS_H #include #endif @@ -2438,7 +2448,7 @@ int t() { struct statfs statbuf;statfs("/",&statbuf); ; return 0; } EOF -if { (eval echo configure:2442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""2" 1>&6 STATFS_NO_ARGS=2 @@ -2454,19 +2464,25 @@ fi echo $ac_n "checking whether to use f_bavail or f_bfree""... $ac_c" 1>&6 if [ $ac_cv_func_statfs = "yes" ]; then cat > conftest.$ac_ext < +#endif +#ifdef HAVE_SYS_PARAM_H +#include +#endif #ifdef HAVE_SYS_MOUNT_H #include #endif +#ifdef HAVE_SYS_SELECT_H +#include +#endif #ifdef HAVE_SYS_VFS_H #include #endif -#ifdef HAVE_SYS_PARAM_H -#include -#endif #ifdef HAVE_SYS_STATFS_H #include #endif @@ -2478,7 +2494,7 @@ int t() { struct statfs statbuf;statbuf.f_bavail; ; return 0; } EOF -if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""f_bavail" 1>&6 STATBUF_BAVAIL=f_bavail @@ -2491,6 +2507,46 @@ rm -f conftest* fi +USE_GUI=yes +# Check whether --enable-gui or --disable-gui was given. +if test "${enable_gui+set}" = set; then + enableval="$enable_gui" + USE_GUI=$enableval +fi + +if [ $USE_GUI = "yes" ]; then + # Extract the first word of "wish4.0", so it can be a program name with args. +set dummy wish4.0; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_USE_GUI'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$USE_GUI"; then + ac_cv_prog_USE_GUI="$USE_GUI" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_USE_GUI="yes" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_USE_GUI" && ac_cv_prog_USE_GUI="no" +fi +fi +USE_GUI="$ac_cv_prog_USE_GUI" +if test -n "$USE_GUI"; then + echo "$ac_t""$USE_GUI" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + echo "Disabling the GUI." +fi + echo $ac_n "checking which target to use""... $ac_c" 1>&6 if [ $HAVE_BEBOX = "y" ]; then echo "$ac_t""BeBox" 1>&6 @@ -2512,54 +2568,140 @@ else else echo "$ac_t""SVGAlib" 1>&6 TARGET=svgalib - GFXOBJS="svga.o nogui.o" - LIBRARIES=-lvga + echo $ac_n "checking for -lncurses""... $ac_c" 1>&6 +ac_lib_var=`echo ncurses'_'waddch | tr './+\055' '__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="-lncurses $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + 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 + ac_tr_lib=HAVE_LIB`echo ncurses | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +HAVE_GUI=no +fi + + if [ $USE_GUI = "yes" ]; then + GFXOBJS="svga.o tui.o svgancui.o" + LIBRARIES="-lvga -lncurses" + else + GFXOBJS="svga.o nogui.o" + LIBRARIES="-lvga" + fi fi else echo "$ac_t""X Window System" 1>&6 TARGET=x11 - LIBRARIES="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS" - # Extract the first word of "wish4.0", so it can be a program name with args. -set dummy wish4.0; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_TCLGUI'+set}'`\" = set"; then + USEDGA=no + # Check whether --enable-DGA or --disable-DGA was given. +if test "${enable_DGA+set}" = set; then + enableval="$enable_DGA" + USEDGA=$enableval +fi + + if [ $USEDGA = "yes" ]; then + TMP_SAVE_LIBS=$LIBS + LIBS=$X_LIBS $LIBS + echo $ac_n "checking for -lXxf86dga""... $ac_c" 1>&6 +ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | tr './+\055' '__p_'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$TCLGUI"; then - ac_cv_prog_TCLGUI="$TCLGUI" # Let the user override the test. + ac_save_LIBS="$LIBS" +LIBS="-lXxf86dga -lXext -lX11 $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_TCLGUI="yes" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_TCLGUI" && ac_cv_prog_TCLGUI="no" + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" + fi -TCLGUI="$ac_cv_prog_TCLGUI" -if test -n "$TCLGUI"; then - echo "$ac_t""$TCLGUI" 1>&6 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + USEDGA=yes else echo "$ac_t""no" 1>&6 +USEDGA=no fi - if [ $TCLGUI = "yes" ]; then + LIBS=$TMP_SAVE_LIBS + fi + if [ $USEDGA = "yes" ]; then + LIBRARIES="$X_LIBS $X_PRE_LIBS -lXxf86dga -lXext -lX11 $X_EXTRA_LIBS" + X_CFLAGS="$X_CFLAGS -DUSE_DGA_EXTENSION" + USE_GUI=no + else + LIBRARIES="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS" + USE_GUI=yes + fi + if [ $USE_GUI = "yes" ]; then GFXOBJS="xwin.o xui.o" else - GFXOBJS="xwin.o nogui.o" + if [ $USEDGA = "yes" ]; then + GFXOBJS="xdga.o nogui.o" + else + GFXOBJS="xwin.o nogui.o" + fi fi fi fi fi ASMOBJS= +CPUOBJS="cpu0.o cpu1.o cpu2.o cpu3.o cpu4.o cpu5.o cpu6.o cpu7.o cpu8.o cpu9.o cpuA.o cpuB.o cpuC.o cpuD.o cpuE.o cpuF.o" + if [ "$CC" = "gcc" ]; then - CFLAGS="-O3 -fomit-frame-pointer -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes" + CFLAGS="-O3 -fomit-frame-pointer -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes -fno-strength-reduce" echo $ac_n "checking whether we are on a Linux/i386 ELF system""... $ac_c" 1>&6 LINUXELF=n if MACHINE=`uname -a 2>/dev/null`; then @@ -2582,12 +2724,19 @@ EOF else echo "$ac_t""yes" 1>&6 ASMOBJS=X86.o + CPUOBJS="cpu_fast0.o cpu_fast1.o cpu_fast2.o cpu_fast3.o cpu_fast4.o cpu_fast5.o cpu_fast6.o cpu_fast7.o cpu_fast8.o cpu_fast9.o cpu_fastA.o cpu_fastB.o cpu_fastC.o cpu_fastD.o cpu_fastE.o cpu_fastF.o" CFLAGS="$CFLAGS -DX86_ASSEMBLY" fi else - echo "GCC wasn't found. UAE may or may not compile and run correctly." + echo "Couldn't find GCC. UAE may or may not compile and run correctly." fi +if [ $TARGET = "x11" -o $TARGET = "svgalib" ]; then + CFLAGS="$CFLAGS -DUSE_ZFILE" +fi + + + @@ -2683,7 +2832,7 @@ done ac_given_srcdir=$srcdir -trap 'rm -fr `echo "Makefile sysconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "src/Makefile Makefile src/include/sysconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -2805,7 +2955,7 @@ ac_eB='$%\1#\2define\3' ac_eC=' ' ac_eD='%g' -CONFIG_HEADERS=${CONFIG_HEADERS-"sysconfig.h"} +CONFIG_HEADERS=${CONFIG_HEADERS-"src/include/sysconfig.h"} for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then # Support "outfile[:infile]", defaulting infile="outfile.in". case "$ac_file" in