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.11 by cebix, 1999-10-25T19:01:35Z

# 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 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2299 >  
2300   fi
2301  
2302 <  if [ "x$HAVE_DGA" = "xno" ]; then
2303 <    echo "configure: warning: Could not find DGA extension, ignoring --enable-dga." 1>&2
2304 <  else
2305 <    DEFINES="$DEFINES -DENABLE_DGA=1"
2306 <    LIBS="$LIBS -lXxf86dga"
2307 <  fi
2302 > else
2303 >  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2304 > fi
2305 > if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2306 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
2307 > else
2308 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2309   fi
2310  
2311 + UISRCS=../dummy/prefs_editor_dummy.cpp
2312   if [ "x$WANT_UI" = "xyes" ]; then
2313    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2314   if test "${with_gtk_prefix+set}" = set; then
# Line 2189 | Line 2351 | fi
2351    # Extract the first word of "gtk-config", so it can be a program name with args.
2352   set dummy gtk-config; ac_word=$2
2353   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2354 < echo "configure:2193: checking for $ac_word" >&5
2354 > echo "configure:2355: checking for $ac_word" >&5
2355   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2356    echo $ac_n "(cached) $ac_c" 1>&6
2357   else
# Line 2224 | Line 2386 | fi
2386  
2387    min_gtk_version=1.2.0
2388    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2389 < echo "configure:2228: checking for GTK - version >= $min_gtk_version" >&5
2389 > echo "configure:2390: checking for GTK - version >= $min_gtk_version" >&5
2390    no_gtk=""
2391    if test "$GTK_CONFIG" = "no" ; then
2392      no_gtk=yes
# Line 2247 | Line 2409 | echo "configure:2228: checking for GTK -
2409    echo $ac_n "cross compiling; assumed OK... $ac_c"
2410   else
2411    cat > conftest.$ac_ext <<EOF
2412 < #line 2251 "configure"
2412 > #line 2413 "configure"
2413   #include "confdefs.h"
2414  
2415   #include <gtk/gtk.h>
# Line 2310 | Line 2472 | main ()
2472   }
2473  
2474   EOF
2475 < if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2475 > if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2476   then
2477    :
2478   else
# Line 2328 | Line 2490 | fi
2490    fi
2491    if test "x$no_gtk" = x ; then
2492       echo "$ac_t""yes" 1>&6
2493 <     :    
2493 >    
2494 >    DEFINES="$DEFINES -DENABLE_GTK=1"
2495 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
2496 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2497 >    LIBS="$LIBS $GTK_LIBS"
2498 >    UISRCS=prefs_editor_gtk.cpp
2499 >      
2500    else
2501       echo "$ac_t""no" 1>&6
2502       if test "$GTK_CONFIG" = "no" ; then
# Line 2344 | Line 2512 | fi
2512            CFLAGS="$CFLAGS $GTK_CFLAGS"
2513            LIBS="$LIBS $GTK_LIBS"
2514            cat > conftest.$ac_ext <<EOF
2515 < #line 2348 "configure"
2515 > #line 2516 "configure"
2516   #include "confdefs.h"
2517  
2518   #include <gtk/gtk.h>
# Line 2354 | Line 2522 | int main() {
2522   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2523   ; return 0; }
2524   EOF
2525 < if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2525 > if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2526    rm -rf conftest*
2527     echo "*** The test program compiled, but did not run. This usually means"
2528            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2386 | Line 2554 | rm -f conftest*
2554       fi
2555       GTK_CFLAGS=""
2556       GTK_LIBS=""
2557 <     :
2557 >    
2558 >    echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2559 >    WANT_UI=no
2560 >  
2561    fi
2562    
2563    
2564    rm -f conf.gtktest
2565  
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"
2566   fi
2567  
2568 < SEMSRCS=
2569 < for ac_func in sem_init
2570 < do
2571 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2572 < 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
2568 > if [ "x$WANT_ESD" = "xyes" ]; then
2569 >  # Check whether --with-esd-prefix or --without-esd-prefix was given.
2570 > if test "${with_esd_prefix+set}" = set; then
2571 >  withval="$with_esd_prefix"
2572 >  esd_prefix="$withval"
2573   else
2574 <  cat > conftest.$ac_ext <<EOF
2575 < #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
2574 >  esd_prefix=""
2575 > fi
2576  
2577 < ; return 0; }
2578 < EOF
2579 < if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2580 <  rm -rf conftest*
2442 <  eval "ac_cv_func_$ac_func=yes"
2577 > # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
2578 > if test "${with_esd_exec_prefix+set}" = set; then
2579 >  withval="$with_esd_exec_prefix"
2580 >  esd_exec_prefix="$withval"
2581   else
2582 <  echo "configure: failed program was:" >&5
2445 <  cat conftest.$ac_ext >&5
2446 <  rm -rf conftest*
2447 <  eval "ac_cv_func_$ac_func=no"
2582 >  esd_exec_prefix=""
2583   fi
2584 < rm -f conftest*
2584 >
2585 > # Check whether --enable-esdtest or --disable-esdtest was given.
2586 > if test "${enable_esdtest+set}" = set; then
2587 >  enableval="$enable_esdtest"
2588 >  :
2589 > else
2590 >  enable_esdtest=yes
2591   fi
2592  
2593 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2594 <  echo "$ac_t""yes" 1>&6
2595 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2596 <  cat >> confdefs.h <<EOF
2597 < #define $ac_tr_func 1
2598 < EOF
2599 <
2593 >
2594 >  if test x$esd_exec_prefix != x ; then
2595 >     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
2596 >     if test x${ESD_CONFIG+set} != xset ; then
2597 >        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
2598 >     fi
2599 >  fi
2600 >  if test x$esd_prefix != x ; then
2601 >     esd_args="$esd_args --prefix=$esd_prefix"
2602 >     if test x${ESD_CONFIG+set} != xset ; then
2603 >        ESD_CONFIG=$esd_prefix/bin/esd-config
2604 >     fi
2605 >  fi
2606 >
2607 >  # Extract the first word of "esd-config", so it can be a program name with args.
2608 > set dummy esd-config; ac_word=$2
2609 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2610 > echo "configure:2611: checking for $ac_word" >&5
2611 > if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2612 >  echo $ac_n "(cached) $ac_c" 1>&6
2613 > else
2614 >  case "$ESD_CONFIG" in
2615 >  /*)
2616 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
2617 >  ;;
2618 >  ?:/*)                  
2619 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
2620 >  ;;
2621 >  *)
2622 >  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
2623 >  ac_dummy="$PATH"
2624 >  for ac_dir in $ac_dummy; do
2625 >    test -z "$ac_dir" && ac_dir=.
2626 >    if test -f $ac_dir/$ac_word; then
2627 >      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
2628 >      break
2629 >    fi
2630 >  done
2631 >  IFS="$ac_save_ifs"
2632 >  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
2633 >  ;;
2634 > esac
2635 > fi
2636 > ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
2637 > if test -n "$ESD_CONFIG"; then
2638 >  echo "$ac_t""$ESD_CONFIG" 1>&6
2639   else
2640    echo "$ac_t""no" 1>&6
2641   fi
2462 done
2642  
2643 < if [ "x$ac_cv_func_sem_init" = "xno" ]; then
2644 <  echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
2645 < echo "configure:2467: checking for sem_init in -lposix4" >&5
2646 < ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
2647 < if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2648 <  echo $ac_n "(cached) $ac_c" 1>&6
2643 >  min_esd_version=0.2.8
2644 >  echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2645 > echo "configure:2646: checking for ESD - version >= $min_esd_version" >&5
2646 >  no_esd=""
2647 >  if test "$ESD_CONFIG" = "no" ; then
2648 >    no_esd=yes
2649 >  else
2650 >    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
2651 >    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
2652 >
2653 >    esd_major_version=`$ESD_CONFIG $esd_args --version | \
2654 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
2655 >    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
2656 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
2657 >    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
2658 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
2659 >    if test "x$enable_esdtest" = "xyes" ; then
2660 >      ac_save_CFLAGS="$CFLAGS"
2661 >      ac_save_LIBS="$LIBS"
2662 >      CFLAGS="$CFLAGS $ESD_CFLAGS"
2663 >      LIBS="$LIBS $ESD_LIBS"
2664 >      rm -f conf.esdtest
2665 >      if test "$cross_compiling" = yes; then
2666 >  echo $ac_n "cross compiling; assumed OK... $ac_c"
2667   else
2668 <  ac_save_LIBS="$LIBS"
2669 < LIBS="-lposix4  $LIBS"
2473 < cat > conftest.$ac_ext <<EOF
2474 < #line 2475 "configure"
2668 >  cat > conftest.$ac_ext <<EOF
2669 > #line 2670 "configure"
2670   #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();
2671  
2672 < int main() {
2673 < sem_init()
2674 < ; return 0; }
2672 > #include <stdio.h>
2673 > #include <stdlib.h>
2674 > #include <string.h>
2675 > #include <esd.h>
2676 >
2677 > char*
2678 > my_strdup (char *str)
2679 > {
2680 >  char *new_str;
2681 >  
2682 >  if (str)
2683 >    {
2684 >      new_str = malloc ((strlen (str) + 1) * sizeof(char));
2685 >      strcpy (new_str, str);
2686 >    }
2687 >  else
2688 >    new_str = NULL;
2689 >  
2690 >  return new_str;
2691 > }
2692 >
2693 > int main ()
2694 > {
2695 >  int major, minor, micro;
2696 >  char *tmp_version;
2697 >
2698 >  system ("touch conf.esdtest");
2699 >
2700 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
2701 >  tmp_version = my_strdup("$min_esd_version");
2702 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
2703 >     printf("%s, bad version string\n", "$min_esd_version");
2704 >     exit(1);
2705 >   }
2706 >
2707 >   if (($esd_major_version > major) ||
2708 >      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
2709 >      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
2710 >    {
2711 >      return 0;
2712 >    }
2713 >  else
2714 >    {
2715 >      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
2716 >      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
2717 >      printf("*** best to upgrade to the required version.\n");
2718 >      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
2719 >      printf("*** to point to the correct copy of esd-config, and remove the file\n");
2720 >      printf("*** config.cache before re-running configure\n");
2721 >      return 1;
2722 >    }
2723 > }
2724 >
2725 >
2726   EOF
2727 < if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2728 <  rm -rf conftest*
2729 <  eval "ac_cv_lib_$ac_lib_var=yes"
2727 > if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2728 > then
2729 >  :
2730   else
2731    echo "configure: failed program was:" >&5
2732    cat conftest.$ac_ext >&5
2733 <  rm -rf conftest*
2734 <  eval "ac_cv_lib_$ac_lib_var=no"
2493 < fi
2494 < rm -f conftest*
2495 < LIBS="$ac_save_LIBS"
2496 <
2733 >  rm -fr conftest*
2734 >  no_esd=yes
2735   fi
2736 < 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
2736 > rm -fr conftest*
2737   fi
2738  
2739 <  if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then
2740 <        for ac_func in semget
2741 < do
2742 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2743 < echo "configure:2511: checking for $ac_func" >&5
2744 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2745 <  echo $ac_n "(cached) $ac_c" 1>&6
2746 < else
2747 <  cat > conftest.$ac_ext <<EOF
2748 < #line 2516 "configure"
2739 >       CFLAGS="$ac_save_CFLAGS"
2740 >       LIBS="$ac_save_LIBS"
2741 >     fi
2742 >  fi
2743 >  if test "x$no_esd" = x ; then
2744 >     echo "$ac_t""yes" 1>&6
2745 >    
2746 >    DEFINES="$DEFINES -DENABLE_ESD=1"
2747 >    CFLAGS="$CFLAGS $ESD_CFLAGS"
2748 >    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
2749 >    LIBS="$LIBS $ESD_LIBS"
2750 >      
2751 >  else
2752 >     echo "$ac_t""no" 1>&6
2753 >     if test "$ESD_CONFIG" = "no" ; then
2754 >       echo "*** The esd-config script installed by ESD could not be found"
2755 >       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
2756 >       echo "*** your path, or set the ESD_CONFIG environment variable to the"
2757 >       echo "*** full path to esd-config."
2758 >     else
2759 >       if test -f conf.esdtest ; then
2760 >        :
2761 >       else
2762 >          echo "*** Could not run ESD test program, checking why..."
2763 >          CFLAGS="$CFLAGS $ESD_CFLAGS"
2764 >          LIBS="$LIBS $ESD_LIBS"
2765 >          cat > conftest.$ac_ext <<EOF
2766 > #line 2767 "configure"
2767   #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() {
2768  
2769 < /* The GNU C library defines this for functions which it implements
2770 <    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
2769 > #include <stdio.h>
2770 > #include <esd.h>
2771  
2772 + int main() {
2773 + return 0;
2774   ; return 0; }
2775   EOF
2776 < if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2776 > if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2777    rm -rf conftest*
2778 <  eval "ac_cv_func_$ac_func=yes"
2778 >   echo "*** The test program compiled, but did not run. This usually means"
2779 >          echo "*** that the run-time linker is not finding ESD or finding the wrong"
2780 >          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
2781 >          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2782 >          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
2783 >          echo "*** is required on your system"
2784 >          echo "***"
2785 >          echo "*** If you have an old version installed, it is best to remove it, although"
2786 >          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
2787   else
2788    echo "configure: failed program was:" >&5
2789    cat conftest.$ac_ext >&5
2790    rm -rf conftest*
2791 <  eval "ac_cv_func_$ac_func=no"
2791 >   echo "*** The test program failed to compile or link. See the file config.log for the"
2792 >          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
2793 >          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
2794 >          echo "*** may want to edit the esd-config script: $ESD_CONFIG"
2795   fi
2796   rm -f conftest*
2797 < fi
2798 <
2799 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2800 <  echo "$ac_t""yes" 1>&6
2801 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2802 <  cat >> confdefs.h <<EOF
2803 < #define $ac_tr_func 1
2804 < EOF
2805 <
2806 < 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"
2797 >          CFLAGS="$ac_save_CFLAGS"
2798 >          LIBS="$ac_save_LIBS"
2799 >       fi
2800 >     fi
2801 >     ESD_CFLAGS=""
2802 >     ESD_LIBS=""
2803 >    
2804 >    echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
2805 >    WANT_ESD=no
2806 >  
2807    fi
2808 +  
2809 +  
2810 +  rm -f conf.esdtest
2811 +
2812   fi
2813  
2814   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2815 < echo "configure:2574: checking for ANSI C header files" >&5
2815 > echo "configure:2816: checking for ANSI C header files" >&5
2816   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2817    echo $ac_n "(cached) $ac_c" 1>&6
2818   else
2819    cat > conftest.$ac_ext <<EOF
2820 < #line 2579 "configure"
2820 > #line 2821 "configure"
2821   #include "confdefs.h"
2822   #include <stdlib.h>
2823   #include <stdarg.h>
# Line 2583 | Line 2825 | else
2825   #include <float.h>
2826   EOF
2827   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2828 < { (eval echo configure:2587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2828 > { (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2829   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2830   if test -z "$ac_err"; then
2831    rm -rf conftest*
# Line 2600 | Line 2842 | rm -f conftest*
2842   if test $ac_cv_header_stdc = yes; then
2843    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2844   cat > conftest.$ac_ext <<EOF
2845 < #line 2604 "configure"
2845 > #line 2846 "configure"
2846   #include "confdefs.h"
2847   #include <string.h>
2848   EOF
# Line 2618 | Line 2860 | fi
2860   if test $ac_cv_header_stdc = yes; then
2861    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2862   cat > conftest.$ac_ext <<EOF
2863 < #line 2622 "configure"
2863 > #line 2864 "configure"
2864   #include "confdefs.h"
2865   #include <stdlib.h>
2866   EOF
# Line 2639 | Line 2881 | if test "$cross_compiling" = yes; then
2881    :
2882   else
2883    cat > conftest.$ac_ext <<EOF
2884 < #line 2643 "configure"
2884 > #line 2885 "configure"
2885   #include "confdefs.h"
2886   #include <ctype.h>
2887   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2650 | Line 2892 | if (XOR (islower (i), ISLOWER (i)) || to
2892   exit (0); }
2893  
2894   EOF
2895 < if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2895 > if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2896   then
2897    :
2898   else
# Line 2677 | Line 2919 | for ac_hdr in unistd.h fcntl.h sys/time.
2919   do
2920   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2921   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2922 < echo "configure:2681: checking for $ac_hdr" >&5
2922 > echo "configure:2923: checking for $ac_hdr" >&5
2923   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2924    echo $ac_n "(cached) $ac_c" 1>&6
2925   else
2926    cat > conftest.$ac_ext <<EOF
2927 < #line 2686 "configure"
2927 > #line 2928 "configure"
2928   #include "confdefs.h"
2929   #include <$ac_hdr>
2930   EOF
2931   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2932 < { (eval echo configure:2691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2932 > { (eval echo configure:2933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2933   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2934   if test -z "$ac_err"; then
2935    rm -rf conftest*
# Line 2715 | Line 2957 | done
2957  
2958  
2959   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
2960 < echo "configure:2719: checking whether byte ordering is bigendian" >&5
2960 > echo "configure:2961: checking whether byte ordering is bigendian" >&5
2961   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
2962    echo $ac_n "(cached) $ac_c" 1>&6
2963   else
2964    ac_cv_c_bigendian=unknown
2965   # See if sys/param.h defines the BYTE_ORDER macro.
2966   cat > conftest.$ac_ext <<EOF
2967 < #line 2726 "configure"
2967 > #line 2968 "configure"
2968   #include "confdefs.h"
2969   #include <sys/types.h>
2970   #include <sys/param.h>
# Line 2733 | Line 2975 | int main() {
2975   #endif
2976   ; return 0; }
2977   EOF
2978 < if { (eval echo configure:2737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2978 > if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2979    rm -rf conftest*
2980    # It does; now see whether it defined to BIG_ENDIAN or not.
2981   cat > conftest.$ac_ext <<EOF
2982 < #line 2741 "configure"
2982 > #line 2983 "configure"
2983   #include "confdefs.h"
2984   #include <sys/types.h>
2985   #include <sys/param.h>
# Line 2748 | Line 2990 | int main() {
2990   #endif
2991   ; return 0; }
2992   EOF
2993 < if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2993 > if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2994    rm -rf conftest*
2995    ac_cv_c_bigendian=yes
2996   else
# Line 2768 | Line 3010 | if test "$cross_compiling" = yes; then
3010      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3011   else
3012    cat > conftest.$ac_ext <<EOF
3013 < #line 2772 "configure"
3013 > #line 3014 "configure"
3014   #include "confdefs.h"
3015   main () {
3016    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 2781 | Line 3023 | main () {
3023    exit (u.c[sizeof (long) - 1] == 1);
3024   }
3025   EOF
3026 < if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3026 > if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3027   then
3028    ac_cv_c_bigendian=no
3029   else
# Line 2805 | Line 3047 | EOF
3047   fi
3048  
3049   echo $ac_n "checking for working const""... $ac_c" 1>&6
3050 < echo "configure:2809: checking for working const" >&5
3050 > echo "configure:3051: checking for working const" >&5
3051   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3052    echo $ac_n "(cached) $ac_c" 1>&6
3053   else
3054    cat > conftest.$ac_ext <<EOF
3055 < #line 2814 "configure"
3055 > #line 3056 "configure"
3056   #include "confdefs.h"
3057  
3058   int main() {
# Line 2859 | Line 3101 | ccp = (char const *const *) p;
3101  
3102   ; return 0; }
3103   EOF
3104 < if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3104 > if { (eval echo configure:3105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3105    rm -rf conftest*
3106    ac_cv_c_const=yes
3107   else
# Line 2880 | Line 3122 | EOF
3122   fi
3123  
3124   echo $ac_n "checking for inline""... $ac_c" 1>&6
3125 < echo "configure:2884: checking for inline" >&5
3125 > echo "configure:3126: checking for inline" >&5
3126   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3127    echo $ac_n "(cached) $ac_c" 1>&6
3128   else
3129    ac_cv_c_inline=no
3130   for ac_kw in inline __inline__ __inline; do
3131    cat > conftest.$ac_ext <<EOF
3132 < #line 2891 "configure"
3132 > #line 3133 "configure"
3133   #include "confdefs.h"
3134  
3135   int main() {
3136   } $ac_kw foo() {
3137   ; return 0; }
3138   EOF
3139 < if { (eval echo configure:2898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3139 > if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3140    rm -rf conftest*
3141    ac_cv_c_inline=$ac_kw; break
3142   else
# Line 2920 | Line 3162 | EOF
3162   esac
3163  
3164   echo $ac_n "checking size of short""... $ac_c" 1>&6
3165 < echo "configure:2924: checking size of short" >&5
3165 > echo "configure:3166: checking size of short" >&5
3166   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3167    echo $ac_n "(cached) $ac_c" 1>&6
3168   else
# Line 2928 | Line 3170 | else
3170    ac_cv_sizeof_short=2
3171   else
3172    cat > conftest.$ac_ext <<EOF
3173 < #line 2932 "configure"
3173 > #line 3174 "configure"
3174   #include "confdefs.h"
3175   #include <stdio.h>
3176   main()
# Line 2939 | Line 3181 | main()
3181    exit(0);
3182   }
3183   EOF
3184 < if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3184 > if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3185   then
3186    ac_cv_sizeof_short=`cat conftestval`
3187   else
# Line 2959 | Line 3201 | EOF
3201  
3202  
3203   echo $ac_n "checking size of int""... $ac_c" 1>&6
3204 < echo "configure:2963: checking size of int" >&5
3204 > echo "configure:3205: checking size of int" >&5
3205   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3206    echo $ac_n "(cached) $ac_c" 1>&6
3207   else
# Line 2967 | Line 3209 | else
3209    ac_cv_sizeof_int=4
3210   else
3211    cat > conftest.$ac_ext <<EOF
3212 < #line 2971 "configure"
3212 > #line 3213 "configure"
3213   #include "confdefs.h"
3214   #include <stdio.h>
3215   main()
# Line 2978 | Line 3220 | main()
3220    exit(0);
3221   }
3222   EOF
3223 < if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3223 > if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3224   then
3225    ac_cv_sizeof_int=`cat conftestval`
3226   else
# Line 2998 | Line 3240 | EOF
3240  
3241  
3242   echo $ac_n "checking size of long""... $ac_c" 1>&6
3243 < echo "configure:3002: checking size of long" >&5
3243 > echo "configure:3244: checking size of long" >&5
3244   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3245    echo $ac_n "(cached) $ac_c" 1>&6
3246   else
# Line 3006 | Line 3248 | else
3248    ac_cv_sizeof_long=4
3249   else
3250    cat > conftest.$ac_ext <<EOF
3251 < #line 3010 "configure"
3251 > #line 3252 "configure"
3252   #include "confdefs.h"
3253   #include <stdio.h>
3254   main()
# Line 3017 | Line 3259 | main()
3259    exit(0);
3260   }
3261   EOF
3262 < if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3262 > if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3263   then
3264    ac_cv_sizeof_long=`cat conftestval`
3265   else
# Line 3037 | Line 3279 | EOF
3279  
3280  
3281   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3282 < echo "configure:3041: checking size of long long" >&5
3282 > echo "configure:3283: checking size of long long" >&5
3283   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3284    echo $ac_n "(cached) $ac_c" 1>&6
3285   else
# Line 3045 | Line 3287 | else
3287    ac_cv_sizeof_long_long=8
3288   else
3289    cat > conftest.$ac_ext <<EOF
3290 < #line 3049 "configure"
3290 > #line 3291 "configure"
3291   #include "confdefs.h"
3292   #include <stdio.h>
3293   main()
# Line 3056 | Line 3298 | main()
3298    exit(0);
3299   }
3300   EOF
3301 < if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3301 > if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3302   then
3303    ac_cv_sizeof_long_long=`cat conftestval`
3304   else
# Line 3076 | Line 3318 | EOF
3318  
3319  
3320   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3321 < echo "configure:3080: checking for off_t" >&5
3321 > echo "configure:3322: checking for off_t" >&5
3322   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3323    echo $ac_n "(cached) $ac_c" 1>&6
3324   else
3325    cat > conftest.$ac_ext <<EOF
3326 < #line 3085 "configure"
3326 > #line 3327 "configure"
3327   #include "confdefs.h"
3328   #include <sys/types.h>
3329   #if STDC_HEADERS
# Line 3109 | Line 3351 | EOF
3351   fi
3352  
3353   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3354 < echo "configure:3113: checking for loff_t" >&5
3354 > echo "configure:3355: checking for loff_t" >&5
3355   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3356    echo $ac_n "(cached) $ac_c" 1>&6
3357   else
3358    cat > conftest.$ac_ext <<EOF
3359 < #line 3118 "configure"
3359 > #line 3360 "configure"
3360   #include "confdefs.h"
3361   #include <sys/types.h>
3362   #if STDC_HEADERS
# Line 3142 | Line 3384 | EOF
3384   fi
3385  
3386   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3387 < echo "configure:3146: checking for size_t" >&5
3387 > echo "configure:3388: checking for size_t" >&5
3388   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3389    echo $ac_n "(cached) $ac_c" 1>&6
3390   else
3391    cat > conftest.$ac_ext <<EOF
3392 < #line 3151 "configure"
3392 > #line 3393 "configure"
3393   #include "confdefs.h"
3394   #include <sys/types.h>
3395   #if STDC_HEADERS
# Line 3175 | Line 3417 | EOF
3417   fi
3418  
3419   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3420 < echo "configure:3179: checking whether time.h and sys/time.h may both be included" >&5
3420 > echo "configure:3421: checking whether time.h and sys/time.h may both be included" >&5
3421   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3422    echo $ac_n "(cached) $ac_c" 1>&6
3423   else
3424    cat > conftest.$ac_ext <<EOF
3425 < #line 3184 "configure"
3425 > #line 3426 "configure"
3426   #include "confdefs.h"
3427   #include <sys/types.h>
3428   #include <sys/time.h>
# Line 3189 | Line 3431 | int main() {
3431   struct tm *tp;
3432   ; return 0; }
3433   EOF
3434 < if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3434 > if { (eval echo configure:3435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3435    rm -rf conftest*
3436    ac_cv_header_time=yes
3437   else
# Line 3210 | Line 3452 | EOF
3452   fi
3453  
3454   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3455 < echo "configure:3214: checking whether struct tm is in sys/time.h or time.h" >&5
3455 > echo "configure:3456: checking whether struct tm is in sys/time.h or time.h" >&5
3456   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3457    echo $ac_n "(cached) $ac_c" 1>&6
3458   else
3459    cat > conftest.$ac_ext <<EOF
3460 < #line 3219 "configure"
3460 > #line 3461 "configure"
3461   #include "confdefs.h"
3462   #include <sys/types.h>
3463   #include <time.h>
# Line 3223 | Line 3465 | int main() {
3465   struct tm *tp; tp->tm_sec;
3466   ; return 0; }
3467   EOF
3468 < if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3468 > if { (eval echo configure:3469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3469    rm -rf conftest*
3470    ac_cv_struct_tm=time.h
3471   else
# Line 3247 | Line 3489 | fi
3489   for ac_func in strdup cfmakeraw
3490   do
3491   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3492 < echo "configure:3251: checking for $ac_func" >&5
3492 > echo "configure:3493: checking for $ac_func" >&5
3493   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3494    echo $ac_n "(cached) $ac_c" 1>&6
3495   else
3496    cat > conftest.$ac_ext <<EOF
3497 < #line 3256 "configure"
3497 > #line 3498 "configure"
3498   #include "confdefs.h"
3499   /* System header to define __stub macros and hopefully few prototypes,
3500      which can conflict with char $ac_func(); below.  */
# Line 3275 | Line 3517 | $ac_func();
3517  
3518   ; return 0; }
3519   EOF
3520 < if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3520 > if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3521    rm -rf conftest*
3522    eval "ac_cv_func_$ac_func=yes"
3523   else
# Line 3302 | Line 3544 | done
3544   for ac_func in nanosleep clock_gettime timer_create
3545   do
3546   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3547 < echo "configure:3306: checking for $ac_func" >&5
3547 > echo "configure:3548: checking for $ac_func" >&5
3548   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3549    echo $ac_n "(cached) $ac_c" 1>&6
3550   else
3551    cat > conftest.$ac_ext <<EOF
3552 < #line 3311 "configure"
3552 > #line 3553 "configure"
3553   #include "confdefs.h"
3554   /* System header to define __stub macros and hopefully few prototypes,
3555      which can conflict with char $ac_func(); below.  */
# Line 3330 | Line 3572 | $ac_func();
3572  
3573   ; return 0; }
3574   EOF
3575 < if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3575 > if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3576 >  rm -rf conftest*
3577 >  eval "ac_cv_func_$ac_func=yes"
3578 > else
3579 >  echo "configure: failed program was:" >&5
3580 >  cat conftest.$ac_ext >&5
3581 >  rm -rf conftest*
3582 >  eval "ac_cv_func_$ac_func=no"
3583 > fi
3584 > rm -f conftest*
3585 > fi
3586 >
3587 > if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
3588 >  echo "$ac_t""yes" 1>&6
3589 >    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3590 >  cat >> confdefs.h <<EOF
3591 > #define $ac_tr_func 1
3592 > EOF
3593 >
3594 > else
3595 >  echo "$ac_t""no" 1>&6
3596 > fi
3597 > done
3598 >
3599 > for ac_func in pthread_cancel
3600 > do
3601 > echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3602 > echo "configure:3603: checking for $ac_func" >&5
3603 > if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3604 >  echo $ac_n "(cached) $ac_c" 1>&6
3605 > else
3606 >  cat > conftest.$ac_ext <<EOF
3607 > #line 3608 "configure"
3608 > #include "confdefs.h"
3609 > /* System header to define __stub macros and hopefully few prototypes,
3610 >    which can conflict with char $ac_func(); below.  */
3611 > #include <assert.h>
3612 > /* Override any gcc2 internal prototype to avoid an error.  */
3613 > /* We use char because int might match the return type of a gcc2
3614 >    builtin and then its argument prototype would still apply.  */
3615 > char $ac_func();
3616 >
3617 > int main() {
3618 >
3619 > /* The GNU C library defines this for functions which it implements
3620 >    to always fail with ENOSYS.  Some functions are actually named
3621 >    something starting with __ and the normal name is an alias.  */
3622 > #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
3623 > choke me
3624 > #else
3625 > $ac_func();
3626 > #endif
3627 >
3628 > ; return 0; }
3629 > EOF
3630 > if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3631    rm -rf conftest*
3632    eval "ac_cv_func_$ac_func=yes"
3633   else
# Line 3359 | Line 3656 | SYSSRCS="../dummy/ether_dummy.cpp ../dum
3656   if MACHINE=`uname -a 2>/dev/null`; then
3657    case "$MACHINE" in
3658    Linux*)
3659 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp"
3659 >    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
3660      ;;
3661    FreeBSD*3.*)
3662          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3663 < echo "configure:3367: checking for cam_open_btl in -lcam" >&5
3663 > echo "configure:3664: checking for cam_open_btl in -lcam" >&5
3664   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3665   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3666    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3371 | Line 3668 | else
3668    ac_save_LIBS="$LIBS"
3669   LIBS="-lcam  $LIBS"
3670   cat > conftest.$ac_ext <<EOF
3671 < #line 3375 "configure"
3671 > #line 3672 "configure"
3672   #include "confdefs.h"
3673   /* Override any gcc2 internal prototype to avoid an error.  */
3674   /* We use char because int might match the return type of a gcc2
# Line 3382 | Line 3679 | int main() {
3679   cam_open_btl()
3680   ; return 0; }
3681   EOF
3682 < if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3682 > if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3683    rm -rf conftest*
3684    eval "ac_cv_lib_$ac_lib_var=yes"
3685   else
# Line 3408 | Line 3705 | fi
3705      else
3706              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3707   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3708 < echo "configure:3412: checking for /sys/cam/cam.h" >&5
3708 > echo "configure:3709: checking for /sys/cam/cam.h" >&5
3709   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3710    echo $ac_n "(cached) $ac_c" 1>&6
3711   else
3712    cat > conftest.$ac_ext <<EOF
3713 < #line 3417 "configure"
3713 > #line 3714 "configure"
3714   #include "confdefs.h"
3715   #include </sys/cam/cam.h>
3716   EOF
3717   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3718 < { (eval echo configure:3422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3718 > { (eval echo configure:3719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3719   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3720   if test -z "$ac_err"; then
3721    rm -rf conftest*
# Line 3442 | Line 3739 | fi
3739        if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then
3740                          { echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; }
3741        fi
3742 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3742 >      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
3743        CXXFLAGS="$CXXFLAGS -I/sys"
3744        CFLAGS="$CFLAGS -I/sys"
3745        LIBS="$LIBS -lcam"
# Line 3451 | Line 3748 | fi
3748      ;;
3749    FreeBSD*)
3750          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3751 < echo "configure:3455: checking for scsi_open in -lscsi" >&5
3751 > echo "configure:3752: checking for scsi_open in -lscsi" >&5
3752   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3753   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3754    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3459 | Line 3756 | else
3756    ac_save_LIBS="$LIBS"
3757   LIBS="-lscsi  $LIBS"
3758   cat > conftest.$ac_ext <<EOF
3759 < #line 3463 "configure"
3759 > #line 3760 "configure"
3760   #include "confdefs.h"
3761   /* Override any gcc2 internal prototype to avoid an error.  */
3762   /* We use char because int might match the return type of a gcc2
# Line 3470 | Line 3767 | int main() {
3767   scsi_open()
3768   ; return 0; }
3769   EOF
3770 < if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3770 > if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3771    rm -rf conftest*
3772    eval "ac_cv_lib_$ac_lib_var=yes"
3773   else
# Line 3496 | Line 3793 | fi
3793      else
3794              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3795   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3796 < echo "configure:3500: checking for scsi.h sys/scsiio.h" >&5
3796 > echo "configure:3797: checking for scsi.h sys/scsiio.h" >&5
3797   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3798    echo $ac_n "(cached) $ac_c" 1>&6
3799   else
3800    cat > conftest.$ac_ext <<EOF
3801 < #line 3505 "configure"
3801 > #line 3802 "configure"
3802   #include "confdefs.h"
3803   #include <scsi.h sys/scsiio.h>
3804   EOF
3805   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3806 < { (eval echo configure:3510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3806 > { (eval echo configure:3807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3807   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3808   if test -z "$ac_err"; then
3809    rm -rf conftest*
# Line 3545 | Line 3842 | fi
3842      LIBS="$LIBS -lm"
3843      ;;
3844    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"
3845   fi
3846 <
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"
3846 > SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
3847  
3848   HAVE_I386=no
3849   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
3850 < echo "configure:3564: checking for x86 target CPU" >&5
3850 > echo "configure:3851: checking for x86 target CPU" >&5
3851   cat > conftest.$ac_ext <<EOF
3852 < #line 3566 "configure"
3852 > #line 3853 "configure"
3853   #include "confdefs.h"
3854  
3855   #ifdef __i386__
# Line 3581 | Line 3868 | fi
3868   rm -f conftest*
3869  
3870  
3871 + HAVE_SPARC=no
3872 + echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
3873 + echo "configure:3874: checking for SPARC target CPU" >&5
3874 + cat > conftest.$ac_ext <<EOF
3875 + #line 3876 "configure"
3876 + #include "confdefs.h"
3877 +
3878 + #ifdef __sparc__
3879 +  yes
3880 + #endif
3881 +
3882 + EOF
3883 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3884 +  egrep "yes" >/dev/null 2>&1; then
3885 +  rm -rf conftest*
3886 +  echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes
3887 + else
3888 +  rm -rf conftest*
3889 +  echo "$ac_t""no" 1>&6
3890 + fi
3891 + rm -f conftest*
3892 +
3893 +
3894   HAVE_GAS=no
3895   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
3896 < echo "configure:3587: checking for GAS .p2align feature" >&5
3896 > echo "configure:3897: checking for GAS .p2align feature" >&5
3897   cat >conftest.S << EOF
3898          .text
3899          .p2align 5
# Line 3593 | Line 3903 | echo "$ac_t""$HAVE_GAS" 1>&6
3903  
3904   HAVE_GCC27=no
3905   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
3906 < echo "configure:3597: checking for GCC 2.7 or higher" >&5
3906 > echo "configure:3907: checking for GCC 2.7 or higher" >&5
3907   cat > conftest.$ac_ext <<EOF
3908 < #line 3599 "configure"
3908 > #line 3909 "configure"
3909   #include "confdefs.h"
3910   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
3911    yes
# Line 3618 | Line 3928 | if [ "x$HAVE_GCC27" = "xyes" ]; then
3928    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
3929   fi
3930  
3931 + WANT_X86_ASSEMBLY=no
3932 + WANT_SPARC_V8_ASSEMBLY=no
3933 + WANT_SPARC_V9_ASSEMBLY=no
3934 + CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
3935   if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
3936 <  DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
3936 >    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
3937    if [ "x$HAVE_GAS" = "xyes" ]; then
3938 +    WANT_X86_ASSEMBLY=yes
3939      DEFINES="$DEFINES -DX86_ASSEMBLY"
3940 <    CPUSRCS="$CPUSRCS cpufast.s"
3626 <  else
3627 <    CPUSRCS="$CPUSRCS cpuemu.cpp"
3940 >    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
3941    fi
3942 < else
3943 <  CPUSRCS="$CPUSRCS cpuemu.cpp"
3942 > elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
3943 >    case "$MACHINE" in
3944 >  SunOS*)
3945 >    echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
3946 > echo "configure:3947: checking SPARC CPU architecture" >&5
3947 >    SPARC_TYPE=`Solaris/which_sparc`
3948 >    echo "$ac_t""$SPARC_TYPE" 1>&6
3949 >    case "$SPARC_TYPE" in
3950 >    SPARC_V8)
3951 >      WANT_SPARC_V8_ASSEMBLY=yes
3952 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
3953 >      CFLAGS="$CFLAGS -Wa,-Av8"
3954 >      CXXFLAGS="$CXXFLAGS -Wa,-Av8"
3955 >      ;;
3956 >    SPARC_V9)
3957 >      WANT_SPARC_V9_ASSEMBLY=yes
3958 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
3959 >      CFLAGS="$CFLAGS -Wa,-Av9"
3960 >      CXXFLAGS="$CXXFLAGS -Wa,-Av9"
3961 >      ;;
3962 >    esac
3963 >    ;;
3964 >  esac
3965   fi
3966  
3967 + CPUINCLUDES="-I../uae_cpu"
3968 + 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"
3969  
3970  
3971  
# Line 3769 | Line 4105 | s%@oldincludedir@%$oldincludedir%g
4105   s%@infodir@%$infodir%g
4106   s%@mandir@%$mandir%g
4107   s%@CC@%$CC%g
3772 s%@CXX@%$CXX%g
4108   s%@CPP@%$CPP%g
4109 + s%@CXX@%$CXX%g
4110   s%@SET_MAKE@%$SET_MAKE%g
4111   s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
4112   s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
# Line 3782 | Line 4118 | s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
4118   s%@GTK_CONFIG@%$GTK_CONFIG%g
4119   s%@GTK_CFLAGS@%$GTK_CFLAGS%g
4120   s%@GTK_LIBS@%$GTK_LIBS%g
4121 + s%@ESD_CONFIG@%$ESD_CONFIG%g
4122 + s%@ESD_CFLAGS@%$ESD_CFLAGS%g
4123 + s%@ESD_LIBS@%$ESD_LIBS%g
4124   s%@DEFINES@%$DEFINES%g
3786 s%@STATICLIBS@%$STATICLIBS%g
4125   s%@SYSSRCS@%$SYSSRCS%g
4126   s%@CPUINCLUDES@%$CPUINCLUDES%g
4127   s%@CPUSRCS@%$CPUSRCS%g
# Line 4006 | Line 4344 | chmod +x $CONFIG_STATUS
4344   rm -fr confdefs* $ac_clean_files
4345   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
4346  
4347 +
4348 + echo
4349 + echo Basilisk II configuration summary:
4350 + echo
4351 + echo XFree86 DGA support .............. : $WANT_XF86_DGA
4352 + echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4353 + echo ESD sound support ................ : $WANT_ESD
4354 + echo GTK user interface ............... : $WANT_UI
4355 + echo mon debugger support ............. : $WANT_MON
4356 + echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4357 + echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
4358 + echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
4359 + echo
4360   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines