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.12 by cebix, 1999-10-25T20:52:08Z

# 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=yes]"
16   ac_help="$ac_help
17 <  --enable-ui             use GTK user interface (default)"
17 >  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]"
18 > ac_help="$ac_help
19 >  --enable-esd            Enlightened Sound Daemon support [default=yes]"
20 > ac_help="$ac_help
21 >  --enable-ui             use GTK user interface [default=yes]"
22   ac_help="$ac_help
23    --with-x                use the X Window System"
24   ac_help="$ac_help
# Line 23 | Line 27 | ac_help="$ac_help
27    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
28   ac_help="$ac_help
29    --disable-gtktest       Do not try to compile and run a test GTK program"
30 + ac_help="$ac_help
31 +  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)"
32 + ac_help="$ac_help
33 +  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
34 + ac_help="$ac_help
35 +  --disable-esdtest       Do not try to compile and run a test ESD program"
36  
37   # Initialize some variables set by options.
38   # The variables have the same names as the options, with
# Line 536 | Line 546 | fi
546  
547  
548  
549 < WANT_DGA=yes
550 < WANT_UI=yes
551 < # Check whether --enable-dga or --disable-dga was given.
552 < if test "${enable_dga+set}" = set; then
553 <  enableval="$enable_dga"
554 <  WANT_DGA=$enableval
549 > # Check whether --enable-xf86-dga or --disable-xf86-dga was given.
550 > if test "${enable_xf86_dga+set}" = set; then
551 >  enableval="$enable_xf86_dga"
552 >  WANT_XF86_DGA=$enableval
553 > else
554 >  WANT_XF86_DGA=yes
555 > fi
556 >
557 > # Check whether --enable-fbdev-dga or --disable-fbdev-dga was given.
558 > if test "${enable_fbdev_dga+set}" = set; then
559 >  enableval="$enable_fbdev_dga"
560 >  WANT_FBDEV_DGA=$enableval
561 > else
562 >  WANT_FBDEV_DGA=yes
563 > fi
564 >
565 > # Check whether --enable-esd or --disable-esd was given.
566 > if test "${enable_esd+set}" = set; then
567 >  enableval="$enable_esd"
568 >  WANT_ESD=$enableval
569 > else
570 >  WANT_ESD=yes
571   fi
572  
573   # Check whether --enable-ui or --disable-ui was given.
574   if test "${enable_ui+set}" = set; then
575    enableval="$enable_ui"
576    WANT_UI=$enableval
577 + else
578 +  WANT_UI=yes
579   fi
580  
581  
582   # Extract the first word of "gcc", so it can be a program name with args.
583   set dummy gcc; ac_word=$2
584   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
585 < echo "configure:558: checking for $ac_word" >&5
585 > echo "configure:586: checking for $ac_word" >&5
586   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
587    echo $ac_n "(cached) $ac_c" 1>&6
588   else
# Line 584 | Line 612 | if test -z "$CC"; then
612    # Extract the first word of "cc", so it can be a program name with args.
613   set dummy cc; ac_word=$2
614   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
615 < echo "configure:588: checking for $ac_word" >&5
615 > echo "configure:616: checking for $ac_word" >&5
616   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
617    echo $ac_n "(cached) $ac_c" 1>&6
618   else
# Line 635 | Line 663 | fi
663        # Extract the first word of "cl", so it can be a program name with args.
664   set dummy cl; ac_word=$2
665   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
666 < echo "configure:639: checking for $ac_word" >&5
666 > echo "configure:667: checking for $ac_word" >&5
667   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
668    echo $ac_n "(cached) $ac_c" 1>&6
669   else
# Line 667 | Line 695 | fi
695   fi
696  
697   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
698 < echo "configure:671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
698 > echo "configure:699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
699  
700   ac_ext=c
701   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 678 | Line 706 | cross_compiling=$ac_cv_prog_cc_cross
706  
707   cat > conftest.$ac_ext << EOF
708  
709 < #line 682 "configure"
709 > #line 710 "configure"
710   #include "confdefs.h"
711  
712   main(){return(0);}
713   EOF
714 < if { (eval echo configure:687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
714 > if { (eval echo configure:715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
715    ac_cv_prog_cc_works=yes
716    # If we can't run a trivial program, we are probably using a cross compiler.
717    if (./conftest; exit) 2>/dev/null; then
# Line 709 | Line 737 | if test $ac_cv_prog_cc_works = no; then
737    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
738   fi
739   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
740 < echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
740 > echo "configure:741: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
741   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
742   cross_compiling=$ac_cv_prog_cc_cross
743  
744   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
745 < echo "configure:718: checking whether we are using GNU C" >&5
745 > echo "configure:746: checking whether we are using GNU C" >&5
746   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
747    echo $ac_n "(cached) $ac_c" 1>&6
748   else
# Line 723 | Line 751 | else
751    yes;
752   #endif
753   EOF
754 < 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
754 > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
755    ac_cv_prog_gcc=yes
756   else
757    ac_cv_prog_gcc=no
# Line 742 | Line 770 | ac_test_CFLAGS="${CFLAGS+set}"
770   ac_save_CFLAGS="$CFLAGS"
771   CFLAGS=
772   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
773 < echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
773 > echo "configure:774: checking whether ${CC-cc} accepts -g" >&5
774   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
775    echo $ac_n "(cached) $ac_c" 1>&6
776   else
# Line 773 | Line 801 | else
801    fi
802   fi
803  
804 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
805 + echo "configure:806: checking how to run the C preprocessor" >&5
806 + # On Suns, sometimes $CPP names a directory.
807 + if test -n "$CPP" && test -d "$CPP"; then
808 +  CPP=
809 + fi
810 + if test -z "$CPP"; then
811 + if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
812 +  echo $ac_n "(cached) $ac_c" 1>&6
813 + else
814 +    # This must be in double quotes, not single quotes, because CPP may get
815 +  # substituted into the Makefile and "${CC-cc}" will confuse make.
816 +  CPP="${CC-cc} -E"
817 +  # On the NeXT, cc -E runs the code through the compiler's parser,
818 +  # not just through cpp.
819 +  cat > conftest.$ac_ext <<EOF
820 + #line 821 "configure"
821 + #include "confdefs.h"
822 + #include <assert.h>
823 + Syntax Error
824 + EOF
825 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
826 + { (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
827 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
828 + if test -z "$ac_err"; then
829 +  :
830 + else
831 +  echo "$ac_err" >&5
832 +  echo "configure: failed program was:" >&5
833 +  cat conftest.$ac_ext >&5
834 +  rm -rf conftest*
835 +  CPP="${CC-cc} -E -traditional-cpp"
836 +  cat > conftest.$ac_ext <<EOF
837 + #line 838 "configure"
838 + #include "confdefs.h"
839 + #include <assert.h>
840 + Syntax Error
841 + EOF
842 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
843 + { (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
844 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
845 + if test -z "$ac_err"; then
846 +  :
847 + else
848 +  echo "$ac_err" >&5
849 +  echo "configure: failed program was:" >&5
850 +  cat conftest.$ac_ext >&5
851 +  rm -rf conftest*
852 +  CPP="${CC-cc} -nologo -E"
853 +  cat > conftest.$ac_ext <<EOF
854 + #line 855 "configure"
855 + #include "confdefs.h"
856 + #include <assert.h>
857 + Syntax Error
858 + EOF
859 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
860 + { (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
861 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
862 + if test -z "$ac_err"; then
863 +  :
864 + else
865 +  echo "$ac_err" >&5
866 +  echo "configure: failed program was:" >&5
867 +  cat conftest.$ac_ext >&5
868 +  rm -rf conftest*
869 +  CPP=/lib/cpp
870 + fi
871 + rm -f conftest*
872 + fi
873 + rm -f conftest*
874 + fi
875 + rm -f conftest*
876 +  ac_cv_prog_CPP="$CPP"
877 + fi
878 +  CPP="$ac_cv_prog_CPP"
879 + else
880 +  ac_cv_prog_CPP="$CPP"
881 + fi
882 + echo "$ac_t""$CPP" 1>&6
883 +
884   for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
885   do
886   # Extract the first word of "$ac_prog", so it can be a program name with args.
887   set dummy $ac_prog; ac_word=$2
888   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
889 < echo "configure:782: checking for $ac_word" >&5
889 > echo "configure:890: checking for $ac_word" >&5
890   if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
891    echo $ac_n "(cached) $ac_c" 1>&6
892   else
# Line 810 | Line 918 | test -n "$CXX" || CXX="gcc"
918  
919  
920   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
921 < echo "configure:814: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
921 > echo "configure:922: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
922  
923   ac_ext=C
924   # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 821 | Line 929 | cross_compiling=$ac_cv_prog_cxx_cross
929  
930   cat > conftest.$ac_ext << EOF
931  
932 < #line 825 "configure"
932 > #line 933 "configure"
933   #include "confdefs.h"
934  
935   int main(){return(0);}
936   EOF
937 < if { (eval echo configure:830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
937 > if { (eval echo configure:938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
938    ac_cv_prog_cxx_works=yes
939    # If we can't run a trivial program, we are probably using a cross compiler.
940    if (./conftest; exit) 2>/dev/null; then
# Line 852 | Line 960 | if test $ac_cv_prog_cxx_works = no; then
960    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
961   fi
962   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
963 < echo "configure:856: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
963 > echo "configure:964: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
964   echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
965   cross_compiling=$ac_cv_prog_cxx_cross
966  
967   echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
968 < echo "configure:861: checking whether we are using GNU C++" >&5
968 > echo "configure:969: checking whether we are using GNU C++" >&5
969   if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
970    echo $ac_n "(cached) $ac_c" 1>&6
971   else
# Line 866 | Line 974 | else
974    yes;
975   #endif
976   EOF
977 < 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
977 > if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
978    ac_cv_prog_gxx=yes
979   else
980    ac_cv_prog_gxx=no
# Line 885 | Line 993 | ac_test_CXXFLAGS="${CXXFLAGS+set}"
993   ac_save_CXXFLAGS="$CXXFLAGS"
994   CXXFLAGS=
995   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
996 < echo "configure:889: checking whether ${CXX-g++} accepts -g" >&5
996 > echo "configure:997: checking whether ${CXX-g++} accepts -g" >&5
997   if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
998    echo $ac_n "(cached) $ac_c" 1>&6
999   else
# Line 916 | Line 1024 | else
1024    fi
1025   fi
1026  
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
1027   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
1028 < echo "configure:1001: checking whether ${MAKE-make} sets \${MAKE}" >&5
1028 > echo "configure:1029: checking whether ${MAKE-make} sets \${MAKE}" >&5
1029   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
1030   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
1031    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1054 | Line 1082 | ac_configure=$ac_aux_dir/configure # Thi
1082   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1083   # ./install, which can be erroneously created by make from ./install.sh.
1084   echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
1085 < echo "configure:1058: checking for a BSD compatible install" >&5
1085 > echo "configure:1086: checking for a BSD compatible install" >&5
1086   if test -z "$INSTALL"; then
1087   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
1088    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1107 | Line 1135 | test -z "$INSTALL_SCRIPT" && INSTALL_SCR
1135   test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1136  
1137  
1138 + MONSRCS=
1139 + echo $ac_n "checking for mon""... $ac_c" 1>&6
1140 + echo "configure:1141: checking for mon" >&5
1141 + if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1142 +  echo "$ac_t""yes" 1>&6
1143 +  WANT_MON=yes
1144 +  DEFINES="$DEFINES -DENABLE_MON=1"
1145 +  MONSRCS="../../../mon/src/mon.cpp ../../../mon/src/mon_6502.cpp ../../../mon/src/mon_68k.cpp ../../../mon/src/mon_8080.cpp ../../../mon/src/mon_cmd.cpp ../../../mon/src/mon_ppc.cpp ../../../mon/src/mon_x86.cpp"
1146 +  CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1147 + else
1148 +  echo "$ac_t""no" 1>&6
1149 +  WANT_MON=no
1150 +  DEFINES="$DEFINES -DENABLE_MON=0"
1151 + fi
1152 +
1153 + echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1154 + echo "configure:1155: checking for sem_init in -lposix4" >&5
1155 + ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1156 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1157 +  echo $ac_n "(cached) $ac_c" 1>&6
1158 + else
1159 +  ac_save_LIBS="$LIBS"
1160 + LIBS="-lposix4  $LIBS"
1161 + cat > conftest.$ac_ext <<EOF
1162 + #line 1163 "configure"
1163 + #include "confdefs.h"
1164 + /* Override any gcc2 internal prototype to avoid an error.  */
1165 + /* We use char because int might match the return type of a gcc2
1166 +    builtin and then its argument prototype would still apply.  */
1167 + char sem_init();
1168 +
1169 + int main() {
1170 + sem_init()
1171 + ; return 0; }
1172 + EOF
1173 + if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1174 +  rm -rf conftest*
1175 +  eval "ac_cv_lib_$ac_lib_var=yes"
1176 + else
1177 +  echo "configure: failed program was:" >&5
1178 +  cat conftest.$ac_ext >&5
1179 +  rm -rf conftest*
1180 +  eval "ac_cv_lib_$ac_lib_var=no"
1181 + fi
1182 + rm -f conftest*
1183 + LIBS="$ac_save_LIBS"
1184 +
1185 + fi
1186 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1187 +  echo "$ac_t""yes" 1>&6
1188 +    ac_tr_lib=HAVE_LIB`echo posix4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1189 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1190 +  cat >> confdefs.h <<EOF
1191 + #define $ac_tr_lib 1
1192 + EOF
1193 +
1194 +  LIBS="-lposix4 $LIBS"
1195 +
1196 + else
1197 +  echo "$ac_t""no" 1>&6
1198 + fi
1199 +
1200 +
1201   # If we find X, set shell vars x_includes and x_libraries to the
1202   # paths, otherwise set no_x=yes.
1203   # Uses ac_ vars as temps to allow command line to override cache and checks.
1204   # --without-x overrides everything else, but does not touch the cache.
1205   echo $ac_n "checking for X""... $ac_c" 1>&6
1206 < echo "configure:1116: checking for X" >&5
1206 > echo "configure:1207: checking for X" >&5
1207  
1208   # Check whether --with-x or --without-x was given.
1209   if test "${with_x+set}" = set; then
# Line 1174 | Line 1265 | if test "$ac_x_includes" = NO; then
1265  
1266    # First, try using that file with no special directory specified.
1267   cat > conftest.$ac_ext <<EOF
1268 < #line 1178 "configure"
1268 > #line 1269 "configure"
1269   #include "confdefs.h"
1270   #include <$x_direct_test_include>
1271   EOF
1272   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1273 < { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1273 > { (eval echo configure:1274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1274   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1275   if test -z "$ac_err"; then
1276    rm -rf conftest*
# Line 1248 | Line 1339 | if test "$ac_x_libraries" = NO; then
1339    ac_save_LIBS="$LIBS"
1340    LIBS="-l$x_direct_test_library $LIBS"
1341   cat > conftest.$ac_ext <<EOF
1342 < #line 1252 "configure"
1342 > #line 1343 "configure"
1343   #include "confdefs.h"
1344  
1345   int main() {
1346   ${x_direct_test_function}()
1347   ; return 0; }
1348   EOF
1349 < if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1349 > if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1350    rm -rf conftest*
1351    LIBS="$ac_save_LIBS"
1352   # We can link X programs with no special library path.
# Line 1361 | Line 1452 | else
1452      case "`(uname -sr) 2>/dev/null`" in
1453      "SunOS 5"*)
1454        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1455 < echo "configure:1365: checking whether -R must be followed by a space" >&5
1455 > echo "configure:1456: checking whether -R must be followed by a space" >&5
1456        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1457        cat > conftest.$ac_ext <<EOF
1458 < #line 1368 "configure"
1458 > #line 1459 "configure"
1459   #include "confdefs.h"
1460  
1461   int main() {
1462  
1463   ; return 0; }
1464   EOF
1465 < if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1465 > if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1466    rm -rf conftest*
1467    ac_R_nospace=yes
1468   else
# Line 1387 | Line 1478 | rm -f conftest*
1478        else
1479          LIBS="$ac_xsave_LIBS -R $x_libraries"
1480          cat > conftest.$ac_ext <<EOF
1481 < #line 1391 "configure"
1481 > #line 1482 "configure"
1482   #include "confdefs.h"
1483  
1484   int main() {
1485  
1486   ; return 0; }
1487   EOF
1488 < if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1488 > if { (eval echo configure:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1489    rm -rf conftest*
1490    ac_R_space=yes
1491   else
# Line 1426 | Line 1517 | rm -f conftest*
1517      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1518      # the Alpha needs dnet_stub (dnet does not exist).
1519      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1520 < echo "configure:1430: checking for dnet_ntoa in -ldnet" >&5
1520 > echo "configure:1521: checking for dnet_ntoa in -ldnet" >&5
1521   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1522   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1523    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1434 | Line 1525 | else
1525    ac_save_LIBS="$LIBS"
1526   LIBS="-ldnet  $LIBS"
1527   cat > conftest.$ac_ext <<EOF
1528 < #line 1438 "configure"
1528 > #line 1529 "configure"
1529   #include "confdefs.h"
1530   /* Override any gcc2 internal prototype to avoid an error.  */
1531   /* We use char because int might match the return type of a gcc2
# Line 1445 | Line 1536 | int main() {
1536   dnet_ntoa()
1537   ; return 0; }
1538   EOF
1539 < if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1539 > if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1540    rm -rf conftest*
1541    eval "ac_cv_lib_$ac_lib_var=yes"
1542   else
# Line 1467 | Line 1558 | fi
1558  
1559      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1560        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1561 < echo "configure:1471: checking for dnet_ntoa in -ldnet_stub" >&5
1561 > echo "configure:1562: checking for dnet_ntoa in -ldnet_stub" >&5
1562   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1563   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1564    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1475 | Line 1566 | else
1566    ac_save_LIBS="$LIBS"
1567   LIBS="-ldnet_stub  $LIBS"
1568   cat > conftest.$ac_ext <<EOF
1569 < #line 1479 "configure"
1569 > #line 1570 "configure"
1570   #include "confdefs.h"
1571   /* Override any gcc2 internal prototype to avoid an error.  */
1572   /* We use char because int might match the return type of a gcc2
# Line 1486 | Line 1577 | int main() {
1577   dnet_ntoa()
1578   ; return 0; }
1579   EOF
1580 < if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1580 > if { (eval echo configure:1581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1581    rm -rf conftest*
1582    eval "ac_cv_lib_$ac_lib_var=yes"
1583   else
# Line 1515 | Line 1606 | fi
1606      # The nsl library prevents programs from opening the X display
1607      # on Irix 5.2, according to dickey@clark.net.
1608      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1609 < echo "configure:1519: checking for gethostbyname" >&5
1609 > echo "configure:1610: checking for gethostbyname" >&5
1610   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1611    echo $ac_n "(cached) $ac_c" 1>&6
1612   else
1613    cat > conftest.$ac_ext <<EOF
1614 < #line 1524 "configure"
1614 > #line 1615 "configure"
1615   #include "confdefs.h"
1616   /* System header to define __stub macros and hopefully few prototypes,
1617      which can conflict with char gethostbyname(); below.  */
# Line 1543 | Line 1634 | gethostbyname();
1634  
1635   ; return 0; }
1636   EOF
1637 < if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1637 > if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1638    rm -rf conftest*
1639    eval "ac_cv_func_gethostbyname=yes"
1640   else
# Line 1564 | Line 1655 | fi
1655  
1656      if test $ac_cv_func_gethostbyname = no; then
1657        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1658 < echo "configure:1568: checking for gethostbyname in -lnsl" >&5
1658 > echo "configure:1659: checking for gethostbyname in -lnsl" >&5
1659   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1660   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1661    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1572 | Line 1663 | else
1663    ac_save_LIBS="$LIBS"
1664   LIBS="-lnsl  $LIBS"
1665   cat > conftest.$ac_ext <<EOF
1666 < #line 1576 "configure"
1666 > #line 1667 "configure"
1667   #include "confdefs.h"
1668   /* Override any gcc2 internal prototype to avoid an error.  */
1669   /* We use char because int might match the return type of a gcc2
# Line 1583 | Line 1674 | int main() {
1674   gethostbyname()
1675   ; return 0; }
1676   EOF
1677 < if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1677 > if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1678    rm -rf conftest*
1679    eval "ac_cv_lib_$ac_lib_var=yes"
1680   else
# Line 1613 | Line 1704 | fi
1704      # -lsocket must be given before -lnsl if both are needed.
1705      # We assume that if connect needs -lnsl, so does gethostbyname.
1706      echo $ac_n "checking for connect""... $ac_c" 1>&6
1707 < echo "configure:1617: checking for connect" >&5
1707 > echo "configure:1708: checking for connect" >&5
1708   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1709    echo $ac_n "(cached) $ac_c" 1>&6
1710   else
1711    cat > conftest.$ac_ext <<EOF
1712 < #line 1622 "configure"
1712 > #line 1713 "configure"
1713   #include "confdefs.h"
1714   /* System header to define __stub macros and hopefully few prototypes,
1715      which can conflict with char connect(); below.  */
# Line 1641 | Line 1732 | connect();
1732  
1733   ; return 0; }
1734   EOF
1735 < if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1735 > if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1736    rm -rf conftest*
1737    eval "ac_cv_func_connect=yes"
1738   else
# Line 1662 | Line 1753 | fi
1753  
1754      if test $ac_cv_func_connect = no; then
1755        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1756 < echo "configure:1666: checking for connect in -lsocket" >&5
1756 > echo "configure:1757: checking for connect in -lsocket" >&5
1757   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1758   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1759    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1670 | Line 1761 | else
1761    ac_save_LIBS="$LIBS"
1762   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1763   cat > conftest.$ac_ext <<EOF
1764 < #line 1674 "configure"
1764 > #line 1765 "configure"
1765   #include "confdefs.h"
1766   /* Override any gcc2 internal prototype to avoid an error.  */
1767   /* We use char because int might match the return type of a gcc2
# Line 1681 | Line 1772 | int main() {
1772   connect()
1773   ; return 0; }
1774   EOF
1775 < if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1775 > if { (eval echo configure:1776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1776    rm -rf conftest*
1777    eval "ac_cv_lib_$ac_lib_var=yes"
1778   else
# Line 1705 | Line 1796 | fi
1796  
1797      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1798      echo $ac_n "checking for remove""... $ac_c" 1>&6
1799 < echo "configure:1709: checking for remove" >&5
1799 > echo "configure:1800: checking for remove" >&5
1800   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1801    echo $ac_n "(cached) $ac_c" 1>&6
1802   else
1803    cat > conftest.$ac_ext <<EOF
1804 < #line 1714 "configure"
1804 > #line 1805 "configure"
1805   #include "confdefs.h"
1806   /* System header to define __stub macros and hopefully few prototypes,
1807      which can conflict with char remove(); below.  */
# Line 1733 | Line 1824 | remove();
1824  
1825   ; return 0; }
1826   EOF
1827 < if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1827 > if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1828    rm -rf conftest*
1829    eval "ac_cv_func_remove=yes"
1830   else
# Line 1754 | Line 1845 | fi
1845  
1846      if test $ac_cv_func_remove = no; then
1847        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1848 < echo "configure:1758: checking for remove in -lposix" >&5
1848 > echo "configure:1849: checking for remove in -lposix" >&5
1849   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1850   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1851    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1762 | Line 1853 | else
1853    ac_save_LIBS="$LIBS"
1854   LIBS="-lposix  $LIBS"
1855   cat > conftest.$ac_ext <<EOF
1856 < #line 1766 "configure"
1856 > #line 1857 "configure"
1857   #include "confdefs.h"
1858   /* Override any gcc2 internal prototype to avoid an error.  */
1859   /* We use char because int might match the return type of a gcc2
# Line 1773 | Line 1864 | int main() {
1864   remove()
1865   ; return 0; }
1866   EOF
1867 < if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1867 > if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1868    rm -rf conftest*
1869    eval "ac_cv_lib_$ac_lib_var=yes"
1870   else
# Line 1797 | Line 1888 | fi
1888  
1889      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1890      echo $ac_n "checking for shmat""... $ac_c" 1>&6
1891 < echo "configure:1801: checking for shmat" >&5
1891 > echo "configure:1892: checking for shmat" >&5
1892   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
1893    echo $ac_n "(cached) $ac_c" 1>&6
1894   else
1895    cat > conftest.$ac_ext <<EOF
1896 < #line 1806 "configure"
1896 > #line 1897 "configure"
1897   #include "confdefs.h"
1898   /* System header to define __stub macros and hopefully few prototypes,
1899      which can conflict with char shmat(); below.  */
# Line 1825 | Line 1916 | shmat();
1916  
1917   ; return 0; }
1918   EOF
1919 < if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1919 > if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1920    rm -rf conftest*
1921    eval "ac_cv_func_shmat=yes"
1922   else
# Line 1846 | Line 1937 | fi
1937  
1938      if test $ac_cv_func_shmat = no; then
1939        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
1940 < echo "configure:1850: checking for shmat in -lipc" >&5
1940 > echo "configure:1941: checking for shmat in -lipc" >&5
1941   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
1942   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1943    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1854 | Line 1945 | else
1945    ac_save_LIBS="$LIBS"
1946   LIBS="-lipc  $LIBS"
1947   cat > conftest.$ac_ext <<EOF
1948 < #line 1858 "configure"
1948 > #line 1949 "configure"
1949   #include "confdefs.h"
1950   /* Override any gcc2 internal prototype to avoid an error.  */
1951   /* We use char because int might match the return type of a gcc2
# Line 1865 | Line 1956 | int main() {
1956   shmat()
1957   ; return 0; }
1958   EOF
1959 < if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1959 > if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1960    rm -rf conftest*
1961    eval "ac_cv_lib_$ac_lib_var=yes"
1962   else
# Line 1898 | Line 1989 | fi
1989    # libraries we check for below, so use a different variable.
1990    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
1991    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
1992 < echo "configure:1902: checking for IceConnectionNumber in -lICE" >&5
1992 > echo "configure:1993: checking for IceConnectionNumber in -lICE" >&5
1993   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
1994   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1995    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1906 | Line 1997 | else
1997    ac_save_LIBS="$LIBS"
1998   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
1999   cat > conftest.$ac_ext <<EOF
2000 < #line 1910 "configure"
2000 > #line 2001 "configure"
2001   #include "confdefs.h"
2002   /* Override any gcc2 internal prototype to avoid an error.  */
2003   /* We use char because int might match the return type of a gcc2
# Line 1917 | Line 2008 | int main() {
2008   IceConnectionNumber()
2009   ; return 0; }
2010   EOF
2011 < if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2011 > if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2012    rm -rf conftest*
2013    eval "ac_cv_lib_$ac_lib_var=yes"
2014   else
# Line 1944 | Line 2035 | fi
2035   if [ "x$no_x" = "xyes" ]; then
2036    { echo "configure: error: You need X11 to run Basilisk II." 1>&2; exit 1; }
2037   fi
1947
2038   CFLAGS="$CFLAGS $X_CFLAGS"
2039   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2040   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
1951 STATICLIBS=
2041  
2042   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2043 < echo "configure:1955: checking for pthread_create in -lpthread" >&5
2043 > echo "configure:2044: checking for pthread_create in -lpthread" >&5
2044   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2045   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2046    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1959 | Line 2048 | else
2048    ac_save_LIBS="$LIBS"
2049   LIBS="-lpthread  $LIBS"
2050   cat > conftest.$ac_ext <<EOF
2051 < #line 1963 "configure"
2051 > #line 2052 "configure"
2052   #include "confdefs.h"
2053   /* Override any gcc2 internal prototype to avoid an error.  */
2054   /* We use char because int might match the return type of a gcc2
# Line 1970 | Line 2059 | int main() {
2059   pthread_create()
2060   ; return 0; }
2061   EOF
2062 < if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2062 > if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2063    rm -rf conftest*
2064    eval "ac_cv_lib_$ac_lib_var=yes"
2065   else
# Line 1985 | Line 2074 | LIBS="$ac_save_LIBS"
2074   fi
2075   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2076    echo "$ac_t""yes" 1>&6
2077 <  HAVE_PTHREADS=yes
2077 >    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2078 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2079 >  cat >> confdefs.h <<EOF
2080 > #define $ac_tr_lib 1
2081 > EOF
2082 >
2083 >  LIBS="-lpthread $LIBS"
2084 >
2085   else
2086    echo "$ac_t""no" 1>&6
1991 HAVE_PTHREADS=no
1992 fi
2087  
2088 < if [ "x$HAVE_PTHREADS" = "xno" ]; then
2089 <    echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
1996 < echo "configure:1997: checking for pthread_create in -lc_r" >&5
2088 >  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2089 > echo "configure:2090: checking for pthread_create in -lc_r" >&5
2090   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2091   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2092    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2001 | Line 2094 | else
2094    ac_save_LIBS="$LIBS"
2095   LIBS="-lc_r  $LIBS"
2096   cat > conftest.$ac_ext <<EOF
2097 < #line 2005 "configure"
2097 > #line 2098 "configure"
2098   #include "confdefs.h"
2099   /* Override any gcc2 internal prototype to avoid an error.  */
2100   /* We use char because int might match the return type of a gcc2
# Line 2012 | Line 2105 | int main() {
2105   pthread_create()
2106   ; return 0; }
2107   EOF
2108 < if { (eval echo configure:2016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2108 > if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2109    rm -rf conftest*
2110    eval "ac_cv_lib_$ac_lib_var=yes"
2111   else
# Line 2027 | Line 2120 | LIBS="$ac_save_LIBS"
2120   fi
2121   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2122    echo "$ac_t""yes" 1>&6
2123 <  HAVE_PTHREADS=yes
2123 >    ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2124 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2125 >  cat >> confdefs.h <<EOF
2126 > #define $ac_tr_lib 1
2127 > EOF
2128 >
2129 >  LIBS="-lc_r $LIBS"
2130 >
2131   else
2132    echo "$ac_t""no" 1>&6
2133 < HAVE_PTHREADS=no
2133 >
2134 >    echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2135 > echo "configure:2136: checking for pthread_create in -lPTL" >&5
2136 > ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2137 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2138 >  echo $ac_n "(cached) $ac_c" 1>&6
2139 > else
2140 >  ac_save_LIBS="$LIBS"
2141 > LIBS="-lPTL  $LIBS"
2142 > cat > conftest.$ac_ext <<EOF
2143 > #line 2144 "configure"
2144 > #include "confdefs.h"
2145 > /* Override any gcc2 internal prototype to avoid an error.  */
2146 > /* We use char because int might match the return type of a gcc2
2147 >    builtin and then its argument prototype would still apply.  */
2148 > char pthread_create();
2149 >
2150 > int main() {
2151 > pthread_create()
2152 > ; return 0; }
2153 > EOF
2154 > if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2155 >  rm -rf conftest*
2156 >  eval "ac_cv_lib_$ac_lib_var=yes"
2157 > else
2158 >  echo "configure: failed program was:" >&5
2159 >  cat conftest.$ac_ext >&5
2160 >  rm -rf conftest*
2161 >  eval "ac_cv_lib_$ac_lib_var=no"
2162   fi
2163 + rm -f conftest*
2164 + LIBS="$ac_save_LIBS"
2165 +
2166 + fi
2167 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2168 +  echo "$ac_t""yes" 1>&6
2169 +    ac_tr_lib=HAVE_LIB`echo PTL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2170 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2171 +  cat >> confdefs.h <<EOF
2172 + #define $ac_tr_lib 1
2173 + EOF
2174 +
2175 +  LIBS="-lPTL $LIBS"
2176  
2036  if [ "x$HAVE_PTHREADS" = "xno" ]; then
2037     { echo "configure: error: You need libpthreads to run Basilisk II." 1>&2; exit 1; }
2038  else
2039     LIBS="$LIBS -lc_r"
2040  fi
2177   else
2178 <  LIBS="$LIBS -lpthread"
2178 >  echo "$ac_t""no" 1>&6
2179 >
2180 >      { echo "configure: error: You need pthreads to run Basilisk II." 1>&2; exit 1; }
2181 >    
2182   fi
2183 < for ac_func in pthread_cancel
2183 >
2184 >  
2185 > fi
2186 >
2187 >
2188 > fi
2189 >
2190 >
2191 > SEMSRCS=
2192 > for ac_func in sem_init
2193   do
2194   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2195 < echo "configure:2048: checking for $ac_func" >&5
2195 > echo "configure:2196: checking for $ac_func" >&5
2196   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2197    echo $ac_n "(cached) $ac_c" 1>&6
2198   else
2199    cat > conftest.$ac_ext <<EOF
2200 < #line 2053 "configure"
2200 > #line 2201 "configure"
2201   #include "confdefs.h"
2202   /* System header to define __stub macros and hopefully few prototypes,
2203      which can conflict with char $ac_func(); below.  */
# Line 2072 | Line 2220 | $ac_func();
2220  
2221   ; return 0; }
2222   EOF
2223 < if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2223 > if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2224    rm -rf conftest*
2225    eval "ac_cv_func_$ac_func=yes"
2226   else
# Line 2093 | Line 2241 | EOF
2241  
2242   else
2243    echo "$ac_t""no" 1>&6
2244 + SEMSRCS=posix_sem.cpp
2245 +
2246   fi
2247   done
2248  
2249  
2250 < if [ "x$WANT_DGA" = "xyes" ]; then
2250 > if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2251    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2252 < echo "configure:2103: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2252 > echo "configure:2253: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2253   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2254   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2255    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2107 | Line 2257 | else
2257    ac_save_LIBS="$LIBS"
2258   LIBS="-lXxf86dga  $LIBS"
2259   cat > conftest.$ac_ext <<EOF
2260 < #line 2111 "configure"
2260 > #line 2261 "configure"
2261   #include "confdefs.h"
2262   /* Override any gcc2 internal prototype to avoid an error.  */
2263   /* We use char because int might match the return type of a gcc2
# Line 2118 | Line 2268 | int main() {
2268   XF86DGAQueryExtension()
2269   ; return 0; }
2270   EOF
2271 < if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2271 > if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2272    rm -rf conftest*
2273    eval "ac_cv_lib_$ac_lib_var=yes"
2274   else
# Line 2133 | Line 2283 | LIBS="$ac_save_LIBS"
2283   fi
2284   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2285    echo "$ac_t""yes" 1>&6
2286 <  HAVE_DGA=yes
2286 >  
2287 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
2288 >    LIBS="$LIBS -lXxf86dga"
2289 >    if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2290 >      echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2
2291 >      WANT_FBDEV_DGA=no
2292 >    fi
2293 >  
2294   else
2295    echo "$ac_t""no" 1>&6
2296 < HAVE_DGA=no
2296 >
2297 >    echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2298 >    WANT_XF86_DGA=no
2299 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2300 >  
2301   fi
2302  
2303 <  if [ "x$HAVE_DGA" = "xno" ]; then
2304 <    echo "configure: warning: Could not find DGA extension, ignoring --enable-dga." 1>&2
2305 <  else
2306 <    DEFINES="$DEFINES -DENABLE_DGA=1"
2307 <    LIBS="$LIBS -lXxf86dga"
2308 <  fi
2303 > else
2304 >  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2305 > fi
2306 > if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2307 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
2308 > else
2309 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2310   fi
2311  
2312 + UISRCS=../dummy/prefs_editor_dummy.cpp
2313   if [ "x$WANT_UI" = "xyes" ]; then
2314    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2315   if test "${with_gtk_prefix+set}" = set; then
# Line 2189 | Line 2352 | fi
2352    # Extract the first word of "gtk-config", so it can be a program name with args.
2353   set dummy gtk-config; ac_word=$2
2354   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2355 < echo "configure:2193: checking for $ac_word" >&5
2355 > echo "configure:2356: checking for $ac_word" >&5
2356   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2357    echo $ac_n "(cached) $ac_c" 1>&6
2358   else
# Line 2224 | Line 2387 | fi
2387  
2388    min_gtk_version=1.2.0
2389    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2390 < echo "configure:2228: checking for GTK - version >= $min_gtk_version" >&5
2390 > echo "configure:2391: checking for GTK - version >= $min_gtk_version" >&5
2391    no_gtk=""
2392    if test "$GTK_CONFIG" = "no" ; then
2393      no_gtk=yes
# Line 2247 | Line 2410 | echo "configure:2228: checking for GTK -
2410    echo $ac_n "cross compiling; assumed OK... $ac_c"
2411   else
2412    cat > conftest.$ac_ext <<EOF
2413 < #line 2251 "configure"
2413 > #line 2414 "configure"
2414   #include "confdefs.h"
2415  
2416   #include <gtk/gtk.h>
# Line 2310 | Line 2473 | main ()
2473   }
2474  
2475   EOF
2476 < if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2476 > if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2477   then
2478    :
2479   else
# Line 2328 | Line 2491 | fi
2491    fi
2492    if test "x$no_gtk" = x ; then
2493       echo "$ac_t""yes" 1>&6
2494 <     :    
2494 >    
2495 >    DEFINES="$DEFINES -DENABLE_GTK=1"
2496 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
2497 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2498 >    LIBS="$LIBS $GTK_LIBS"
2499 >    UISRCS=prefs_editor_gtk.cpp
2500 >      
2501    else
2502       echo "$ac_t""no" 1>&6
2503       if test "$GTK_CONFIG" = "no" ; then
# Line 2344 | Line 2513 | fi
2513            CFLAGS="$CFLAGS $GTK_CFLAGS"
2514            LIBS="$LIBS $GTK_LIBS"
2515            cat > conftest.$ac_ext <<EOF
2516 < #line 2348 "configure"
2516 > #line 2517 "configure"
2517   #include "confdefs.h"
2518  
2519   #include <gtk/gtk.h>
# Line 2354 | Line 2523 | int main() {
2523   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2524   ; return 0; }
2525   EOF
2526 < if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2526 > if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2527    rm -rf conftest*
2528     echo "*** The test program compiled, but did not run. This usually means"
2529            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2386 | Line 2555 | rm -f conftest*
2555       fi
2556       GTK_CFLAGS=""
2557       GTK_LIBS=""
2558 <     :
2558 >    
2559 >    echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2560 >    WANT_UI=no
2561 >  
2562    fi
2563    
2564    
2565    rm -f conf.gtktest
2566  
2395  if [ "x$no_gtk" = "xyes" ]; then
2396    echo "Did not find gtk+, disabling user interface."
2397    WANT_UI=no
2398    GTK_CFLAGS=
2399    GTK_LIBS=
2400  else
2401    DEFINES="$DEFINES -DENABLE_GTK=1"
2402  fi
2403  CFLAGS="$CFLAGS $GTK_CFLAGS"
2404  CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2405  LIBS="$LIBS $GTK_LIBS"
2567   fi
2568  
2569 < SEMSRCS=
2570 < for ac_func in sem_init
2571 < do
2572 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2573 < echo "configure:2413: checking for $ac_func" >&5
2413 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2414 <  echo $ac_n "(cached) $ac_c" 1>&6
2569 > if [ "x$WANT_ESD" = "xyes" ]; then
2570 >  # Check whether --with-esd-prefix or --without-esd-prefix was given.
2571 > if test "${with_esd_prefix+set}" = set; then
2572 >  withval="$with_esd_prefix"
2573 >  esd_prefix="$withval"
2574   else
2575 <  cat > conftest.$ac_ext <<EOF
2576 < #line 2418 "configure"
2418 < #include "confdefs.h"
2419 < /* System header to define __stub macros and hopefully few prototypes,
2420 <    which can conflict with char $ac_func(); below.  */
2421 < #include <assert.h>
2422 < /* Override any gcc2 internal prototype to avoid an error.  */
2423 < /* We use char because int might match the return type of a gcc2
2424 <    builtin and then its argument prototype would still apply.  */
2425 < char $ac_func();
2426 <
2427 < int main() {
2428 <
2429 < /* The GNU C library defines this for functions which it implements
2430 <    to always fail with ENOSYS.  Some functions are actually named
2431 <    something starting with __ and the normal name is an alias.  */
2432 < #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
2433 < choke me
2434 < #else
2435 < $ac_func();
2436 < #endif
2575 >  esd_prefix=""
2576 > fi
2577  
2578 < ; return 0; }
2579 < EOF
2580 < if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2581 <  rm -rf conftest*
2442 <  eval "ac_cv_func_$ac_func=yes"
2578 > # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
2579 > if test "${with_esd_exec_prefix+set}" = set; then
2580 >  withval="$with_esd_exec_prefix"
2581 >  esd_exec_prefix="$withval"
2582   else
2583 <  echo "configure: failed program was:" >&5
2445 <  cat conftest.$ac_ext >&5
2446 <  rm -rf conftest*
2447 <  eval "ac_cv_func_$ac_func=no"
2583 >  esd_exec_prefix=""
2584   fi
2585 < rm -f conftest*
2585 >
2586 > # Check whether --enable-esdtest or --disable-esdtest was given.
2587 > if test "${enable_esdtest+set}" = set; then
2588 >  enableval="$enable_esdtest"
2589 >  :
2590 > else
2591 >  enable_esdtest=yes
2592   fi
2593  
2594 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2595 <  echo "$ac_t""yes" 1>&6
2596 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2597 <  cat >> confdefs.h <<EOF
2598 < #define $ac_tr_func 1
2599 < EOF
2600 <
2594 >
2595 >  if test x$esd_exec_prefix != x ; then
2596 >     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
2597 >     if test x${ESD_CONFIG+set} != xset ; then
2598 >        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
2599 >     fi
2600 >  fi
2601 >  if test x$esd_prefix != x ; then
2602 >     esd_args="$esd_args --prefix=$esd_prefix"
2603 >     if test x${ESD_CONFIG+set} != xset ; then
2604 >        ESD_CONFIG=$esd_prefix/bin/esd-config
2605 >     fi
2606 >  fi
2607 >
2608 >  # Extract the first word of "esd-config", so it can be a program name with args.
2609 > set dummy esd-config; ac_word=$2
2610 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2611 > echo "configure:2612: checking for $ac_word" >&5
2612 > if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2613 >  echo $ac_n "(cached) $ac_c" 1>&6
2614 > else
2615 >  case "$ESD_CONFIG" in
2616 >  /*)
2617 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
2618 >  ;;
2619 >  ?:/*)                  
2620 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
2621 >  ;;
2622 >  *)
2623 >  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
2624 >  ac_dummy="$PATH"
2625 >  for ac_dir in $ac_dummy; do
2626 >    test -z "$ac_dir" && ac_dir=.
2627 >    if test -f $ac_dir/$ac_word; then
2628 >      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
2629 >      break
2630 >    fi
2631 >  done
2632 >  IFS="$ac_save_ifs"
2633 >  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
2634 >  ;;
2635 > esac
2636 > fi
2637 > ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
2638 > if test -n "$ESD_CONFIG"; then
2639 >  echo "$ac_t""$ESD_CONFIG" 1>&6
2640   else
2641    echo "$ac_t""no" 1>&6
2642   fi
2462 done
2643  
2644 < if [ "x$ac_cv_func_sem_init" = "xno" ]; then
2645 <  echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
2646 < echo "configure:2467: checking for sem_init in -lposix4" >&5
2647 < ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
2648 < if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2649 <  echo $ac_n "(cached) $ac_c" 1>&6
2644 >  min_esd_version=0.2.8
2645 >  echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2646 > echo "configure:2647: checking for ESD - version >= $min_esd_version" >&5
2647 >  no_esd=""
2648 >  if test "$ESD_CONFIG" = "no" ; then
2649 >    no_esd=yes
2650 >  else
2651 >    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
2652 >    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
2653 >
2654 >    esd_major_version=`$ESD_CONFIG $esd_args --version | \
2655 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
2656 >    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
2657 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
2658 >    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
2659 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
2660 >    if test "x$enable_esdtest" = "xyes" ; then
2661 >      ac_save_CFLAGS="$CFLAGS"
2662 >      ac_save_LIBS="$LIBS"
2663 >      CFLAGS="$CFLAGS $ESD_CFLAGS"
2664 >      LIBS="$LIBS $ESD_LIBS"
2665 >      rm -f conf.esdtest
2666 >      if test "$cross_compiling" = yes; then
2667 >  echo $ac_n "cross compiling; assumed OK... $ac_c"
2668   else
2669 <  ac_save_LIBS="$LIBS"
2670 < LIBS="-lposix4  $LIBS"
2473 < cat > conftest.$ac_ext <<EOF
2474 < #line 2475 "configure"
2669 >  cat > conftest.$ac_ext <<EOF
2670 > #line 2671 "configure"
2671   #include "confdefs.h"
2476 /* Override any gcc2 internal prototype to avoid an error.  */
2477 /* We use char because int might match the return type of a gcc2
2478    builtin and then its argument prototype would still apply.  */
2479 char sem_init();
2672  
2673 < int main() {
2674 < sem_init()
2675 < ; return 0; }
2673 > #include <stdio.h>
2674 > #include <stdlib.h>
2675 > #include <string.h>
2676 > #include <esd.h>
2677 >
2678 > char*
2679 > my_strdup (char *str)
2680 > {
2681 >  char *new_str;
2682 >  
2683 >  if (str)
2684 >    {
2685 >      new_str = malloc ((strlen (str) + 1) * sizeof(char));
2686 >      strcpy (new_str, str);
2687 >    }
2688 >  else
2689 >    new_str = NULL;
2690 >  
2691 >  return new_str;
2692 > }
2693 >
2694 > int main ()
2695 > {
2696 >  int major, minor, micro;
2697 >  char *tmp_version;
2698 >
2699 >  system ("touch conf.esdtest");
2700 >
2701 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
2702 >  tmp_version = my_strdup("$min_esd_version");
2703 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
2704 >     printf("%s, bad version string\n", "$min_esd_version");
2705 >     exit(1);
2706 >   }
2707 >
2708 >   if (($esd_major_version > major) ||
2709 >      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
2710 >      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
2711 >    {
2712 >      return 0;
2713 >    }
2714 >  else
2715 >    {
2716 >      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
2717 >      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
2718 >      printf("*** best to upgrade to the required version.\n");
2719 >      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
2720 >      printf("*** to point to the correct copy of esd-config, and remove the file\n");
2721 >      printf("*** config.cache before re-running configure\n");
2722 >      return 1;
2723 >    }
2724 > }
2725 >
2726 >
2727   EOF
2728 < if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2729 <  rm -rf conftest*
2730 <  eval "ac_cv_lib_$ac_lib_var=yes"
2728 > if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2729 > then
2730 >  :
2731   else
2732    echo "configure: failed program was:" >&5
2733    cat conftest.$ac_ext >&5
2734 <  rm -rf conftest*
2735 <  eval "ac_cv_lib_$ac_lib_var=no"
2493 < fi
2494 < rm -f conftest*
2495 < LIBS="$ac_save_LIBS"
2496 <
2734 >  rm -fr conftest*
2735 >  no_esd=yes
2736   fi
2737 < if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2499 <  echo "$ac_t""yes" 1>&6
2500 <  HAVE_LIBPOSIX4=yes
2501 < else
2502 <  echo "$ac_t""no" 1>&6
2503 < HAVE_LIBPOSIX4=no
2737 > rm -fr conftest*
2738   fi
2739  
2740 <  if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then
2741 <        for ac_func in semget
2742 < do
2743 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2744 < echo "configure:2511: checking for $ac_func" >&5
2745 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2746 <  echo $ac_n "(cached) $ac_c" 1>&6
2747 < else
2748 <  cat > conftest.$ac_ext <<EOF
2749 < #line 2516 "configure"
2740 >       CFLAGS="$ac_save_CFLAGS"
2741 >       LIBS="$ac_save_LIBS"
2742 >     fi
2743 >  fi
2744 >  if test "x$no_esd" = x ; then
2745 >     echo "$ac_t""yes" 1>&6
2746 >    
2747 >    DEFINES="$DEFINES -DENABLE_ESD=1"
2748 >    CFLAGS="$CFLAGS $ESD_CFLAGS"
2749 >    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
2750 >    LIBS="$LIBS $ESD_LIBS"
2751 >      
2752 >  else
2753 >     echo "$ac_t""no" 1>&6
2754 >     if test "$ESD_CONFIG" = "no" ; then
2755 >       echo "*** The esd-config script installed by ESD could not be found"
2756 >       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
2757 >       echo "*** your path, or set the ESD_CONFIG environment variable to the"
2758 >       echo "*** full path to esd-config."
2759 >     else
2760 >       if test -f conf.esdtest ; then
2761 >        :
2762 >       else
2763 >          echo "*** Could not run ESD test program, checking why..."
2764 >          CFLAGS="$CFLAGS $ESD_CFLAGS"
2765 >          LIBS="$LIBS $ESD_LIBS"
2766 >          cat > conftest.$ac_ext <<EOF
2767 > #line 2768 "configure"
2768   #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() {
2769  
2770 < /* The GNU C library defines this for functions which it implements
2771 <    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
2770 > #include <stdio.h>
2771 > #include <esd.h>
2772  
2773 + int main() {
2774 + return 0;
2775   ; return 0; }
2776   EOF
2777 < if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2777 > if { (eval echo configure:2778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2778    rm -rf conftest*
2779 <  eval "ac_cv_func_$ac_func=yes"
2779 >   echo "*** The test program compiled, but did not run. This usually means"
2780 >          echo "*** that the run-time linker is not finding ESD or finding the wrong"
2781 >          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
2782 >          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2783 >          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
2784 >          echo "*** is required on your system"
2785 >          echo "***"
2786 >          echo "*** If you have an old version installed, it is best to remove it, although"
2787 >          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
2788   else
2789    echo "configure: failed program was:" >&5
2790    cat conftest.$ac_ext >&5
2791    rm -rf conftest*
2792 <  eval "ac_cv_func_$ac_func=no"
2792 >   echo "*** The test program failed to compile or link. See the file config.log for the"
2793 >          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
2794 >          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
2795 >          echo "*** may want to edit the esd-config script: $ESD_CONFIG"
2796   fi
2797   rm -f conftest*
2798 < fi
2799 <
2800 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2801 <  echo "$ac_t""yes" 1>&6
2802 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2803 <  cat >> confdefs.h <<EOF
2804 < #define $ac_tr_func 1
2805 < EOF
2806 <
2807 < 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
2567 <  else
2568 <    LIBS="$LIBS -lposix4"
2798 >          CFLAGS="$ac_save_CFLAGS"
2799 >          LIBS="$ac_save_LIBS"
2800 >       fi
2801 >     fi
2802 >     ESD_CFLAGS=""
2803 >     ESD_LIBS=""
2804 >    
2805 >    echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
2806 >    WANT_ESD=no
2807 >  
2808    fi
2809 +  
2810 +  
2811 +  rm -f conf.esdtest
2812 +
2813   fi
2814  
2815   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2816 < echo "configure:2574: checking for ANSI C header files" >&5
2816 > echo "configure:2817: checking for ANSI C header files" >&5
2817   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2818    echo $ac_n "(cached) $ac_c" 1>&6
2819   else
2820    cat > conftest.$ac_ext <<EOF
2821 < #line 2579 "configure"
2821 > #line 2822 "configure"
2822   #include "confdefs.h"
2823   #include <stdlib.h>
2824   #include <stdarg.h>
# Line 2583 | Line 2826 | else
2826   #include <float.h>
2827   EOF
2828   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2829 < { (eval echo configure:2587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2829 > { (eval echo configure:2830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2830   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2831   if test -z "$ac_err"; then
2832    rm -rf conftest*
# Line 2600 | Line 2843 | rm -f conftest*
2843   if test $ac_cv_header_stdc = yes; then
2844    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2845   cat > conftest.$ac_ext <<EOF
2846 < #line 2604 "configure"
2846 > #line 2847 "configure"
2847   #include "confdefs.h"
2848   #include <string.h>
2849   EOF
# Line 2618 | Line 2861 | fi
2861   if test $ac_cv_header_stdc = yes; then
2862    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2863   cat > conftest.$ac_ext <<EOF
2864 < #line 2622 "configure"
2864 > #line 2865 "configure"
2865   #include "confdefs.h"
2866   #include <stdlib.h>
2867   EOF
# Line 2639 | Line 2882 | if test "$cross_compiling" = yes; then
2882    :
2883   else
2884    cat > conftest.$ac_ext <<EOF
2885 < #line 2643 "configure"
2885 > #line 2886 "configure"
2886   #include "confdefs.h"
2887   #include <ctype.h>
2888   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2650 | Line 2893 | if (XOR (islower (i), ISLOWER (i)) || to
2893   exit (0); }
2894  
2895   EOF
2896 < if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2896 > if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2897   then
2898    :
2899   else
# Line 2677 | Line 2920 | for ac_hdr in unistd.h fcntl.h sys/time.
2920   do
2921   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2922   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2923 < echo "configure:2681: checking for $ac_hdr" >&5
2923 > echo "configure:2924: checking for $ac_hdr" >&5
2924   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2925    echo $ac_n "(cached) $ac_c" 1>&6
2926   else
2927    cat > conftest.$ac_ext <<EOF
2928 < #line 2686 "configure"
2928 > #line 2929 "configure"
2929   #include "confdefs.h"
2930   #include <$ac_hdr>
2931   EOF
2932   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2933 < { (eval echo configure:2691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2933 > { (eval echo configure:2934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2934   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2935   if test -z "$ac_err"; then
2936    rm -rf conftest*
# Line 2715 | Line 2958 | done
2958  
2959  
2960   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
2961 < echo "configure:2719: checking whether byte ordering is bigendian" >&5
2961 > echo "configure:2962: checking whether byte ordering is bigendian" >&5
2962   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
2963    echo $ac_n "(cached) $ac_c" 1>&6
2964   else
2965    ac_cv_c_bigendian=unknown
2966   # See if sys/param.h defines the BYTE_ORDER macro.
2967   cat > conftest.$ac_ext <<EOF
2968 < #line 2726 "configure"
2968 > #line 2969 "configure"
2969   #include "confdefs.h"
2970   #include <sys/types.h>
2971   #include <sys/param.h>
# Line 2733 | Line 2976 | int main() {
2976   #endif
2977   ; return 0; }
2978   EOF
2979 < if { (eval echo configure:2737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2979 > if { (eval echo configure:2980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2980    rm -rf conftest*
2981    # It does; now see whether it defined to BIG_ENDIAN or not.
2982   cat > conftest.$ac_ext <<EOF
2983 < #line 2741 "configure"
2983 > #line 2984 "configure"
2984   #include "confdefs.h"
2985   #include <sys/types.h>
2986   #include <sys/param.h>
# Line 2748 | Line 2991 | int main() {
2991   #endif
2992   ; return 0; }
2993   EOF
2994 < if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2994 > if { (eval echo configure:2995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2995    rm -rf conftest*
2996    ac_cv_c_bigendian=yes
2997   else
# Line 2768 | Line 3011 | if test "$cross_compiling" = yes; then
3011      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3012   else
3013    cat > conftest.$ac_ext <<EOF
3014 < #line 2772 "configure"
3014 > #line 3015 "configure"
3015   #include "confdefs.h"
3016   main () {
3017    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 2781 | Line 3024 | main () {
3024    exit (u.c[sizeof (long) - 1] == 1);
3025   }
3026   EOF
3027 < if { (eval echo configure:2785: \"$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_c_bigendian=no
3030   else
# Line 2805 | Line 3048 | EOF
3048   fi
3049  
3050   echo $ac_n "checking for working const""... $ac_c" 1>&6
3051 < echo "configure:2809: checking for working const" >&5
3051 > echo "configure:3052: checking for working const" >&5
3052   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3053    echo $ac_n "(cached) $ac_c" 1>&6
3054   else
3055    cat > conftest.$ac_ext <<EOF
3056 < #line 2814 "configure"
3056 > #line 3057 "configure"
3057   #include "confdefs.h"
3058  
3059   int main() {
# Line 2859 | Line 3102 | ccp = (char const *const *) p;
3102  
3103   ; return 0; }
3104   EOF
3105 < if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3105 > if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3106    rm -rf conftest*
3107    ac_cv_c_const=yes
3108   else
# Line 2880 | Line 3123 | EOF
3123   fi
3124  
3125   echo $ac_n "checking for inline""... $ac_c" 1>&6
3126 < echo "configure:2884: checking for inline" >&5
3126 > echo "configure:3127: checking for inline" >&5
3127   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3128    echo $ac_n "(cached) $ac_c" 1>&6
3129   else
3130    ac_cv_c_inline=no
3131   for ac_kw in inline __inline__ __inline; do
3132    cat > conftest.$ac_ext <<EOF
3133 < #line 2891 "configure"
3133 > #line 3134 "configure"
3134   #include "confdefs.h"
3135  
3136   int main() {
3137   } $ac_kw foo() {
3138   ; return 0; }
3139   EOF
3140 < if { (eval echo configure:2898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3140 > if { (eval echo configure:3141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3141    rm -rf conftest*
3142    ac_cv_c_inline=$ac_kw; break
3143   else
# Line 2920 | Line 3163 | EOF
3163   esac
3164  
3165   echo $ac_n "checking size of short""... $ac_c" 1>&6
3166 < echo "configure:2924: checking size of short" >&5
3166 > echo "configure:3167: checking size of short" >&5
3167   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3168    echo $ac_n "(cached) $ac_c" 1>&6
3169   else
# Line 2928 | Line 3171 | else
3171    ac_cv_sizeof_short=2
3172   else
3173    cat > conftest.$ac_ext <<EOF
3174 < #line 2932 "configure"
3174 > #line 3175 "configure"
3175   #include "confdefs.h"
3176   #include <stdio.h>
3177   main()
# Line 2939 | Line 3182 | main()
3182    exit(0);
3183   }
3184   EOF
3185 < if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3185 > if { (eval echo configure:3186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3186   then
3187    ac_cv_sizeof_short=`cat conftestval`
3188   else
# Line 2959 | Line 3202 | EOF
3202  
3203  
3204   echo $ac_n "checking size of int""... $ac_c" 1>&6
3205 < echo "configure:2963: checking size of int" >&5
3205 > echo "configure:3206: checking size of int" >&5
3206   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3207    echo $ac_n "(cached) $ac_c" 1>&6
3208   else
# Line 2967 | Line 3210 | else
3210    ac_cv_sizeof_int=4
3211   else
3212    cat > conftest.$ac_ext <<EOF
3213 < #line 2971 "configure"
3213 > #line 3214 "configure"
3214   #include "confdefs.h"
3215   #include <stdio.h>
3216   main()
# Line 2978 | Line 3221 | main()
3221    exit(0);
3222   }
3223   EOF
3224 < if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3224 > if { (eval echo configure:3225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3225   then
3226    ac_cv_sizeof_int=`cat conftestval`
3227   else
# Line 2998 | Line 3241 | EOF
3241  
3242  
3243   echo $ac_n "checking size of long""... $ac_c" 1>&6
3244 < echo "configure:3002: checking size of long" >&5
3244 > echo "configure:3245: checking size of long" >&5
3245   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3246    echo $ac_n "(cached) $ac_c" 1>&6
3247   else
# Line 3006 | Line 3249 | else
3249    ac_cv_sizeof_long=4
3250   else
3251    cat > conftest.$ac_ext <<EOF
3252 < #line 3010 "configure"
3252 > #line 3253 "configure"
3253   #include "confdefs.h"
3254   #include <stdio.h>
3255   main()
# Line 3017 | Line 3260 | main()
3260    exit(0);
3261   }
3262   EOF
3263 < if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3263 > if { (eval echo configure:3264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3264   then
3265    ac_cv_sizeof_long=`cat conftestval`
3266   else
# Line 3037 | Line 3280 | EOF
3280  
3281  
3282   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3283 < echo "configure:3041: checking size of long long" >&5
3283 > echo "configure:3284: checking size of long long" >&5
3284   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3285    echo $ac_n "(cached) $ac_c" 1>&6
3286   else
# Line 3045 | Line 3288 | else
3288    ac_cv_sizeof_long_long=8
3289   else
3290    cat > conftest.$ac_ext <<EOF
3291 < #line 3049 "configure"
3291 > #line 3292 "configure"
3292   #include "confdefs.h"
3293   #include <stdio.h>
3294   main()
# Line 3056 | Line 3299 | main()
3299    exit(0);
3300   }
3301   EOF
3302 < if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3302 > if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3303   then
3304    ac_cv_sizeof_long_long=`cat conftestval`
3305   else
# Line 3076 | Line 3319 | EOF
3319  
3320  
3321   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3322 < echo "configure:3080: checking for off_t" >&5
3322 > echo "configure:3323: checking for off_t" >&5
3323   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3324    echo $ac_n "(cached) $ac_c" 1>&6
3325   else
3326    cat > conftest.$ac_ext <<EOF
3327 < #line 3085 "configure"
3327 > #line 3328 "configure"
3328   #include "confdefs.h"
3329   #include <sys/types.h>
3330   #if STDC_HEADERS
# Line 3109 | Line 3352 | EOF
3352   fi
3353  
3354   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3355 < echo "configure:3113: checking for loff_t" >&5
3355 > echo "configure:3356: checking for loff_t" >&5
3356   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3357    echo $ac_n "(cached) $ac_c" 1>&6
3358   else
3359    cat > conftest.$ac_ext <<EOF
3360 < #line 3118 "configure"
3360 > #line 3361 "configure"
3361   #include "confdefs.h"
3362   #include <sys/types.h>
3363   #if STDC_HEADERS
# Line 3142 | Line 3385 | EOF
3385   fi
3386  
3387   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3388 < echo "configure:3146: checking for size_t" >&5
3388 > echo "configure:3389: checking for size_t" >&5
3389   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3390    echo $ac_n "(cached) $ac_c" 1>&6
3391   else
3392    cat > conftest.$ac_ext <<EOF
3393 < #line 3151 "configure"
3393 > #line 3394 "configure"
3394   #include "confdefs.h"
3395   #include <sys/types.h>
3396   #if STDC_HEADERS
# Line 3175 | Line 3418 | EOF
3418   fi
3419  
3420   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3421 < echo "configure:3179: checking whether time.h and sys/time.h may both be included" >&5
3421 > echo "configure:3422: checking whether time.h and sys/time.h may both be included" >&5
3422   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3423    echo $ac_n "(cached) $ac_c" 1>&6
3424   else
3425    cat > conftest.$ac_ext <<EOF
3426 < #line 3184 "configure"
3426 > #line 3427 "configure"
3427   #include "confdefs.h"
3428   #include <sys/types.h>
3429   #include <sys/time.h>
# Line 3189 | Line 3432 | int main() {
3432   struct tm *tp;
3433   ; return 0; }
3434   EOF
3435 < if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3435 > if { (eval echo configure:3436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3436    rm -rf conftest*
3437    ac_cv_header_time=yes
3438   else
# Line 3210 | Line 3453 | EOF
3453   fi
3454  
3455   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3456 < echo "configure:3214: checking whether struct tm is in sys/time.h or time.h" >&5
3456 > echo "configure:3457: checking whether struct tm is in sys/time.h or time.h" >&5
3457   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3458    echo $ac_n "(cached) $ac_c" 1>&6
3459   else
3460    cat > conftest.$ac_ext <<EOF
3461 < #line 3219 "configure"
3461 > #line 3462 "configure"
3462   #include "confdefs.h"
3463   #include <sys/types.h>
3464   #include <time.h>
# Line 3223 | Line 3466 | int main() {
3466   struct tm *tp; tp->tm_sec;
3467   ; return 0; }
3468   EOF
3469 < if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3469 > if { (eval echo configure:3470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3470    rm -rf conftest*
3471    ac_cv_struct_tm=time.h
3472   else
# Line 3247 | Line 3490 | fi
3490   for ac_func in strdup cfmakeraw
3491   do
3492   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3493 < echo "configure:3251: checking for $ac_func" >&5
3493 > echo "configure:3494: checking for $ac_func" >&5
3494   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3495    echo $ac_n "(cached) $ac_c" 1>&6
3496   else
3497    cat > conftest.$ac_ext <<EOF
3498 < #line 3256 "configure"
3498 > #line 3499 "configure"
3499   #include "confdefs.h"
3500   /* System header to define __stub macros and hopefully few prototypes,
3501      which can conflict with char $ac_func(); below.  */
# Line 3275 | Line 3518 | $ac_func();
3518  
3519   ; return 0; }
3520   EOF
3521 < if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3521 > if { (eval echo configure:3522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3522    rm -rf conftest*
3523    eval "ac_cv_func_$ac_func=yes"
3524   else
# Line 3302 | Line 3545 | done
3545   for ac_func in nanosleep clock_gettime timer_create
3546   do
3547   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3548 < echo "configure:3306: checking for $ac_func" >&5
3548 > echo "configure:3549: checking for $ac_func" >&5
3549 > if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3550 >  echo $ac_n "(cached) $ac_c" 1>&6
3551 > else
3552 >  cat > conftest.$ac_ext <<EOF
3553 > #line 3554 "configure"
3554 > #include "confdefs.h"
3555 > /* System header to define __stub macros and hopefully few prototypes,
3556 >    which can conflict with char $ac_func(); below.  */
3557 > #include <assert.h>
3558 > /* Override any gcc2 internal prototype to avoid an error.  */
3559 > /* We use char because int might match the return type of a gcc2
3560 >    builtin and then its argument prototype would still apply.  */
3561 > char $ac_func();
3562 >
3563 > int main() {
3564 >
3565 > /* The GNU C library defines this for functions which it implements
3566 >    to always fail with ENOSYS.  Some functions are actually named
3567 >    something starting with __ and the normal name is an alias.  */
3568 > #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
3569 > choke me
3570 > #else
3571 > $ac_func();
3572 > #endif
3573 >
3574 > ; return 0; }
3575 > EOF
3576 > if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3577 >  rm -rf conftest*
3578 >  eval "ac_cv_func_$ac_func=yes"
3579 > else
3580 >  echo "configure: failed program was:" >&5
3581 >  cat conftest.$ac_ext >&5
3582 >  rm -rf conftest*
3583 >  eval "ac_cv_func_$ac_func=no"
3584 > fi
3585 > rm -f conftest*
3586 > fi
3587 >
3588 > if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
3589 >  echo "$ac_t""yes" 1>&6
3590 >    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3591 >  cat >> confdefs.h <<EOF
3592 > #define $ac_tr_func 1
3593 > EOF
3594 >
3595 > else
3596 >  echo "$ac_t""no" 1>&6
3597 > fi
3598 > done
3599 >
3600 > for ac_func in pthread_cancel
3601 > do
3602 > echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3603 > echo "configure:3604: checking for $ac_func" >&5
3604   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3605    echo $ac_n "(cached) $ac_c" 1>&6
3606   else
3607    cat > conftest.$ac_ext <<EOF
3608 < #line 3311 "configure"
3608 > #line 3609 "configure"
3609   #include "confdefs.h"
3610   /* System header to define __stub macros and hopefully few prototypes,
3611      which can conflict with char $ac_func(); below.  */
# Line 3330 | Line 3628 | $ac_func();
3628  
3629   ; return 0; }
3630   EOF
3631 < if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3631 > if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3632    rm -rf conftest*
3633    eval "ac_cv_func_$ac_func=yes"
3634   else
# Line 3359 | Line 3657 | SYSSRCS="../dummy/ether_dummy.cpp ../dum
3657   if MACHINE=`uname -a 2>/dev/null`; then
3658    case "$MACHINE" in
3659    Linux*)
3660 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp"
3660 >    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
3661      ;;
3662    FreeBSD*3.*)
3663          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3664 < echo "configure:3367: checking for cam_open_btl in -lcam" >&5
3664 > echo "configure:3665: checking for cam_open_btl in -lcam" >&5
3665   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3666   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3667    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3371 | Line 3669 | else
3669    ac_save_LIBS="$LIBS"
3670   LIBS="-lcam  $LIBS"
3671   cat > conftest.$ac_ext <<EOF
3672 < #line 3375 "configure"
3672 > #line 3673 "configure"
3673   #include "confdefs.h"
3674   /* Override any gcc2 internal prototype to avoid an error.  */
3675   /* We use char because int might match the return type of a gcc2
# Line 3382 | Line 3680 | int main() {
3680   cam_open_btl()
3681   ; return 0; }
3682   EOF
3683 < if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3683 > if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3684    rm -rf conftest*
3685    eval "ac_cv_lib_$ac_lib_var=yes"
3686   else
# Line 3408 | Line 3706 | fi
3706      else
3707              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3708   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3709 < echo "configure:3412: checking for /sys/cam/cam.h" >&5
3709 > echo "configure:3710: checking for /sys/cam/cam.h" >&5
3710   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3711    echo $ac_n "(cached) $ac_c" 1>&6
3712   else
3713    cat > conftest.$ac_ext <<EOF
3714 < #line 3417 "configure"
3714 > #line 3715 "configure"
3715   #include "confdefs.h"
3716   #include </sys/cam/cam.h>
3717   EOF
3718   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3719 < { (eval echo configure:3422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3719 > { (eval echo configure:3720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3720   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3721   if test -z "$ac_err"; then
3722    rm -rf conftest*
# Line 3442 | Line 3740 | fi
3740        if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then
3741                          { echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; }
3742        fi
3743 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3743 >      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
3744        CXXFLAGS="$CXXFLAGS -I/sys"
3745        CFLAGS="$CFLAGS -I/sys"
3746        LIBS="$LIBS -lcam"
# Line 3451 | Line 3749 | fi
3749      ;;
3750    FreeBSD*)
3751          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3752 < echo "configure:3455: checking for scsi_open in -lscsi" >&5
3752 > echo "configure:3753: checking for scsi_open in -lscsi" >&5
3753   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3754   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3755    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3459 | Line 3757 | else
3757    ac_save_LIBS="$LIBS"
3758   LIBS="-lscsi  $LIBS"
3759   cat > conftest.$ac_ext <<EOF
3760 < #line 3463 "configure"
3760 > #line 3761 "configure"
3761   #include "confdefs.h"
3762   /* Override any gcc2 internal prototype to avoid an error.  */
3763   /* We use char because int might match the return type of a gcc2
# Line 3470 | Line 3768 | int main() {
3768   scsi_open()
3769   ; return 0; }
3770   EOF
3771 < if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3771 > if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3772    rm -rf conftest*
3773    eval "ac_cv_lib_$ac_lib_var=yes"
3774   else
# Line 3496 | Line 3794 | fi
3794      else
3795              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3796   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3797 < echo "configure:3500: checking for scsi.h sys/scsiio.h" >&5
3797 > echo "configure:3798: checking for scsi.h sys/scsiio.h" >&5
3798   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3799    echo $ac_n "(cached) $ac_c" 1>&6
3800   else
3801    cat > conftest.$ac_ext <<EOF
3802 < #line 3505 "configure"
3802 > #line 3803 "configure"
3803   #include "confdefs.h"
3804   #include <scsi.h sys/scsiio.h>
3805   EOF
3806   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3807 < { (eval echo configure:3510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3807 > { (eval echo configure:3808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3808   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3809   if test -z "$ac_err"; then
3810    rm -rf conftest*
# Line 3545 | Line 3843 | fi
3843      LIBS="$LIBS -lm"
3844      ;;
3845    esac
3548  if [ "x$WANT_UI" = "xyes" ]; then
3549    SYSSRCS="$SYSSRCS prefs_editor_gtk.cpp"
3550  else
3551    SYSSRCS="$SYSSRCS ../dummy/prefs_editor_dummy.cpp"
3552  fi
3553 fi
3554 if [ "x$SEMSRCS" != "x" ]; then
3555  SYSSRCS="$SYSSRCS $SEMSRCS"
3846   fi
3847 <
3558 < CPUINCLUDES="-I../uae_cpu"
3559 < CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp"
3847 > SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
3848  
3849   HAVE_I386=no
3850   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
3851 < echo "configure:3564: checking for x86 target CPU" >&5
3851 > echo "configure:3852: checking for x86 target CPU" >&5
3852   cat > conftest.$ac_ext <<EOF
3853 < #line 3566 "configure"
3853 > #line 3854 "configure"
3854   #include "confdefs.h"
3855  
3856   #ifdef __i386__
# Line 3581 | Line 3869 | fi
3869   rm -f conftest*
3870  
3871  
3872 + HAVE_SPARC=no
3873 + echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
3874 + echo "configure:3875: checking for SPARC target CPU" >&5
3875 + cat > conftest.$ac_ext <<EOF
3876 + #line 3877 "configure"
3877 + #include "confdefs.h"
3878 +
3879 + #ifdef __sparc__
3880 +  yes
3881 + #endif
3882 +
3883 + EOF
3884 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3885 +  egrep "yes" >/dev/null 2>&1; then
3886 +  rm -rf conftest*
3887 +  echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes
3888 + else
3889 +  rm -rf conftest*
3890 +  echo "$ac_t""no" 1>&6
3891 + fi
3892 + rm -f conftest*
3893 +
3894 +
3895   HAVE_GAS=no
3896   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
3897 < echo "configure:3587: checking for GAS .p2align feature" >&5
3897 > echo "configure:3898: checking for GAS .p2align feature" >&5
3898   cat >conftest.S << EOF
3899          .text
3900          .p2align 5
# Line 3593 | Line 3904 | echo "$ac_t""$HAVE_GAS" 1>&6
3904  
3905   HAVE_GCC27=no
3906   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
3907 < echo "configure:3597: checking for GCC 2.7 or higher" >&5
3907 > echo "configure:3908: checking for GCC 2.7 or higher" >&5
3908   cat > conftest.$ac_ext <<EOF
3909 < #line 3599 "configure"
3909 > #line 3910 "configure"
3910   #include "confdefs.h"
3911   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
3912    yes
# Line 3618 | Line 3929 | if [ "x$HAVE_GCC27" = "xyes" ]; then
3929    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
3930   fi
3931  
3932 + WANT_X86_ASSEMBLY=no
3933 + WANT_SPARC_V8_ASSEMBLY=no
3934 + WANT_SPARC_V9_ASSEMBLY=no
3935 + CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
3936   if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
3937 <  DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
3937 >    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
3938    if [ "x$HAVE_GAS" = "xyes" ]; then
3939 +    WANT_X86_ASSEMBLY=yes
3940      DEFINES="$DEFINES -DX86_ASSEMBLY"
3941 <    CPUSRCS="$CPUSRCS cpufast.s"
3626 <  else
3627 <    CPUSRCS="$CPUSRCS cpuemu.cpp"
3941 >    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
3942    fi
3943 < else
3944 <  CPUSRCS="$CPUSRCS cpuemu.cpp"
3943 > elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
3944 >    case "$MACHINE" in
3945 >  SunOS*)
3946 >    echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
3947 > echo "configure:3948: checking SPARC CPU architecture" >&5
3948 >    SPARC_TYPE=`Solaris/which_sparc`
3949 >    echo "$ac_t""$SPARC_TYPE" 1>&6
3950 >    case "$SPARC_TYPE" in
3951 >    SPARC_V8)
3952 >      WANT_SPARC_V8_ASSEMBLY=yes
3953 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
3954 >      CFLAGS="$CFLAGS -Wa,-Av8"
3955 >      CXXFLAGS="$CXXFLAGS -Wa,-Av8"
3956 >      ;;
3957 >    SPARC_V9)
3958 >      WANT_SPARC_V9_ASSEMBLY=yes
3959 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
3960 >      CFLAGS="$CFLAGS -Wa,-Av9"
3961 >      CXXFLAGS="$CXXFLAGS -Wa,-Av9"
3962 >      ;;
3963 >    esac
3964 >    ;;
3965 >  esac
3966   fi
3967  
3968 + CPUINCLUDES="-I../uae_cpu"
3969 + CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp $CPUSRCS"
3970  
3971  
3972  
# Line 3769 | Line 4106 | s%@oldincludedir@%$oldincludedir%g
4106   s%@infodir@%$infodir%g
4107   s%@mandir@%$mandir%g
4108   s%@CC@%$CC%g
3772 s%@CXX@%$CXX%g
4109   s%@CPP@%$CPP%g
4110 + s%@CXX@%$CXX%g
4111   s%@SET_MAKE@%$SET_MAKE%g
4112   s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
4113   s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
# Line 3782 | Line 4119 | s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
4119   s%@GTK_CONFIG@%$GTK_CONFIG%g
4120   s%@GTK_CFLAGS@%$GTK_CFLAGS%g
4121   s%@GTK_LIBS@%$GTK_LIBS%g
4122 + s%@ESD_CONFIG@%$ESD_CONFIG%g
4123 + s%@ESD_CFLAGS@%$ESD_CFLAGS%g
4124 + s%@ESD_LIBS@%$ESD_LIBS%g
4125   s%@DEFINES@%$DEFINES%g
3786 s%@STATICLIBS@%$STATICLIBS%g
4126   s%@SYSSRCS@%$SYSSRCS%g
4127   s%@CPUINCLUDES@%$CPUINCLUDES%g
4128   s%@CPUSRCS@%$CPUSRCS%g
# Line 4006 | Line 4345 | chmod +x $CONFIG_STATUS
4345   rm -fr confdefs* $ac_clean_files
4346   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
4347  
4348 +
4349 + echo
4350 + echo Basilisk II configuration summary:
4351 + echo
4352 + echo XFree86 DGA support .............. : $WANT_XF86_DGA
4353 + echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4354 + echo ESD sound support ................ : $WANT_ESD
4355 + echo GTK user interface ............... : $WANT_UI
4356 + echo mon debugger support ............. : $WANT_MON
4357 + echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4358 + echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
4359 + echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
4360 + echo
4361   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines