ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/configure
(Generate patch)

Comparing BasiliskII/src/Unix/configure (file contents):
Revision 1.1 by cebix, 1999-10-03T14:16:25Z vs.
Revision 1.7 by cebix, 1999-10-21T13:19:14Z

# Line 12 | Line 12 | ac_help=
12   ac_default_prefix=/usr/local
13   # Any additions from configure.in:
14   ac_help="$ac_help
15 <  --enable-dga            use the DGA extension (default)"
15 >  --enable-xf86-dga       use the XFree86 DGA extension (default)"
16 > ac_help="$ac_help
17 >  --enable-fbdev-dga      use direct frame buffer access via /dev/fb (default)"
18   ac_help="$ac_help
19    --enable-ui             use GTK user interface (default)"
20   ac_help="$ac_help
# Line 536 | Line 538 | fi
538  
539  
540  
541 < WANT_DGA=yes
541 > WANT_XF86_DGA=yes
542 > WANT_FBDEV_DGA=yes
543   WANT_UI=yes
544 < # Check whether --enable-dga or --disable-dga was given.
545 < if test "${enable_dga+set}" = set; then
546 <  enableval="$enable_dga"
547 <  WANT_DGA=$enableval
544 > # Check whether --enable-xf86-dga or --disable-xf86-dga was given.
545 > if test "${enable_xf86_dga+set}" = set; then
546 >  enableval="$enable_xf86_dga"
547 >  WANT_XF86_DGA=$enableval
548 > fi
549 >
550 > # Check whether --enable-fbdev-dga or --disable-fbdev-dga was given.
551 > if test "${enable_fbdev_dga+set}" = set; then
552 >  enableval="$enable_fbdev_dga"
553 >  WANT_FBDEV_DGA=$enableval
554   fi
555  
556   # Check whether --enable-ui or --disable-ui was given.
# Line 554 | Line 563 | fi
563   # Extract the first word of "gcc", so it can be a program name with args.
564   set dummy gcc; ac_word=$2
565   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
566 < echo "configure:558: checking for $ac_word" >&5
566 > echo "configure:567: checking for $ac_word" >&5
567   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
568    echo $ac_n "(cached) $ac_c" 1>&6
569   else
# Line 584 | Line 593 | if test -z "$CC"; then
593    # Extract the first word of "cc", so it can be a program name with args.
594   set dummy cc; ac_word=$2
595   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
596 < echo "configure:588: checking for $ac_word" >&5
596 > echo "configure:597: checking for $ac_word" >&5
597   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
598    echo $ac_n "(cached) $ac_c" 1>&6
599   else
# Line 635 | Line 644 | fi
644        # Extract the first word of "cl", so it can be a program name with args.
645   set dummy cl; ac_word=$2
646   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
647 < echo "configure:639: checking for $ac_word" >&5
647 > echo "configure:648: checking for $ac_word" >&5
648   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
649    echo $ac_n "(cached) $ac_c" 1>&6
650   else
# Line 667 | Line 676 | fi
676   fi
677  
678   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
679 < echo "configure:671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
679 > echo "configure:680: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
680  
681   ac_ext=c
682   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 678 | Line 687 | cross_compiling=$ac_cv_prog_cc_cross
687  
688   cat > conftest.$ac_ext << EOF
689  
690 < #line 682 "configure"
690 > #line 691 "configure"
691   #include "confdefs.h"
692  
693   main(){return(0);}
694   EOF
695 < if { (eval echo configure:687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
695 > if { (eval echo configure:696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
696    ac_cv_prog_cc_works=yes
697    # If we can't run a trivial program, we are probably using a cross compiler.
698    if (./conftest; exit) 2>/dev/null; then
# Line 709 | Line 718 | if test $ac_cv_prog_cc_works = no; then
718    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
719   fi
720   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
721 < echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
721 > echo "configure:722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
722   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
723   cross_compiling=$ac_cv_prog_cc_cross
724  
725   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
726 < echo "configure:718: checking whether we are using GNU C" >&5
726 > echo "configure:727: checking whether we are using GNU C" >&5
727   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
728    echo $ac_n "(cached) $ac_c" 1>&6
729   else
# Line 723 | Line 732 | else
732    yes;
733   #endif
734   EOF
735 < if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
735 > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
736    ac_cv_prog_gcc=yes
737   else
738    ac_cv_prog_gcc=no
# Line 742 | Line 751 | ac_test_CFLAGS="${CFLAGS+set}"
751   ac_save_CFLAGS="$CFLAGS"
752   CFLAGS=
753   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
754 < echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
754 > echo "configure:755: checking whether ${CC-cc} accepts -g" >&5
755   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
756    echo $ac_n "(cached) $ac_c" 1>&6
757   else
# Line 773 | Line 782 | else
782    fi
783   fi
784  
785 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
786 + echo "configure:787: checking how to run the C preprocessor" >&5
787 + # On Suns, sometimes $CPP names a directory.
788 + if test -n "$CPP" && test -d "$CPP"; then
789 +  CPP=
790 + fi
791 + if test -z "$CPP"; then
792 + if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
793 +  echo $ac_n "(cached) $ac_c" 1>&6
794 + else
795 +    # This must be in double quotes, not single quotes, because CPP may get
796 +  # substituted into the Makefile and "${CC-cc}" will confuse make.
797 +  CPP="${CC-cc} -E"
798 +  # On the NeXT, cc -E runs the code through the compiler's parser,
799 +  # not just through cpp.
800 +  cat > conftest.$ac_ext <<EOF
801 + #line 802 "configure"
802 + #include "confdefs.h"
803 + #include <assert.h>
804 + Syntax Error
805 + EOF
806 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
807 + { (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
808 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
809 + if test -z "$ac_err"; then
810 +  :
811 + else
812 +  echo "$ac_err" >&5
813 +  echo "configure: failed program was:" >&5
814 +  cat conftest.$ac_ext >&5
815 +  rm -rf conftest*
816 +  CPP="${CC-cc} -E -traditional-cpp"
817 +  cat > conftest.$ac_ext <<EOF
818 + #line 819 "configure"
819 + #include "confdefs.h"
820 + #include <assert.h>
821 + Syntax Error
822 + EOF
823 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
824 + { (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
825 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
826 + if test -z "$ac_err"; then
827 +  :
828 + else
829 +  echo "$ac_err" >&5
830 +  echo "configure: failed program was:" >&5
831 +  cat conftest.$ac_ext >&5
832 +  rm -rf conftest*
833 +  CPP="${CC-cc} -nologo -E"
834 +  cat > conftest.$ac_ext <<EOF
835 + #line 836 "configure"
836 + #include "confdefs.h"
837 + #include <assert.h>
838 + Syntax Error
839 + EOF
840 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
841 + { (eval echo configure:842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
842 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
843 + if test -z "$ac_err"; then
844 +  :
845 + else
846 +  echo "$ac_err" >&5
847 +  echo "configure: failed program was:" >&5
848 +  cat conftest.$ac_ext >&5
849 +  rm -rf conftest*
850 +  CPP=/lib/cpp
851 + fi
852 + rm -f conftest*
853 + fi
854 + rm -f conftest*
855 + fi
856 + rm -f conftest*
857 +  ac_cv_prog_CPP="$CPP"
858 + fi
859 +  CPP="$ac_cv_prog_CPP"
860 + else
861 +  ac_cv_prog_CPP="$CPP"
862 + fi
863 + echo "$ac_t""$CPP" 1>&6
864 +
865   for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
866   do
867   # Extract the first word of "$ac_prog", so it can be a program name with args.
868   set dummy $ac_prog; ac_word=$2
869   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
870 < echo "configure:782: checking for $ac_word" >&5
870 > echo "configure:871: checking for $ac_word" >&5
871   if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
872    echo $ac_n "(cached) $ac_c" 1>&6
873   else
# Line 810 | Line 899 | test -n "$CXX" || CXX="gcc"
899  
900  
901   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
902 < echo "configure:814: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
902 > echo "configure:903: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
903  
904   ac_ext=C
905   # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 821 | Line 910 | cross_compiling=$ac_cv_prog_cxx_cross
910  
911   cat > conftest.$ac_ext << EOF
912  
913 < #line 825 "configure"
913 > #line 914 "configure"
914   #include "confdefs.h"
915  
916   int main(){return(0);}
917   EOF
918 < if { (eval echo configure:830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
918 > if { (eval echo configure:919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
919    ac_cv_prog_cxx_works=yes
920    # If we can't run a trivial program, we are probably using a cross compiler.
921    if (./conftest; exit) 2>/dev/null; then
# Line 852 | Line 941 | if test $ac_cv_prog_cxx_works = no; then
941    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
942   fi
943   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
944 < echo "configure:856: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
944 > echo "configure:945: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
945   echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
946   cross_compiling=$ac_cv_prog_cxx_cross
947  
948   echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
949 < echo "configure:861: checking whether we are using GNU C++" >&5
949 > echo "configure:950: checking whether we are using GNU C++" >&5
950   if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
951    echo $ac_n "(cached) $ac_c" 1>&6
952   else
# Line 866 | Line 955 | else
955    yes;
956   #endif
957   EOF
958 < if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
958 > if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
959    ac_cv_prog_gxx=yes
960   else
961    ac_cv_prog_gxx=no
# Line 885 | Line 974 | ac_test_CXXFLAGS="${CXXFLAGS+set}"
974   ac_save_CXXFLAGS="$CXXFLAGS"
975   CXXFLAGS=
976   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
977 < echo "configure:889: checking whether ${CXX-g++} accepts -g" >&5
977 > echo "configure:978: checking whether ${CXX-g++} accepts -g" >&5
978   if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
979    echo $ac_n "(cached) $ac_c" 1>&6
980   else
# Line 916 | Line 1005 | else
1005    fi
1006   fi
1007  
919 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
920 echo "configure:921: checking how to run the C preprocessor" >&5
921 # On Suns, sometimes $CPP names a directory.
922 if test -n "$CPP" && test -d "$CPP"; then
923  CPP=
924 fi
925 if test -z "$CPP"; then
926 if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
927  echo $ac_n "(cached) $ac_c" 1>&6
928 else
929    # This must be in double quotes, not single quotes, because CPP may get
930  # substituted into the Makefile and "${CC-cc}" will confuse make.
931  CPP="${CC-cc} -E"
932  # On the NeXT, cc -E runs the code through the compiler's parser,
933  # not just through cpp.
934  cat > conftest.$ac_ext <<EOF
935 #line 936 "configure"
936 #include "confdefs.h"
937 #include <assert.h>
938 Syntax Error
939 EOF
940 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
941 { (eval echo configure:942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
942 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
943 if test -z "$ac_err"; then
944  :
945 else
946  echo "$ac_err" >&5
947  echo "configure: failed program was:" >&5
948  cat conftest.$ac_ext >&5
949  rm -rf conftest*
950  CPP="${CC-cc} -E -traditional-cpp"
951  cat > conftest.$ac_ext <<EOF
952 #line 953 "configure"
953 #include "confdefs.h"
954 #include <assert.h>
955 Syntax Error
956 EOF
957 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
958 { (eval echo configure:959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
959 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
960 if test -z "$ac_err"; then
961  :
962 else
963  echo "$ac_err" >&5
964  echo "configure: failed program was:" >&5
965  cat conftest.$ac_ext >&5
966  rm -rf conftest*
967  CPP="${CC-cc} -nologo -E"
968  cat > conftest.$ac_ext <<EOF
969 #line 970 "configure"
970 #include "confdefs.h"
971 #include <assert.h>
972 Syntax Error
973 EOF
974 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
975 { (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
976 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
977 if test -z "$ac_err"; then
978  :
979 else
980  echo "$ac_err" >&5
981  echo "configure: failed program was:" >&5
982  cat conftest.$ac_ext >&5
983  rm -rf conftest*
984  CPP=/lib/cpp
985 fi
986 rm -f conftest*
987 fi
988 rm -f conftest*
989 fi
990 rm -f conftest*
991  ac_cv_prog_CPP="$CPP"
992 fi
993  CPP="$ac_cv_prog_CPP"
994 else
995  ac_cv_prog_CPP="$CPP"
996 fi
997 echo "$ac_t""$CPP" 1>&6
998
1008   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
1009 < echo "configure:1001: checking whether ${MAKE-make} sets \${MAKE}" >&5
1009 > echo "configure:1010: checking whether ${MAKE-make} sets \${MAKE}" >&5
1010   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
1011   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
1012    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1054 | Line 1063 | ac_configure=$ac_aux_dir/configure # Thi
1063   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1064   # ./install, which can be erroneously created by make from ./install.sh.
1065   echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
1066 < echo "configure:1058: checking for a BSD compatible install" >&5
1066 > echo "configure:1067: checking for a BSD compatible install" >&5
1067   if test -z "$INSTALL"; then
1068   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
1069    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1112 | Line 1121 | test -z "$INSTALL_DATA" && INSTALL_DATA=
1121   # Uses ac_ vars as temps to allow command line to override cache and checks.
1122   # --without-x overrides everything else, but does not touch the cache.
1123   echo $ac_n "checking for X""... $ac_c" 1>&6
1124 < echo "configure:1116: checking for X" >&5
1124 > echo "configure:1125: checking for X" >&5
1125  
1126   # Check whether --with-x or --without-x was given.
1127   if test "${with_x+set}" = set; then
# Line 1174 | Line 1183 | if test "$ac_x_includes" = NO; then
1183  
1184    # First, try using that file with no special directory specified.
1185   cat > conftest.$ac_ext <<EOF
1186 < #line 1178 "configure"
1186 > #line 1187 "configure"
1187   #include "confdefs.h"
1188   #include <$x_direct_test_include>
1189   EOF
1190   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1191 < { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1191 > { (eval echo configure:1192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1192   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1193   if test -z "$ac_err"; then
1194    rm -rf conftest*
# Line 1248 | Line 1257 | if test "$ac_x_libraries" = NO; then
1257    ac_save_LIBS="$LIBS"
1258    LIBS="-l$x_direct_test_library $LIBS"
1259   cat > conftest.$ac_ext <<EOF
1260 < #line 1252 "configure"
1260 > #line 1261 "configure"
1261   #include "confdefs.h"
1262  
1263   int main() {
1264   ${x_direct_test_function}()
1265   ; return 0; }
1266   EOF
1267 < if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1267 > if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1268    rm -rf conftest*
1269    LIBS="$ac_save_LIBS"
1270   # We can link X programs with no special library path.
# Line 1361 | Line 1370 | else
1370      case "`(uname -sr) 2>/dev/null`" in
1371      "SunOS 5"*)
1372        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1373 < echo "configure:1365: checking whether -R must be followed by a space" >&5
1373 > echo "configure:1374: checking whether -R must be followed by a space" >&5
1374        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1375        cat > conftest.$ac_ext <<EOF
1376 < #line 1368 "configure"
1376 > #line 1377 "configure"
1377   #include "confdefs.h"
1378  
1379   int main() {
1380  
1381   ; return 0; }
1382   EOF
1383 < if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1383 > if { (eval echo configure:1384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1384    rm -rf conftest*
1385    ac_R_nospace=yes
1386   else
# Line 1387 | Line 1396 | rm -f conftest*
1396        else
1397          LIBS="$ac_xsave_LIBS -R $x_libraries"
1398          cat > conftest.$ac_ext <<EOF
1399 < #line 1391 "configure"
1399 > #line 1400 "configure"
1400   #include "confdefs.h"
1401  
1402   int main() {
1403  
1404   ; return 0; }
1405   EOF
1406 < if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1406 > if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1407    rm -rf conftest*
1408    ac_R_space=yes
1409   else
# Line 1426 | Line 1435 | rm -f conftest*
1435      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1436      # the Alpha needs dnet_stub (dnet does not exist).
1437      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1438 < echo "configure:1430: checking for dnet_ntoa in -ldnet" >&5
1438 > echo "configure:1439: checking for dnet_ntoa in -ldnet" >&5
1439   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1440   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1441    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1434 | Line 1443 | else
1443    ac_save_LIBS="$LIBS"
1444   LIBS="-ldnet  $LIBS"
1445   cat > conftest.$ac_ext <<EOF
1446 < #line 1438 "configure"
1446 > #line 1447 "configure"
1447   #include "confdefs.h"
1448   /* Override any gcc2 internal prototype to avoid an error.  */
1449   /* We use char because int might match the return type of a gcc2
# Line 1445 | Line 1454 | int main() {
1454   dnet_ntoa()
1455   ; return 0; }
1456   EOF
1457 < if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1457 > if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1458    rm -rf conftest*
1459    eval "ac_cv_lib_$ac_lib_var=yes"
1460   else
# Line 1467 | Line 1476 | fi
1476  
1477      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1478        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1479 < echo "configure:1471: checking for dnet_ntoa in -ldnet_stub" >&5
1479 > echo "configure:1480: checking for dnet_ntoa in -ldnet_stub" >&5
1480   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1481   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1482    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1475 | Line 1484 | else
1484    ac_save_LIBS="$LIBS"
1485   LIBS="-ldnet_stub  $LIBS"
1486   cat > conftest.$ac_ext <<EOF
1487 < #line 1479 "configure"
1487 > #line 1488 "configure"
1488   #include "confdefs.h"
1489   /* Override any gcc2 internal prototype to avoid an error.  */
1490   /* We use char because int might match the return type of a gcc2
# Line 1486 | Line 1495 | int main() {
1495   dnet_ntoa()
1496   ; return 0; }
1497   EOF
1498 < if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1498 > if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1499    rm -rf conftest*
1500    eval "ac_cv_lib_$ac_lib_var=yes"
1501   else
# Line 1515 | Line 1524 | fi
1524      # The nsl library prevents programs from opening the X display
1525      # on Irix 5.2, according to dickey@clark.net.
1526      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1527 < echo "configure:1519: checking for gethostbyname" >&5
1527 > echo "configure:1528: checking for gethostbyname" >&5
1528   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1529    echo $ac_n "(cached) $ac_c" 1>&6
1530   else
1531    cat > conftest.$ac_ext <<EOF
1532 < #line 1524 "configure"
1532 > #line 1533 "configure"
1533   #include "confdefs.h"
1534   /* System header to define __stub macros and hopefully few prototypes,
1535      which can conflict with char gethostbyname(); below.  */
# Line 1543 | Line 1552 | gethostbyname();
1552  
1553   ; return 0; }
1554   EOF
1555 < if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1555 > if { (eval echo configure:1556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1556    rm -rf conftest*
1557    eval "ac_cv_func_gethostbyname=yes"
1558   else
# Line 1564 | Line 1573 | fi
1573  
1574      if test $ac_cv_func_gethostbyname = no; then
1575        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1576 < echo "configure:1568: checking for gethostbyname in -lnsl" >&5
1576 > echo "configure:1577: checking for gethostbyname in -lnsl" >&5
1577   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1578   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1579    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1572 | Line 1581 | else
1581    ac_save_LIBS="$LIBS"
1582   LIBS="-lnsl  $LIBS"
1583   cat > conftest.$ac_ext <<EOF
1584 < #line 1576 "configure"
1584 > #line 1585 "configure"
1585   #include "confdefs.h"
1586   /* Override any gcc2 internal prototype to avoid an error.  */
1587   /* We use char because int might match the return type of a gcc2
# Line 1583 | Line 1592 | int main() {
1592   gethostbyname()
1593   ; return 0; }
1594   EOF
1595 < if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1595 > if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1596    rm -rf conftest*
1597    eval "ac_cv_lib_$ac_lib_var=yes"
1598   else
# Line 1613 | Line 1622 | fi
1622      # -lsocket must be given before -lnsl if both are needed.
1623      # We assume that if connect needs -lnsl, so does gethostbyname.
1624      echo $ac_n "checking for connect""... $ac_c" 1>&6
1625 < echo "configure:1617: checking for connect" >&5
1625 > echo "configure:1626: checking for connect" >&5
1626   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1627    echo $ac_n "(cached) $ac_c" 1>&6
1628   else
1629    cat > conftest.$ac_ext <<EOF
1630 < #line 1622 "configure"
1630 > #line 1631 "configure"
1631   #include "confdefs.h"
1632   /* System header to define __stub macros and hopefully few prototypes,
1633      which can conflict with char connect(); below.  */
# Line 1641 | Line 1650 | connect();
1650  
1651   ; return 0; }
1652   EOF
1653 < if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1653 > if { (eval echo configure:1654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1654    rm -rf conftest*
1655    eval "ac_cv_func_connect=yes"
1656   else
# Line 1662 | Line 1671 | fi
1671  
1672      if test $ac_cv_func_connect = no; then
1673        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1674 < echo "configure:1666: checking for connect in -lsocket" >&5
1674 > echo "configure:1675: checking for connect in -lsocket" >&5
1675   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1676   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1677    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1670 | Line 1679 | else
1679    ac_save_LIBS="$LIBS"
1680   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1681   cat > conftest.$ac_ext <<EOF
1682 < #line 1674 "configure"
1682 > #line 1683 "configure"
1683   #include "confdefs.h"
1684   /* Override any gcc2 internal prototype to avoid an error.  */
1685   /* We use char because int might match the return type of a gcc2
# Line 1681 | Line 1690 | int main() {
1690   connect()
1691   ; return 0; }
1692   EOF
1693 < if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1693 > if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1694    rm -rf conftest*
1695    eval "ac_cv_lib_$ac_lib_var=yes"
1696   else
# Line 1705 | Line 1714 | fi
1714  
1715      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1716      echo $ac_n "checking for remove""... $ac_c" 1>&6
1717 < echo "configure:1709: checking for remove" >&5
1717 > echo "configure:1718: checking for remove" >&5
1718   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1719    echo $ac_n "(cached) $ac_c" 1>&6
1720   else
1721    cat > conftest.$ac_ext <<EOF
1722 < #line 1714 "configure"
1722 > #line 1723 "configure"
1723   #include "confdefs.h"
1724   /* System header to define __stub macros and hopefully few prototypes,
1725      which can conflict with char remove(); below.  */
# Line 1733 | Line 1742 | remove();
1742  
1743   ; return 0; }
1744   EOF
1745 < if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1745 > if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1746    rm -rf conftest*
1747    eval "ac_cv_func_remove=yes"
1748   else
# Line 1754 | Line 1763 | fi
1763  
1764      if test $ac_cv_func_remove = no; then
1765        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1766 < echo "configure:1758: checking for remove in -lposix" >&5
1766 > echo "configure:1767: checking for remove in -lposix" >&5
1767   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1768   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1769    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1762 | Line 1771 | else
1771    ac_save_LIBS="$LIBS"
1772   LIBS="-lposix  $LIBS"
1773   cat > conftest.$ac_ext <<EOF
1774 < #line 1766 "configure"
1774 > #line 1775 "configure"
1775   #include "confdefs.h"
1776   /* Override any gcc2 internal prototype to avoid an error.  */
1777   /* We use char because int might match the return type of a gcc2
# Line 1773 | Line 1782 | int main() {
1782   remove()
1783   ; return 0; }
1784   EOF
1785 < if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1785 > if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1786    rm -rf conftest*
1787    eval "ac_cv_lib_$ac_lib_var=yes"
1788   else
# Line 1797 | Line 1806 | fi
1806  
1807      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1808      echo $ac_n "checking for shmat""... $ac_c" 1>&6
1809 < echo "configure:1801: checking for shmat" >&5
1809 > echo "configure:1810: checking for shmat" >&5
1810   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
1811    echo $ac_n "(cached) $ac_c" 1>&6
1812   else
1813    cat > conftest.$ac_ext <<EOF
1814 < #line 1806 "configure"
1814 > #line 1815 "configure"
1815   #include "confdefs.h"
1816   /* System header to define __stub macros and hopefully few prototypes,
1817      which can conflict with char shmat(); below.  */
# Line 1825 | Line 1834 | shmat();
1834  
1835   ; return 0; }
1836   EOF
1837 < if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1837 > if { (eval echo configure:1838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1838    rm -rf conftest*
1839    eval "ac_cv_func_shmat=yes"
1840   else
# Line 1846 | Line 1855 | fi
1855  
1856      if test $ac_cv_func_shmat = no; then
1857        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
1858 < echo "configure:1850: checking for shmat in -lipc" >&5
1858 > echo "configure:1859: checking for shmat in -lipc" >&5
1859   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
1860   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1861    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1854 | Line 1863 | else
1863    ac_save_LIBS="$LIBS"
1864   LIBS="-lipc  $LIBS"
1865   cat > conftest.$ac_ext <<EOF
1866 < #line 1858 "configure"
1866 > #line 1867 "configure"
1867   #include "confdefs.h"
1868   /* Override any gcc2 internal prototype to avoid an error.  */
1869   /* We use char because int might match the return type of a gcc2
# Line 1865 | Line 1874 | int main() {
1874   shmat()
1875   ; return 0; }
1876   EOF
1877 < if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1877 > if { (eval echo configure:1878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1878    rm -rf conftest*
1879    eval "ac_cv_lib_$ac_lib_var=yes"
1880   else
# Line 1898 | Line 1907 | fi
1907    # libraries we check for below, so use a different variable.
1908    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
1909    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
1910 < echo "configure:1902: checking for IceConnectionNumber in -lICE" >&5
1910 > echo "configure:1911: checking for IceConnectionNumber in -lICE" >&5
1911   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
1912   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1913    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1906 | Line 1915 | else
1915    ac_save_LIBS="$LIBS"
1916   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
1917   cat > conftest.$ac_ext <<EOF
1918 < #line 1910 "configure"
1918 > #line 1919 "configure"
1919   #include "confdefs.h"
1920   /* Override any gcc2 internal prototype to avoid an error.  */
1921   /* We use char because int might match the return type of a gcc2
# Line 1917 | Line 1926 | int main() {
1926   IceConnectionNumber()
1927   ; return 0; }
1928   EOF
1929 < if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1929 > if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1930    rm -rf conftest*
1931    eval "ac_cv_lib_$ac_lib_var=yes"
1932   else
# Line 1951 | Line 1960 | LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -l
1960   STATICLIBS=
1961  
1962   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
1963 < echo "configure:1955: checking for pthread_create in -lpthread" >&5
1963 > echo "configure:1964: checking for pthread_create in -lpthread" >&5
1964   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
1965   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1966    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1959 | Line 1968 | else
1968    ac_save_LIBS="$LIBS"
1969   LIBS="-lpthread  $LIBS"
1970   cat > conftest.$ac_ext <<EOF
1971 < #line 1963 "configure"
1971 > #line 1972 "configure"
1972   #include "confdefs.h"
1973   /* Override any gcc2 internal prototype to avoid an error.  */
1974   /* We use char because int might match the return type of a gcc2
# Line 1970 | Line 1979 | int main() {
1979   pthread_create()
1980   ; return 0; }
1981   EOF
1982 < if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1982 > if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1983    rm -rf conftest*
1984    eval "ac_cv_lib_$ac_lib_var=yes"
1985   else
# Line 1993 | Line 2002 | fi
2002  
2003   if [ "x$HAVE_PTHREADS" = "xno" ]; then
2004      echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2005 < echo "configure:1997: checking for pthread_create in -lc_r" >&5
2005 > echo "configure:2006: checking for pthread_create in -lc_r" >&5
2006   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2007   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2008    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2001 | Line 2010 | else
2010    ac_save_LIBS="$LIBS"
2011   LIBS="-lc_r  $LIBS"
2012   cat > conftest.$ac_ext <<EOF
2013 < #line 2005 "configure"
2013 > #line 2014 "configure"
2014   #include "confdefs.h"
2015   /* Override any gcc2 internal prototype to avoid an error.  */
2016   /* We use char because int might match the return type of a gcc2
# Line 2012 | Line 2021 | int main() {
2021   pthread_create()
2022   ; return 0; }
2023   EOF
2024 < if { (eval echo configure:2016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2024 > if { (eval echo configure:2025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2025    rm -rf conftest*
2026    eval "ac_cv_lib_$ac_lib_var=yes"
2027   else
# Line 2034 | Line 2043 | HAVE_PTHREADS=no
2043   fi
2044  
2045    if [ "x$HAVE_PTHREADS" = "xno" ]; then
2046 <     { echo "configure: error: You need libpthreads to run Basilisk II." 1>&2; exit 1; }
2046 >        echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2047 > echo "configure:2048: checking for pthread_create in -lPTL" >&5
2048 > ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2049 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2050 >  echo $ac_n "(cached) $ac_c" 1>&6
2051 > else
2052 >  ac_save_LIBS="$LIBS"
2053 > LIBS="-lPTL  $LIBS"
2054 > cat > conftest.$ac_ext <<EOF
2055 > #line 2056 "configure"
2056 > #include "confdefs.h"
2057 > /* Override any gcc2 internal prototype to avoid an error.  */
2058 > /* We use char because int might match the return type of a gcc2
2059 >    builtin and then its argument prototype would still apply.  */
2060 > char pthread_create();
2061 >
2062 > int main() {
2063 > pthread_create()
2064 > ; return 0; }
2065 > EOF
2066 > if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2067 >  rm -rf conftest*
2068 >  eval "ac_cv_lib_$ac_lib_var=yes"
2069 > else
2070 >  echo "configure: failed program was:" >&5
2071 >  cat conftest.$ac_ext >&5
2072 >  rm -rf conftest*
2073 >  eval "ac_cv_lib_$ac_lib_var=no"
2074 > fi
2075 > rm -f conftest*
2076 > LIBS="$ac_save_LIBS"
2077 >
2078 > fi
2079 > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2080 >  echo "$ac_t""yes" 1>&6
2081 >  HAVE_PTHREADS=yes
2082 > else
2083 >  echo "$ac_t""no" 1>&6
2084 > HAVE_PTHREADS=no
2085 > fi
2086 >
2087 >    if [ "x$HAVE_PTHREADS" = "xno" ]; then
2088 >      { echo "configure: error: You need pthreads to run Basilisk II." 1>&2; exit 1; }
2089 >    else
2090 >      LIBS="$LIBS -lPTL"
2091 >    fi
2092    else
2093       LIBS="$LIBS -lc_r"
2094    fi
# Line 2044 | Line 2098 | fi
2098   for ac_func in pthread_cancel
2099   do
2100   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2101 < echo "configure:2048: checking for $ac_func" >&5
2101 > echo "configure:2102: checking for $ac_func" >&5
2102   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2103    echo $ac_n "(cached) $ac_c" 1>&6
2104   else
2105    cat > conftest.$ac_ext <<EOF
2106 < #line 2053 "configure"
2106 > #line 2107 "configure"
2107   #include "confdefs.h"
2108   /* System header to define __stub macros and hopefully few prototypes,
2109      which can conflict with char $ac_func(); below.  */
# Line 2072 | Line 2126 | $ac_func();
2126  
2127   ; return 0; }
2128   EOF
2129 < if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2129 > if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2130    rm -rf conftest*
2131    eval "ac_cv_func_$ac_func=yes"
2132   else
# Line 2097 | Line 2151 | fi
2151   done
2152  
2153  
2154 < if [ "x$WANT_DGA" = "xyes" ]; then
2154 > if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2155    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2156 < echo "configure:2103: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2156 > echo "configure:2157: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2157   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2158   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2159    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2107 | Line 2161 | else
2161    ac_save_LIBS="$LIBS"
2162   LIBS="-lXxf86dga  $LIBS"
2163   cat > conftest.$ac_ext <<EOF
2164 < #line 2111 "configure"
2164 > #line 2165 "configure"
2165   #include "confdefs.h"
2166   /* Override any gcc2 internal prototype to avoid an error.  */
2167   /* We use char because int might match the return type of a gcc2
# Line 2118 | Line 2172 | int main() {
2172   XF86DGAQueryExtension()
2173   ; return 0; }
2174   EOF
2175 < if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2175 > if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2176    rm -rf conftest*
2177    eval "ac_cv_lib_$ac_lib_var=yes"
2178   else
# Line 2140 | Line 2194 | HAVE_DGA=no
2194   fi
2195  
2196    if [ "x$HAVE_DGA" = "xno" ]; then
2197 <    echo "configure: warning: Could not find DGA extension, ignoring --enable-dga." 1>&2
2197 >    echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2198 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2199    else
2200 <    DEFINES="$DEFINES -DENABLE_DGA=1"
2200 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
2201      LIBS="$LIBS -lXxf86dga"
2202 +    if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2203 +      echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2
2204 +      WANT_FBDEV_DGA=no
2205 +    fi
2206    fi
2207 + else
2208 +  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2209 + fi
2210 + if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2211 +  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
2212 + else
2213 +  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2214   fi
2215  
2216   if [ "x$WANT_UI" = "xyes" ]; then
# Line 2189 | Line 2255 | fi
2255    # Extract the first word of "gtk-config", so it can be a program name with args.
2256   set dummy gtk-config; ac_word=$2
2257   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2258 < echo "configure:2193: checking for $ac_word" >&5
2258 > echo "configure:2259: checking for $ac_word" >&5
2259   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2260    echo $ac_n "(cached) $ac_c" 1>&6
2261   else
# Line 2224 | Line 2290 | fi
2290  
2291    min_gtk_version=1.2.0
2292    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2293 < echo "configure:2228: checking for GTK - version >= $min_gtk_version" >&5
2293 > echo "configure:2294: checking for GTK - version >= $min_gtk_version" >&5
2294    no_gtk=""
2295    if test "$GTK_CONFIG" = "no" ; then
2296      no_gtk=yes
# Line 2247 | Line 2313 | echo "configure:2228: checking for GTK -
2313    echo $ac_n "cross compiling; assumed OK... $ac_c"
2314   else
2315    cat > conftest.$ac_ext <<EOF
2316 < #line 2251 "configure"
2316 > #line 2317 "configure"
2317   #include "confdefs.h"
2318  
2319   #include <gtk/gtk.h>
# Line 2310 | Line 2376 | main ()
2376   }
2377  
2378   EOF
2379 < if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2379 > if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2380   then
2381    :
2382   else
# Line 2344 | Line 2410 | fi
2410            CFLAGS="$CFLAGS $GTK_CFLAGS"
2411            LIBS="$LIBS $GTK_LIBS"
2412            cat > conftest.$ac_ext <<EOF
2413 < #line 2348 "configure"
2413 > #line 2414 "configure"
2414   #include "confdefs.h"
2415  
2416   #include <gtk/gtk.h>
# Line 2354 | Line 2420 | int main() {
2420   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2421   ; return 0; }
2422   EOF
2423 < if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2423 > if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2424    rm -rf conftest*
2425     echo "*** The test program compiled, but did not run. This usually means"
2426            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2409 | Line 2475 | SEMSRCS=
2475   for ac_func in sem_init
2476   do
2477   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2478 < echo "configure:2413: checking for $ac_func" >&5
2478 > echo "configure:2479: checking for $ac_func" >&5
2479   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2480    echo $ac_n "(cached) $ac_c" 1>&6
2481   else
2482    cat > conftest.$ac_ext <<EOF
2483 < #line 2418 "configure"
2483 > #line 2484 "configure"
2484   #include "confdefs.h"
2485   /* System header to define __stub macros and hopefully few prototypes,
2486      which can conflict with char $ac_func(); below.  */
# Line 2437 | Line 2503 | $ac_func();
2503  
2504   ; return 0; }
2505   EOF
2506 < if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2506 > if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2507    rm -rf conftest*
2508    eval "ac_cv_func_$ac_func=yes"
2509   else
# Line 2463 | Line 2529 | done
2529  
2530   if [ "x$ac_cv_func_sem_init" = "xno" ]; then
2531    echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
2532 < echo "configure:2467: checking for sem_init in -lposix4" >&5
2532 > echo "configure:2533: checking for sem_init in -lposix4" >&5
2533   ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
2534   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2535    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2471 | Line 2537 | else
2537    ac_save_LIBS="$LIBS"
2538   LIBS="-lposix4  $LIBS"
2539   cat > conftest.$ac_ext <<EOF
2540 < #line 2475 "configure"
2540 > #line 2541 "configure"
2541   #include "confdefs.h"
2542   /* Override any gcc2 internal prototype to avoid an error.  */
2543   /* We use char because int might match the return type of a gcc2
# Line 2482 | Line 2548 | int main() {
2548   sem_init()
2549   ; return 0; }
2550   EOF
2551 < if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2551 > if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2552    rm -rf conftest*
2553    eval "ac_cv_lib_$ac_lib_var=yes"
2554   else
# Line 2504 | Line 2570 | HAVE_LIBPOSIX4=no
2570   fi
2571  
2572    if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then
2573 <        for ac_func in semget
2508 < do
2509 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2510 < echo "configure:2511: checking for $ac_func" >&5
2511 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2512 <  echo $ac_n "(cached) $ac_c" 1>&6
2513 < else
2514 <  cat > conftest.$ac_ext <<EOF
2515 < #line 2516 "configure"
2516 < #include "confdefs.h"
2517 < /* System header to define __stub macros and hopefully few prototypes,
2518 <    which can conflict with char $ac_func(); below.  */
2519 < #include <assert.h>
2520 < /* Override any gcc2 internal prototype to avoid an error.  */
2521 < /* We use char because int might match the return type of a gcc2
2522 <    builtin and then its argument prototype would still apply.  */
2523 < char $ac_func();
2524 <
2525 < int main() {
2526 <
2527 < /* The GNU C library defines this for functions which it implements
2528 <    to always fail with ENOSYS.  Some functions are actually named
2529 <    something starting with __ and the normal name is an alias.  */
2530 < #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
2531 < choke me
2532 < #else
2533 < $ac_func();
2534 < #endif
2535 <
2536 < ; return 0; }
2537 < EOF
2538 < if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2539 <  rm -rf conftest*
2540 <  eval "ac_cv_func_$ac_func=yes"
2541 < else
2542 <  echo "configure: failed program was:" >&5
2543 <  cat conftest.$ac_ext >&5
2544 <  rm -rf conftest*
2545 <  eval "ac_cv_func_$ac_func=no"
2546 < fi
2547 < rm -f conftest*
2548 < fi
2549 <
2550 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2551 <  echo "$ac_t""yes" 1>&6
2552 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2553 <  cat >> confdefs.h <<EOF
2554 < #define $ac_tr_func 1
2555 < EOF
2556 <
2557 < else
2558 <  echo "$ac_t""no" 1>&6
2559 < fi
2560 < done
2561 <
2562 <    if [ "x$ac_cv_func_semget" = "xno" ]; then
2563 <      { echo "configure: error: You need POSIX.4 semaphores to run Basilisk II." 1>&2; exit 1; }
2564 <    else
2565 <      SEMSRCS="posix_sem.cpp"
2566 <    fi
2573 >        SEMSRCS="posix_sem.cpp"
2574    else
2575      LIBS="$LIBS -lposix4"
2576    fi
2577   fi
2578  
2579   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2580 < echo "configure:2574: checking for ANSI C header files" >&5
2580 > echo "configure:2581: checking for ANSI C header files" >&5
2581   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2582    echo $ac_n "(cached) $ac_c" 1>&6
2583   else
2584    cat > conftest.$ac_ext <<EOF
2585 < #line 2579 "configure"
2585 > #line 2586 "configure"
2586   #include "confdefs.h"
2587   #include <stdlib.h>
2588   #include <stdarg.h>
# Line 2583 | Line 2590 | else
2590   #include <float.h>
2591   EOF
2592   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2593 < { (eval echo configure:2587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2593 > { (eval echo configure:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2594   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2595   if test -z "$ac_err"; then
2596    rm -rf conftest*
# Line 2600 | Line 2607 | rm -f conftest*
2607   if test $ac_cv_header_stdc = yes; then
2608    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2609   cat > conftest.$ac_ext <<EOF
2610 < #line 2604 "configure"
2610 > #line 2611 "configure"
2611   #include "confdefs.h"
2612   #include <string.h>
2613   EOF
# Line 2618 | Line 2625 | fi
2625   if test $ac_cv_header_stdc = yes; then
2626    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2627   cat > conftest.$ac_ext <<EOF
2628 < #line 2622 "configure"
2628 > #line 2629 "configure"
2629   #include "confdefs.h"
2630   #include <stdlib.h>
2631   EOF
# Line 2639 | Line 2646 | if test "$cross_compiling" = yes; then
2646    :
2647   else
2648    cat > conftest.$ac_ext <<EOF
2649 < #line 2643 "configure"
2649 > #line 2650 "configure"
2650   #include "confdefs.h"
2651   #include <ctype.h>
2652   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2650 | Line 2657 | if (XOR (islower (i), ISLOWER (i)) || to
2657   exit (0); }
2658  
2659   EOF
2660 < if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2660 > if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2661   then
2662    :
2663   else
# Line 2677 | Line 2684 | for ac_hdr in unistd.h fcntl.h sys/time.
2684   do
2685   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2686   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2687 < echo "configure:2681: checking for $ac_hdr" >&5
2687 > echo "configure:2688: checking for $ac_hdr" >&5
2688   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2689    echo $ac_n "(cached) $ac_c" 1>&6
2690   else
2691    cat > conftest.$ac_ext <<EOF
2692 < #line 2686 "configure"
2692 > #line 2693 "configure"
2693   #include "confdefs.h"
2694   #include <$ac_hdr>
2695   EOF
2696   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2697 < { (eval echo configure:2691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2697 > { (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2698   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2699   if test -z "$ac_err"; then
2700    rm -rf conftest*
# Line 2715 | Line 2722 | done
2722  
2723  
2724   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
2725 < echo "configure:2719: checking whether byte ordering is bigendian" >&5
2725 > echo "configure:2726: checking whether byte ordering is bigendian" >&5
2726   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
2727    echo $ac_n "(cached) $ac_c" 1>&6
2728   else
2729    ac_cv_c_bigendian=unknown
2730   # See if sys/param.h defines the BYTE_ORDER macro.
2731   cat > conftest.$ac_ext <<EOF
2732 < #line 2726 "configure"
2732 > #line 2733 "configure"
2733   #include "confdefs.h"
2734   #include <sys/types.h>
2735   #include <sys/param.h>
# Line 2733 | Line 2740 | int main() {
2740   #endif
2741   ; return 0; }
2742   EOF
2743 < if { (eval echo configure:2737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2743 > if { (eval echo configure:2744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2744    rm -rf conftest*
2745    # It does; now see whether it defined to BIG_ENDIAN or not.
2746   cat > conftest.$ac_ext <<EOF
2747 < #line 2741 "configure"
2747 > #line 2748 "configure"
2748   #include "confdefs.h"
2749   #include <sys/types.h>
2750   #include <sys/param.h>
# Line 2748 | Line 2755 | int main() {
2755   #endif
2756   ; return 0; }
2757   EOF
2758 < if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2758 > if { (eval echo configure:2759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2759    rm -rf conftest*
2760    ac_cv_c_bigendian=yes
2761   else
# Line 2768 | Line 2775 | if test "$cross_compiling" = yes; then
2775      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
2776   else
2777    cat > conftest.$ac_ext <<EOF
2778 < #line 2772 "configure"
2778 > #line 2779 "configure"
2779   #include "confdefs.h"
2780   main () {
2781    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 2781 | Line 2788 | main () {
2788    exit (u.c[sizeof (long) - 1] == 1);
2789   }
2790   EOF
2791 < if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2791 > if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2792   then
2793    ac_cv_c_bigendian=no
2794   else
# Line 2805 | Line 2812 | EOF
2812   fi
2813  
2814   echo $ac_n "checking for working const""... $ac_c" 1>&6
2815 < echo "configure:2809: checking for working const" >&5
2815 > echo "configure:2816: checking for working const" >&5
2816   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
2817    echo $ac_n "(cached) $ac_c" 1>&6
2818   else
2819    cat > conftest.$ac_ext <<EOF
2820 < #line 2814 "configure"
2820 > #line 2821 "configure"
2821   #include "confdefs.h"
2822  
2823   int main() {
# Line 2859 | Line 2866 | ccp = (char const *const *) p;
2866  
2867   ; return 0; }
2868   EOF
2869 < if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2869 > if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2870    rm -rf conftest*
2871    ac_cv_c_const=yes
2872   else
# Line 2880 | Line 2887 | EOF
2887   fi
2888  
2889   echo $ac_n "checking for inline""... $ac_c" 1>&6
2890 < echo "configure:2884: checking for inline" >&5
2890 > echo "configure:2891: checking for inline" >&5
2891   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
2892    echo $ac_n "(cached) $ac_c" 1>&6
2893   else
2894    ac_cv_c_inline=no
2895   for ac_kw in inline __inline__ __inline; do
2896    cat > conftest.$ac_ext <<EOF
2897 < #line 2891 "configure"
2897 > #line 2898 "configure"
2898   #include "confdefs.h"
2899  
2900   int main() {
2901   } $ac_kw foo() {
2902   ; return 0; }
2903   EOF
2904 < if { (eval echo configure:2898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2904 > if { (eval echo configure:2905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2905    rm -rf conftest*
2906    ac_cv_c_inline=$ac_kw; break
2907   else
# Line 2920 | Line 2927 | EOF
2927   esac
2928  
2929   echo $ac_n "checking size of short""... $ac_c" 1>&6
2930 < echo "configure:2924: checking size of short" >&5
2930 > echo "configure:2931: checking size of short" >&5
2931   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
2932    echo $ac_n "(cached) $ac_c" 1>&6
2933   else
# Line 2928 | Line 2935 | else
2935    ac_cv_sizeof_short=2
2936   else
2937    cat > conftest.$ac_ext <<EOF
2938 < #line 2932 "configure"
2938 > #line 2939 "configure"
2939   #include "confdefs.h"
2940   #include <stdio.h>
2941   main()
# Line 2939 | Line 2946 | main()
2946    exit(0);
2947   }
2948   EOF
2949 < if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2949 > if { (eval echo configure:2950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2950   then
2951    ac_cv_sizeof_short=`cat conftestval`
2952   else
# Line 2959 | Line 2966 | EOF
2966  
2967  
2968   echo $ac_n "checking size of int""... $ac_c" 1>&6
2969 < echo "configure:2963: checking size of int" >&5
2969 > echo "configure:2970: checking size of int" >&5
2970   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
2971    echo $ac_n "(cached) $ac_c" 1>&6
2972   else
# Line 2967 | Line 2974 | else
2974    ac_cv_sizeof_int=4
2975   else
2976    cat > conftest.$ac_ext <<EOF
2977 < #line 2971 "configure"
2977 > #line 2978 "configure"
2978   #include "confdefs.h"
2979   #include <stdio.h>
2980   main()
# Line 2978 | Line 2985 | main()
2985    exit(0);
2986   }
2987   EOF
2988 < if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2988 > if { (eval echo configure:2989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2989   then
2990    ac_cv_sizeof_int=`cat conftestval`
2991   else
# Line 2998 | Line 3005 | EOF
3005  
3006  
3007   echo $ac_n "checking size of long""... $ac_c" 1>&6
3008 < echo "configure:3002: checking size of long" >&5
3008 > echo "configure:3009: checking size of long" >&5
3009   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3010    echo $ac_n "(cached) $ac_c" 1>&6
3011   else
# Line 3006 | Line 3013 | else
3013    ac_cv_sizeof_long=4
3014   else
3015    cat > conftest.$ac_ext <<EOF
3016 < #line 3010 "configure"
3016 > #line 3017 "configure"
3017   #include "confdefs.h"
3018   #include <stdio.h>
3019   main()
# Line 3017 | Line 3024 | main()
3024    exit(0);
3025   }
3026   EOF
3027 < if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3027 > if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3028   then
3029    ac_cv_sizeof_long=`cat conftestval`
3030   else
# Line 3037 | Line 3044 | EOF
3044  
3045  
3046   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3047 < echo "configure:3041: checking size of long long" >&5
3047 > echo "configure:3048: checking size of long long" >&5
3048   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3049    echo $ac_n "(cached) $ac_c" 1>&6
3050   else
# Line 3045 | Line 3052 | else
3052    ac_cv_sizeof_long_long=8
3053   else
3054    cat > conftest.$ac_ext <<EOF
3055 < #line 3049 "configure"
3055 > #line 3056 "configure"
3056   #include "confdefs.h"
3057   #include <stdio.h>
3058   main()
# Line 3056 | Line 3063 | main()
3063    exit(0);
3064   }
3065   EOF
3066 < if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3066 > if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3067   then
3068    ac_cv_sizeof_long_long=`cat conftestval`
3069   else
# Line 3076 | Line 3083 | EOF
3083  
3084  
3085   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3086 < echo "configure:3080: checking for off_t" >&5
3086 > echo "configure:3087: checking for off_t" >&5
3087   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3088    echo $ac_n "(cached) $ac_c" 1>&6
3089   else
3090    cat > conftest.$ac_ext <<EOF
3091 < #line 3085 "configure"
3091 > #line 3092 "configure"
3092   #include "confdefs.h"
3093   #include <sys/types.h>
3094   #if STDC_HEADERS
# Line 3109 | Line 3116 | EOF
3116   fi
3117  
3118   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3119 < echo "configure:3113: checking for loff_t" >&5
3119 > echo "configure:3120: checking for loff_t" >&5
3120   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3121    echo $ac_n "(cached) $ac_c" 1>&6
3122   else
3123    cat > conftest.$ac_ext <<EOF
3124 < #line 3118 "configure"
3124 > #line 3125 "configure"
3125   #include "confdefs.h"
3126   #include <sys/types.h>
3127   #if STDC_HEADERS
# Line 3142 | Line 3149 | EOF
3149   fi
3150  
3151   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3152 < echo "configure:3146: checking for size_t" >&5
3152 > echo "configure:3153: checking for size_t" >&5
3153   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3154    echo $ac_n "(cached) $ac_c" 1>&6
3155   else
3156    cat > conftest.$ac_ext <<EOF
3157 < #line 3151 "configure"
3157 > #line 3158 "configure"
3158   #include "confdefs.h"
3159   #include <sys/types.h>
3160   #if STDC_HEADERS
# Line 3175 | Line 3182 | EOF
3182   fi
3183  
3184   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3185 < echo "configure:3179: checking whether time.h and sys/time.h may both be included" >&5
3185 > echo "configure:3186: checking whether time.h and sys/time.h may both be included" >&5
3186   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3187    echo $ac_n "(cached) $ac_c" 1>&6
3188   else
3189    cat > conftest.$ac_ext <<EOF
3190 < #line 3184 "configure"
3190 > #line 3191 "configure"
3191   #include "confdefs.h"
3192   #include <sys/types.h>
3193   #include <sys/time.h>
# Line 3189 | Line 3196 | int main() {
3196   struct tm *tp;
3197   ; return 0; }
3198   EOF
3199 < if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3199 > if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3200    rm -rf conftest*
3201    ac_cv_header_time=yes
3202   else
# Line 3210 | Line 3217 | EOF
3217   fi
3218  
3219   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3220 < echo "configure:3214: checking whether struct tm is in sys/time.h or time.h" >&5
3220 > echo "configure:3221: checking whether struct tm is in sys/time.h or time.h" >&5
3221   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3222    echo $ac_n "(cached) $ac_c" 1>&6
3223   else
3224    cat > conftest.$ac_ext <<EOF
3225 < #line 3219 "configure"
3225 > #line 3226 "configure"
3226   #include "confdefs.h"
3227   #include <sys/types.h>
3228   #include <time.h>
# Line 3223 | Line 3230 | int main() {
3230   struct tm *tp; tp->tm_sec;
3231   ; return 0; }
3232   EOF
3233 < if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3233 > if { (eval echo configure:3234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3234    rm -rf conftest*
3235    ac_cv_struct_tm=time.h
3236   else
# Line 3247 | Line 3254 | fi
3254   for ac_func in strdup cfmakeraw
3255   do
3256   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3257 < echo "configure:3251: checking for $ac_func" >&5
3257 > echo "configure:3258: checking for $ac_func" >&5
3258   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3259    echo $ac_n "(cached) $ac_c" 1>&6
3260   else
3261    cat > conftest.$ac_ext <<EOF
3262 < #line 3256 "configure"
3262 > #line 3263 "configure"
3263   #include "confdefs.h"
3264   /* System header to define __stub macros and hopefully few prototypes,
3265      which can conflict with char $ac_func(); below.  */
# Line 3275 | Line 3282 | $ac_func();
3282  
3283   ; return 0; }
3284   EOF
3285 < if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3285 > if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3286    rm -rf conftest*
3287    eval "ac_cv_func_$ac_func=yes"
3288   else
# Line 3302 | Line 3309 | done
3309   for ac_func in nanosleep clock_gettime timer_create
3310   do
3311   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3312 < echo "configure:3306: checking for $ac_func" >&5
3312 > echo "configure:3313: checking for $ac_func" >&5
3313   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3314    echo $ac_n "(cached) $ac_c" 1>&6
3315   else
3316    cat > conftest.$ac_ext <<EOF
3317 < #line 3311 "configure"
3317 > #line 3318 "configure"
3318   #include "confdefs.h"
3319   /* System header to define __stub macros and hopefully few prototypes,
3320      which can conflict with char $ac_func(); below.  */
# Line 3330 | Line 3337 | $ac_func();
3337  
3338   ; return 0; }
3339   EOF
3340 < if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3340 > if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3341    rm -rf conftest*
3342    eval "ac_cv_func_$ac_func=yes"
3343   else
# Line 3363 | Line 3370 | if MACHINE=`uname -a 2>/dev/null`; then
3370      ;;
3371    FreeBSD*3.*)
3372          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3373 < echo "configure:3367: checking for cam_open_btl in -lcam" >&5
3373 > echo "configure:3374: checking for cam_open_btl in -lcam" >&5
3374   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3375   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3376    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3371 | Line 3378 | else
3378    ac_save_LIBS="$LIBS"
3379   LIBS="-lcam  $LIBS"
3380   cat > conftest.$ac_ext <<EOF
3381 < #line 3375 "configure"
3381 > #line 3382 "configure"
3382   #include "confdefs.h"
3383   /* Override any gcc2 internal prototype to avoid an error.  */
3384   /* We use char because int might match the return type of a gcc2
# Line 3382 | Line 3389 | int main() {
3389   cam_open_btl()
3390   ; return 0; }
3391   EOF
3392 < if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3392 > if { (eval echo configure:3393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3393    rm -rf conftest*
3394    eval "ac_cv_lib_$ac_lib_var=yes"
3395   else
# Line 3408 | Line 3415 | fi
3415      else
3416              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3417   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3418 < echo "configure:3412: checking for /sys/cam/cam.h" >&5
3418 > echo "configure:3419: checking for /sys/cam/cam.h" >&5
3419   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3420    echo $ac_n "(cached) $ac_c" 1>&6
3421   else
3422    cat > conftest.$ac_ext <<EOF
3423 < #line 3417 "configure"
3423 > #line 3424 "configure"
3424   #include "confdefs.h"
3425   #include </sys/cam/cam.h>
3426   EOF
3427   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3428 < { (eval echo configure:3422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3428 > { (eval echo configure:3429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3429   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3430   if test -z "$ac_err"; then
3431    rm -rf conftest*
# Line 3451 | Line 3458 | fi
3458      ;;
3459    FreeBSD*)
3460          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3461 < echo "configure:3455: checking for scsi_open in -lscsi" >&5
3461 > echo "configure:3462: checking for scsi_open in -lscsi" >&5
3462   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3463   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3464    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3459 | Line 3466 | else
3466    ac_save_LIBS="$LIBS"
3467   LIBS="-lscsi  $LIBS"
3468   cat > conftest.$ac_ext <<EOF
3469 < #line 3463 "configure"
3469 > #line 3470 "configure"
3470   #include "confdefs.h"
3471   /* Override any gcc2 internal prototype to avoid an error.  */
3472   /* We use char because int might match the return type of a gcc2
# Line 3470 | Line 3477 | int main() {
3477   scsi_open()
3478   ; return 0; }
3479   EOF
3480 < if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3480 > if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3481    rm -rf conftest*
3482    eval "ac_cv_lib_$ac_lib_var=yes"
3483   else
# Line 3496 | Line 3503 | fi
3503      else
3504              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3505   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3506 < echo "configure:3500: checking for scsi.h sys/scsiio.h" >&5
3506 > echo "configure:3507: checking for scsi.h sys/scsiio.h" >&5
3507   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3508    echo $ac_n "(cached) $ac_c" 1>&6
3509   else
3510    cat > conftest.$ac_ext <<EOF
3511 < #line 3505 "configure"
3511 > #line 3512 "configure"
3512   #include "confdefs.h"
3513   #include <scsi.h sys/scsiio.h>
3514   EOF
3515   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3516 < { (eval echo configure:3510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3516 > { (eval echo configure:3517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3517   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3518   if test -z "$ac_err"; then
3519    rm -rf conftest*
# Line 3545 | Line 3552 | fi
3552      LIBS="$LIBS -lm"
3553      ;;
3554    esac
3555 <  if [ "x$WANT_UI" = "xyes" ]; then
3556 <    SYSSRCS="$SYSSRCS prefs_editor_gtk.cpp"
3557 <  else
3558 <    SYSSRCS="$SYSSRCS ../dummy/prefs_editor_dummy.cpp"
3559 <  fi
3555 > fi
3556 > if [ "x$WANT_UI" = "xyes" ]; then
3557 >  SYSSRCS="$SYSSRCS prefs_editor_gtk.cpp"
3558 > else
3559 >  SYSSRCS="$SYSSRCS ../dummy/prefs_editor_dummy.cpp"
3560   fi
3561   if [ "x$SEMSRCS" != "x" ]; then
3562    SYSSRCS="$SYSSRCS $SEMSRCS"
# Line 3560 | Line 3567 | CPUSRCS="../uae_cpu/basilisk_glue.cpp ..
3567  
3568   HAVE_I386=no
3569   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
3570 < echo "configure:3564: checking for x86 target CPU" >&5
3570 > echo "configure:3571: checking for x86 target CPU" >&5
3571   cat > conftest.$ac_ext <<EOF
3572 < #line 3566 "configure"
3572 > #line 3573 "configure"
3573   #include "confdefs.h"
3574  
3575   #ifdef __i386__
# Line 3583 | Line 3590 | rm -f conftest*
3590  
3591   HAVE_GAS=no
3592   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
3593 < echo "configure:3587: checking for GAS .p2align feature" >&5
3593 > echo "configure:3594: checking for GAS .p2align feature" >&5
3594   cat >conftest.S << EOF
3595          .text
3596          .p2align 5
# Line 3593 | Line 3600 | echo "$ac_t""$HAVE_GAS" 1>&6
3600  
3601   HAVE_GCC27=no
3602   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
3603 < echo "configure:3597: checking for GCC 2.7 or higher" >&5
3603 > echo "configure:3604: checking for GCC 2.7 or higher" >&5
3604   cat > conftest.$ac_ext <<EOF
3605 < #line 3599 "configure"
3605 > #line 3606 "configure"
3606   #include "confdefs.h"
3607   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
3608    yes
# Line 3622 | Line 3629 | if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_
3629    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
3630    if [ "x$HAVE_GAS" = "xyes" ]; then
3631      DEFINES="$DEFINES -DX86_ASSEMBLY"
3632 <    CPUSRCS="$CPUSRCS cpufast.s"
3632 >    CPUSRCS="$CPUSRCS cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
3633    else
3634 <    CPUSRCS="$CPUSRCS cpuemu.cpp"
3634 >    CPUSRCS="$CPUSRCS cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
3635    fi
3636   else
3637 <  CPUSRCS="$CPUSRCS cpuemu.cpp"
3637 >  CPUSRCS="$CPUSRCS cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
3638   fi
3639  
3640  
# Line 3769 | Line 3776 | s%@oldincludedir@%$oldincludedir%g
3776   s%@infodir@%$infodir%g
3777   s%@mandir@%$mandir%g
3778   s%@CC@%$CC%g
3772 s%@CXX@%$CXX%g
3779   s%@CPP@%$CPP%g
3780 + s%@CXX@%$CXX%g
3781   s%@SET_MAKE@%$SET_MAKE%g
3782   s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
3783   s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines