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.16 by cebix, 1999-11-03T21:04:14Z

# Line 12 | Line 12 | ac_help=
12   ac_default_prefix=/usr/local
13   # Any additions from configure.in:
14   ac_help="$ac_help
15 <  --enable-dga            use the DGA extension (default)"
15 >  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]"
16   ac_help="$ac_help
17 <  --enable-ui             use GTK user interface (default)"
17 >  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]"
18 > ac_help="$ac_help
19 >  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]"
20 > ac_help="$ac_help
21 >  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]"
22 > ac_help="$ac_help
23 >  --with-gtk              use GTK user interface [default=yes]"
24 > ac_help="$ac_help
25 >  --with-mon              use mon as debugger [default=yes]"
26   ac_help="$ac_help
27    --with-x                use the X Window System"
28   ac_help="$ac_help
# Line 23 | Line 31 | ac_help="$ac_help
31    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
32   ac_help="$ac_help
33    --disable-gtktest       Do not try to compile and run a test GTK program"
34 + ac_help="$ac_help
35 +  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)"
36 + ac_help="$ac_help
37 +  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
38 + ac_help="$ac_help
39 +  --disable-esdtest       Do not try to compile and run a test ESD program"
40  
41   # Initialize some variables set by options.
42   # The variables have the same names as the options, with
# Line 536 | Line 550 | fi
550  
551  
552  
553 < WANT_DGA=yes
554 < WANT_UI=yes
555 < # Check whether --enable-dga or --disable-dga was given.
556 < if test "${enable_dga+set}" = set; then
557 <  enableval="$enable_dga"
558 <  WANT_DGA=$enableval
553 > # Check whether --enable-xf86-dga or --disable-xf86-dga was given.
554 > if test "${enable_xf86_dga+set}" = set; then
555 >  enableval="$enable_xf86_dga"
556 >  WANT_XF86_DGA=$enableval
557 > else
558 >  WANT_XF86_DGA=yes
559 > fi
560 >
561 > # Check whether --enable-xf86-vidmode or --disable-xf86-vidmode was given.
562 > if test "${enable_xf86_vidmode+set}" = set; then
563 >  enableval="$enable_xf86_vidmode"
564 >  WANT_XF86_VIDMODE=$enableval
565 > else
566 >  WANT_XF86_VIDMODE=yes
567 > fi
568 >
569 > # Check whether --enable-fbdev-dga or --disable-fbdev-dga was given.
570 > if test "${enable_fbdev_dga+set}" = set; then
571 >  enableval="$enable_fbdev_dga"
572 >  WANT_FBDEV_DGA=$enableval
573 > else
574 >  WANT_FBDEV_DGA=yes
575 > fi
576 >
577 > # Check whether --with-esd or --without-esd was given.
578 > if test "${with_esd+set}" = set; then
579 >  withval="$with_esd"
580 >  WANT_ESD=$withval
581 > else
582 >  WANT_ESD=yes
583 > fi
584 >
585 > # Check whether --with-gtk or --without-gtk was given.
586 > if test "${with_gtk+set}" = set; then
587 >  withval="$with_gtk"
588 >  WANT_GTK=$withval
589 > else
590 >  WANT_GTK=yes
591   fi
592  
593 < # Check whether --enable-ui or --disable-ui was given.
594 < if test "${enable_ui+set}" = set; then
595 <  enableval="$enable_ui"
596 <  WANT_UI=$enableval
593 > # Check whether --with-mon or --without-mon was given.
594 > if test "${with_mon+set}" = set; then
595 >  withval="$with_mon"
596 >  WANT_MON=$withval
597 > else
598 >  WANT_MON=yes
599   fi
600  
601  
602   # Extract the first word of "gcc", so it can be a program name with args.
603   set dummy gcc; ac_word=$2
604   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
605 < echo "configure:558: checking for $ac_word" >&5
605 > echo "configure:606: checking for $ac_word" >&5
606   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
607    echo $ac_n "(cached) $ac_c" 1>&6
608   else
# Line 584 | Line 632 | if test -z "$CC"; then
632    # Extract the first word of "cc", so it can be a program name with args.
633   set dummy cc; ac_word=$2
634   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
635 < echo "configure:588: checking for $ac_word" >&5
635 > echo "configure:636: checking for $ac_word" >&5
636   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
637    echo $ac_n "(cached) $ac_c" 1>&6
638   else
# Line 635 | Line 683 | fi
683        # Extract the first word of "cl", so it can be a program name with args.
684   set dummy cl; ac_word=$2
685   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
686 < echo "configure:639: checking for $ac_word" >&5
686 > echo "configure:687: checking for $ac_word" >&5
687   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
688    echo $ac_n "(cached) $ac_c" 1>&6
689   else
# Line 667 | Line 715 | fi
715   fi
716  
717   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
718 < echo "configure:671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
718 > echo "configure:719: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
719  
720   ac_ext=c
721   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 678 | Line 726 | cross_compiling=$ac_cv_prog_cc_cross
726  
727   cat > conftest.$ac_ext << EOF
728  
729 < #line 682 "configure"
729 > #line 730 "configure"
730   #include "confdefs.h"
731  
732   main(){return(0);}
733   EOF
734 < if { (eval echo configure:687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
734 > if { (eval echo configure:735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
735    ac_cv_prog_cc_works=yes
736    # If we can't run a trivial program, we are probably using a cross compiler.
737    if (./conftest; exit) 2>/dev/null; then
# Line 709 | Line 757 | if test $ac_cv_prog_cc_works = no; then
757    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
758   fi
759   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
760 < echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
760 > echo "configure:761: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
761   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
762   cross_compiling=$ac_cv_prog_cc_cross
763  
764   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
765 < echo "configure:718: checking whether we are using GNU C" >&5
765 > echo "configure:766: checking whether we are using GNU C" >&5
766   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
767    echo $ac_n "(cached) $ac_c" 1>&6
768   else
# Line 723 | Line 771 | else
771    yes;
772   #endif
773   EOF
774 < 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
774 > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
775    ac_cv_prog_gcc=yes
776   else
777    ac_cv_prog_gcc=no
# Line 742 | Line 790 | ac_test_CFLAGS="${CFLAGS+set}"
790   ac_save_CFLAGS="$CFLAGS"
791   CFLAGS=
792   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
793 < echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
793 > echo "configure:794: checking whether ${CC-cc} accepts -g" >&5
794   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
795    echo $ac_n "(cached) $ac_c" 1>&6
796   else
# Line 773 | Line 821 | else
821    fi
822   fi
823  
824 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
825 + echo "configure:826: checking how to run the C preprocessor" >&5
826 + # On Suns, sometimes $CPP names a directory.
827 + if test -n "$CPP" && test -d "$CPP"; then
828 +  CPP=
829 + fi
830 + if test -z "$CPP"; then
831 + if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
832 +  echo $ac_n "(cached) $ac_c" 1>&6
833 + else
834 +    # This must be in double quotes, not single quotes, because CPP may get
835 +  # substituted into the Makefile and "${CC-cc}" will confuse make.
836 +  CPP="${CC-cc} -E"
837 +  # On the NeXT, cc -E runs the code through the compiler's parser,
838 +  # not just through cpp.
839 +  cat > conftest.$ac_ext <<EOF
840 + #line 841 "configure"
841 + #include "confdefs.h"
842 + #include <assert.h>
843 + Syntax Error
844 + EOF
845 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
846 + { (eval echo configure:847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
847 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
848 + if test -z "$ac_err"; then
849 +  :
850 + else
851 +  echo "$ac_err" >&5
852 +  echo "configure: failed program was:" >&5
853 +  cat conftest.$ac_ext >&5
854 +  rm -rf conftest*
855 +  CPP="${CC-cc} -E -traditional-cpp"
856 +  cat > conftest.$ac_ext <<EOF
857 + #line 858 "configure"
858 + #include "confdefs.h"
859 + #include <assert.h>
860 + Syntax Error
861 + EOF
862 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
863 + { (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
864 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
865 + if test -z "$ac_err"; then
866 +  :
867 + else
868 +  echo "$ac_err" >&5
869 +  echo "configure: failed program was:" >&5
870 +  cat conftest.$ac_ext >&5
871 +  rm -rf conftest*
872 +  CPP="${CC-cc} -nologo -E"
873 +  cat > conftest.$ac_ext <<EOF
874 + #line 875 "configure"
875 + #include "confdefs.h"
876 + #include <assert.h>
877 + Syntax Error
878 + EOF
879 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
880 + { (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
881 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
882 + if test -z "$ac_err"; then
883 +  :
884 + else
885 +  echo "$ac_err" >&5
886 +  echo "configure: failed program was:" >&5
887 +  cat conftest.$ac_ext >&5
888 +  rm -rf conftest*
889 +  CPP=/lib/cpp
890 + fi
891 + rm -f conftest*
892 + fi
893 + rm -f conftest*
894 + fi
895 + rm -f conftest*
896 +  ac_cv_prog_CPP="$CPP"
897 + fi
898 +  CPP="$ac_cv_prog_CPP"
899 + else
900 +  ac_cv_prog_CPP="$CPP"
901 + fi
902 + echo "$ac_t""$CPP" 1>&6
903 +
904   for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
905   do
906   # Extract the first word of "$ac_prog", so it can be a program name with args.
907   set dummy $ac_prog; ac_word=$2
908   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
909 < echo "configure:782: checking for $ac_word" >&5
909 > echo "configure:910: checking for $ac_word" >&5
910   if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
911    echo $ac_n "(cached) $ac_c" 1>&6
912   else
# Line 810 | Line 938 | test -n "$CXX" || CXX="gcc"
938  
939  
940   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
941 < echo "configure:814: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
941 > echo "configure:942: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
942  
943   ac_ext=C
944   # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 821 | Line 949 | cross_compiling=$ac_cv_prog_cxx_cross
949  
950   cat > conftest.$ac_ext << EOF
951  
952 < #line 825 "configure"
952 > #line 953 "configure"
953   #include "confdefs.h"
954  
955   int main(){return(0);}
956   EOF
957 < if { (eval echo configure:830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
957 > if { (eval echo configure:958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
958    ac_cv_prog_cxx_works=yes
959    # If we can't run a trivial program, we are probably using a cross compiler.
960    if (./conftest; exit) 2>/dev/null; then
# Line 852 | Line 980 | if test $ac_cv_prog_cxx_works = no; then
980    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
981   fi
982   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
983 < echo "configure:856: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
983 > echo "configure:984: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
984   echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
985   cross_compiling=$ac_cv_prog_cxx_cross
986  
987   echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
988 < echo "configure:861: checking whether we are using GNU C++" >&5
988 > echo "configure:989: checking whether we are using GNU C++" >&5
989   if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
990    echo $ac_n "(cached) $ac_c" 1>&6
991   else
# Line 866 | Line 994 | else
994    yes;
995   #endif
996   EOF
997 < 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
997 > if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
998    ac_cv_prog_gxx=yes
999   else
1000    ac_cv_prog_gxx=no
# Line 885 | Line 1013 | ac_test_CXXFLAGS="${CXXFLAGS+set}"
1013   ac_save_CXXFLAGS="$CXXFLAGS"
1014   CXXFLAGS=
1015   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
1016 < echo "configure:889: checking whether ${CXX-g++} accepts -g" >&5
1016 > echo "configure:1017: checking whether ${CXX-g++} accepts -g" >&5
1017   if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
1018    echo $ac_n "(cached) $ac_c" 1>&6
1019   else
# Line 916 | Line 1044 | else
1044    fi
1045   fi
1046  
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
1047   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
1048 < echo "configure:1001: checking whether ${MAKE-make} sets \${MAKE}" >&5
1048 > echo "configure:1049: checking whether ${MAKE-make} sets \${MAKE}" >&5
1049   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
1050   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
1051    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1054 | Line 1102 | ac_configure=$ac_aux_dir/configure # Thi
1102   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1103   # ./install, which can be erroneously created by make from ./install.sh.
1104   echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
1105 < echo "configure:1058: checking for a BSD compatible install" >&5
1105 > echo "configure:1106: checking for a BSD compatible install" >&5
1106   if test -z "$INSTALL"; then
1107   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
1108    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1107 | Line 1155 | test -z "$INSTALL_SCRIPT" && INSTALL_SCR
1155   test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1156  
1157  
1158 + MONSRCS=
1159 + echo $ac_n "checking for mon""... $ac_c" 1>&6
1160 + echo "configure:1161: checking for mon" >&5
1161 + if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1162 +  echo "$ac_t""yes" 1>&6
1163 +  WANT_MON=yes
1164 +  DEFINES="$DEFINES -DENABLE_MON=1"
1165 +  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"
1166 +  CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1167 +  echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
1168 + echo "configure:1169: checking for readline in -lreadline" >&5
1169 + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
1170 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1171 +  echo $ac_n "(cached) $ac_c" 1>&6
1172 + else
1173 +  ac_save_LIBS="$LIBS"
1174 + LIBS="-lreadline  $LIBS"
1175 + cat > conftest.$ac_ext <<EOF
1176 + #line 1177 "configure"
1177 + #include "confdefs.h"
1178 + /* Override any gcc2 internal prototype to avoid an error.  */
1179 + /* We use char because int might match the return type of a gcc2
1180 +    builtin and then its argument prototype would still apply.  */
1181 + char readline();
1182 +
1183 + int main() {
1184 + readline()
1185 + ; return 0; }
1186 + EOF
1187 + if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1188 +  rm -rf conftest*
1189 +  eval "ac_cv_lib_$ac_lib_var=yes"
1190 + else
1191 +  echo "configure: failed program was:" >&5
1192 +  cat conftest.$ac_ext >&5
1193 +  rm -rf conftest*
1194 +  eval "ac_cv_lib_$ac_lib_var=no"
1195 + fi
1196 + rm -f conftest*
1197 + LIBS="$ac_save_LIBS"
1198 +
1199 + fi
1200 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1201 +  echo "$ac_t""yes" 1>&6
1202 +    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1203 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1204 +  cat >> confdefs.h <<EOF
1205 + #define $ac_tr_lib 1
1206 + EOF
1207 +
1208 +  LIBS="-lreadline $LIBS"
1209 +
1210 + else
1211 +  echo "$ac_t""no" 1>&6
1212 + fi
1213 +
1214 +  for ac_hdr in readline/readline.h readline/history.h
1215 + do
1216 + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1217 + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1218 + echo "configure:1219: checking for $ac_hdr" >&5
1219 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1220 +  echo $ac_n "(cached) $ac_c" 1>&6
1221 + else
1222 +  cat > conftest.$ac_ext <<EOF
1223 + #line 1224 "configure"
1224 + #include "confdefs.h"
1225 + #include <$ac_hdr>
1226 + EOF
1227 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1228 + { (eval echo configure:1229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1229 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1230 + if test -z "$ac_err"; then
1231 +  rm -rf conftest*
1232 +  eval "ac_cv_header_$ac_safe=yes"
1233 + else
1234 +  echo "$ac_err" >&5
1235 +  echo "configure: failed program was:" >&5
1236 +  cat conftest.$ac_ext >&5
1237 +  rm -rf conftest*
1238 +  eval "ac_cv_header_$ac_safe=no"
1239 + fi
1240 + rm -f conftest*
1241 + fi
1242 + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
1243 +  echo "$ac_t""yes" 1>&6
1244 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
1245 +  cat >> confdefs.h <<EOF
1246 + #define $ac_tr_hdr 1
1247 + EOF
1248 +
1249 + else
1250 +  echo "$ac_t""no" 1>&6
1251 + fi
1252 + done
1253 +
1254 + else
1255 +  echo "$ac_t""no" 1>&6
1256 +  WANT_MON=no
1257 +  DEFINES="$DEFINES -DENABLE_MON=0"
1258 + fi
1259 +
1260 + echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1261 + echo "configure:1262: checking for sem_init in -lposix4" >&5
1262 + ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1263 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1264 +  echo $ac_n "(cached) $ac_c" 1>&6
1265 + else
1266 +  ac_save_LIBS="$LIBS"
1267 + LIBS="-lposix4  $LIBS"
1268 + cat > conftest.$ac_ext <<EOF
1269 + #line 1270 "configure"
1270 + #include "confdefs.h"
1271 + /* Override any gcc2 internal prototype to avoid an error.  */
1272 + /* We use char because int might match the return type of a gcc2
1273 +    builtin and then its argument prototype would still apply.  */
1274 + char sem_init();
1275 +
1276 + int main() {
1277 + sem_init()
1278 + ; return 0; }
1279 + EOF
1280 + if { (eval echo configure:1281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1281 +  rm -rf conftest*
1282 +  eval "ac_cv_lib_$ac_lib_var=yes"
1283 + else
1284 +  echo "configure: failed program was:" >&5
1285 +  cat conftest.$ac_ext >&5
1286 +  rm -rf conftest*
1287 +  eval "ac_cv_lib_$ac_lib_var=no"
1288 + fi
1289 + rm -f conftest*
1290 + LIBS="$ac_save_LIBS"
1291 +
1292 + fi
1293 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1294 +  echo "$ac_t""yes" 1>&6
1295 +    ac_tr_lib=HAVE_LIB`echo posix4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1296 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1297 +  cat >> confdefs.h <<EOF
1298 + #define $ac_tr_lib 1
1299 + EOF
1300 +
1301 +  LIBS="-lposix4 $LIBS"
1302 +
1303 + else
1304 +  echo "$ac_t""no" 1>&6
1305 + fi
1306 +
1307 +
1308   # If we find X, set shell vars x_includes and x_libraries to the
1309   # paths, otherwise set no_x=yes.
1310   # Uses ac_ vars as temps to allow command line to override cache and checks.
1311   # --without-x overrides everything else, but does not touch the cache.
1312   echo $ac_n "checking for X""... $ac_c" 1>&6
1313 < echo "configure:1116: checking for X" >&5
1313 > echo "configure:1314: checking for X" >&5
1314  
1315   # Check whether --with-x or --without-x was given.
1316   if test "${with_x+set}" = set; then
# Line 1174 | Line 1372 | if test "$ac_x_includes" = NO; then
1372  
1373    # First, try using that file with no special directory specified.
1374   cat > conftest.$ac_ext <<EOF
1375 < #line 1178 "configure"
1375 > #line 1376 "configure"
1376   #include "confdefs.h"
1377   #include <$x_direct_test_include>
1378   EOF
1379   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1380 < { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1380 > { (eval echo configure:1381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1381   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1382   if test -z "$ac_err"; then
1383    rm -rf conftest*
# Line 1248 | Line 1446 | if test "$ac_x_libraries" = NO; then
1446    ac_save_LIBS="$LIBS"
1447    LIBS="-l$x_direct_test_library $LIBS"
1448   cat > conftest.$ac_ext <<EOF
1449 < #line 1252 "configure"
1449 > #line 1450 "configure"
1450   #include "confdefs.h"
1451  
1452   int main() {
1453   ${x_direct_test_function}()
1454   ; return 0; }
1455   EOF
1456 < if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1456 > if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1457    rm -rf conftest*
1458    LIBS="$ac_save_LIBS"
1459   # We can link X programs with no special library path.
# Line 1361 | Line 1559 | else
1559      case "`(uname -sr) 2>/dev/null`" in
1560      "SunOS 5"*)
1561        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1562 < echo "configure:1365: checking whether -R must be followed by a space" >&5
1562 > echo "configure:1563: checking whether -R must be followed by a space" >&5
1563        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1564        cat > conftest.$ac_ext <<EOF
1565 < #line 1368 "configure"
1565 > #line 1566 "configure"
1566   #include "confdefs.h"
1567  
1568   int main() {
1569  
1570   ; return 0; }
1571   EOF
1572 < if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1572 > if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1573    rm -rf conftest*
1574    ac_R_nospace=yes
1575   else
# Line 1387 | Line 1585 | rm -f conftest*
1585        else
1586          LIBS="$ac_xsave_LIBS -R $x_libraries"
1587          cat > conftest.$ac_ext <<EOF
1588 < #line 1391 "configure"
1588 > #line 1589 "configure"
1589   #include "confdefs.h"
1590  
1591   int main() {
1592  
1593   ; return 0; }
1594   EOF
1595 < if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1595 > if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1596    rm -rf conftest*
1597    ac_R_space=yes
1598   else
# Line 1426 | Line 1624 | rm -f conftest*
1624      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1625      # the Alpha needs dnet_stub (dnet does not exist).
1626      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1627 < echo "configure:1430: checking for dnet_ntoa in -ldnet" >&5
1627 > echo "configure:1628: checking for dnet_ntoa in -ldnet" >&5
1628   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1629   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1630    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1434 | Line 1632 | else
1632    ac_save_LIBS="$LIBS"
1633   LIBS="-ldnet  $LIBS"
1634   cat > conftest.$ac_ext <<EOF
1635 < #line 1438 "configure"
1635 > #line 1636 "configure"
1636   #include "confdefs.h"
1637   /* Override any gcc2 internal prototype to avoid an error.  */
1638   /* We use char because int might match the return type of a gcc2
# Line 1445 | Line 1643 | int main() {
1643   dnet_ntoa()
1644   ; return 0; }
1645   EOF
1646 < if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1646 > if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1647    rm -rf conftest*
1648    eval "ac_cv_lib_$ac_lib_var=yes"
1649   else
# Line 1467 | Line 1665 | fi
1665  
1666      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1667        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1668 < echo "configure:1471: checking for dnet_ntoa in -ldnet_stub" >&5
1668 > echo "configure:1669: checking for dnet_ntoa in -ldnet_stub" >&5
1669   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1670   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1671    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1475 | Line 1673 | else
1673    ac_save_LIBS="$LIBS"
1674   LIBS="-ldnet_stub  $LIBS"
1675   cat > conftest.$ac_ext <<EOF
1676 < #line 1479 "configure"
1676 > #line 1677 "configure"
1677   #include "confdefs.h"
1678   /* Override any gcc2 internal prototype to avoid an error.  */
1679   /* We use char because int might match the return type of a gcc2
# Line 1486 | Line 1684 | int main() {
1684   dnet_ntoa()
1685   ; return 0; }
1686   EOF
1687 < if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1687 > if { (eval echo configure:1688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1688    rm -rf conftest*
1689    eval "ac_cv_lib_$ac_lib_var=yes"
1690   else
# Line 1515 | Line 1713 | fi
1713      # The nsl library prevents programs from opening the X display
1714      # on Irix 5.2, according to dickey@clark.net.
1715      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1716 < echo "configure:1519: checking for gethostbyname" >&5
1716 > echo "configure:1717: checking for gethostbyname" >&5
1717   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1718    echo $ac_n "(cached) $ac_c" 1>&6
1719   else
1720    cat > conftest.$ac_ext <<EOF
1721 < #line 1524 "configure"
1721 > #line 1722 "configure"
1722   #include "confdefs.h"
1723   /* System header to define __stub macros and hopefully few prototypes,
1724      which can conflict with char gethostbyname(); below.  */
# Line 1543 | Line 1741 | gethostbyname();
1741  
1742   ; return 0; }
1743   EOF
1744 < if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1744 > if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1745    rm -rf conftest*
1746    eval "ac_cv_func_gethostbyname=yes"
1747   else
# Line 1564 | Line 1762 | fi
1762  
1763      if test $ac_cv_func_gethostbyname = no; then
1764        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1765 < echo "configure:1568: checking for gethostbyname in -lnsl" >&5
1765 > echo "configure:1766: checking for gethostbyname in -lnsl" >&5
1766   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1767   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1768    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1572 | Line 1770 | else
1770    ac_save_LIBS="$LIBS"
1771   LIBS="-lnsl  $LIBS"
1772   cat > conftest.$ac_ext <<EOF
1773 < #line 1576 "configure"
1773 > #line 1774 "configure"
1774   #include "confdefs.h"
1775   /* Override any gcc2 internal prototype to avoid an error.  */
1776   /* We use char because int might match the return type of a gcc2
# Line 1583 | Line 1781 | int main() {
1781   gethostbyname()
1782   ; return 0; }
1783   EOF
1784 < if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1784 > if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1785    rm -rf conftest*
1786    eval "ac_cv_lib_$ac_lib_var=yes"
1787   else
# Line 1613 | Line 1811 | fi
1811      # -lsocket must be given before -lnsl if both are needed.
1812      # We assume that if connect needs -lnsl, so does gethostbyname.
1813      echo $ac_n "checking for connect""... $ac_c" 1>&6
1814 < echo "configure:1617: checking for connect" >&5
1814 > echo "configure:1815: checking for connect" >&5
1815   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1816    echo $ac_n "(cached) $ac_c" 1>&6
1817   else
1818    cat > conftest.$ac_ext <<EOF
1819 < #line 1622 "configure"
1819 > #line 1820 "configure"
1820   #include "confdefs.h"
1821   /* System header to define __stub macros and hopefully few prototypes,
1822      which can conflict with char connect(); below.  */
# Line 1641 | Line 1839 | connect();
1839  
1840   ; return 0; }
1841   EOF
1842 < if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1842 > if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1843    rm -rf conftest*
1844    eval "ac_cv_func_connect=yes"
1845   else
# Line 1662 | Line 1860 | fi
1860  
1861      if test $ac_cv_func_connect = no; then
1862        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1863 < echo "configure:1666: checking for connect in -lsocket" >&5
1863 > echo "configure:1864: checking for connect in -lsocket" >&5
1864   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1865   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1866    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1670 | Line 1868 | else
1868    ac_save_LIBS="$LIBS"
1869   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1870   cat > conftest.$ac_ext <<EOF
1871 < #line 1674 "configure"
1871 > #line 1872 "configure"
1872   #include "confdefs.h"
1873   /* Override any gcc2 internal prototype to avoid an error.  */
1874   /* We use char because int might match the return type of a gcc2
# Line 1681 | Line 1879 | int main() {
1879   connect()
1880   ; return 0; }
1881   EOF
1882 < if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1882 > if { (eval echo configure:1883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1883    rm -rf conftest*
1884    eval "ac_cv_lib_$ac_lib_var=yes"
1885   else
# Line 1705 | Line 1903 | fi
1903  
1904      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1905      echo $ac_n "checking for remove""... $ac_c" 1>&6
1906 < echo "configure:1709: checking for remove" >&5
1906 > echo "configure:1907: checking for remove" >&5
1907   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1908    echo $ac_n "(cached) $ac_c" 1>&6
1909   else
1910    cat > conftest.$ac_ext <<EOF
1911 < #line 1714 "configure"
1911 > #line 1912 "configure"
1912   #include "confdefs.h"
1913   /* System header to define __stub macros and hopefully few prototypes,
1914      which can conflict with char remove(); below.  */
# Line 1733 | Line 1931 | remove();
1931  
1932   ; return 0; }
1933   EOF
1934 < if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1934 > if { (eval echo configure:1935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1935    rm -rf conftest*
1936    eval "ac_cv_func_remove=yes"
1937   else
# Line 1754 | Line 1952 | fi
1952  
1953      if test $ac_cv_func_remove = no; then
1954        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1955 < echo "configure:1758: checking for remove in -lposix" >&5
1955 > echo "configure:1956: checking for remove in -lposix" >&5
1956   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1957   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1958    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1762 | Line 1960 | else
1960    ac_save_LIBS="$LIBS"
1961   LIBS="-lposix  $LIBS"
1962   cat > conftest.$ac_ext <<EOF
1963 < #line 1766 "configure"
1963 > #line 1964 "configure"
1964   #include "confdefs.h"
1965   /* Override any gcc2 internal prototype to avoid an error.  */
1966   /* We use char because int might match the return type of a gcc2
# Line 1773 | Line 1971 | int main() {
1971   remove()
1972   ; return 0; }
1973   EOF
1974 < if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1974 > if { (eval echo configure:1975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1975    rm -rf conftest*
1976    eval "ac_cv_lib_$ac_lib_var=yes"
1977   else
# Line 1797 | Line 1995 | fi
1995  
1996      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1997      echo $ac_n "checking for shmat""... $ac_c" 1>&6
1998 < echo "configure:1801: checking for shmat" >&5
1998 > echo "configure:1999: checking for shmat" >&5
1999   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
2000    echo $ac_n "(cached) $ac_c" 1>&6
2001   else
2002    cat > conftest.$ac_ext <<EOF
2003 < #line 1806 "configure"
2003 > #line 2004 "configure"
2004   #include "confdefs.h"
2005   /* System header to define __stub macros and hopefully few prototypes,
2006      which can conflict with char shmat(); below.  */
# Line 1825 | Line 2023 | shmat();
2023  
2024   ; return 0; }
2025   EOF
2026 < if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2026 > if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2027    rm -rf conftest*
2028    eval "ac_cv_func_shmat=yes"
2029   else
# Line 1846 | Line 2044 | fi
2044  
2045      if test $ac_cv_func_shmat = no; then
2046        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
2047 < echo "configure:1850: checking for shmat in -lipc" >&5
2047 > echo "configure:2048: checking for shmat in -lipc" >&5
2048   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
2049   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2050    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1854 | Line 2052 | else
2052    ac_save_LIBS="$LIBS"
2053   LIBS="-lipc  $LIBS"
2054   cat > conftest.$ac_ext <<EOF
2055 < #line 1858 "configure"
2055 > #line 2056 "configure"
2056   #include "confdefs.h"
2057   /* Override any gcc2 internal prototype to avoid an error.  */
2058   /* We use char because int might match the return type of a gcc2
# Line 1865 | Line 2063 | int main() {
2063   shmat()
2064   ; return 0; }
2065   EOF
2066 < if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2066 > if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2067    rm -rf conftest*
2068    eval "ac_cv_lib_$ac_lib_var=yes"
2069   else
# Line 1898 | Line 2096 | fi
2096    # libraries we check for below, so use a different variable.
2097    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
2098    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
2099 < echo "configure:1902: checking for IceConnectionNumber in -lICE" >&5
2099 > echo "configure:2100: checking for IceConnectionNumber in -lICE" >&5
2100   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
2101   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2102    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1906 | Line 2104 | else
2104    ac_save_LIBS="$LIBS"
2105   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
2106   cat > conftest.$ac_ext <<EOF
2107 < #line 1910 "configure"
2107 > #line 2108 "configure"
2108   #include "confdefs.h"
2109   /* Override any gcc2 internal prototype to avoid an error.  */
2110   /* We use char because int might match the return type of a gcc2
# Line 1917 | Line 2115 | int main() {
2115   IceConnectionNumber()
2116   ; return 0; }
2117   EOF
2118 < if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2118 > if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2119    rm -rf conftest*
2120    eval "ac_cv_lib_$ac_lib_var=yes"
2121   else
# Line 1944 | Line 2142 | fi
2142   if [ "x$no_x" = "xyes" ]; then
2143    { echo "configure: error: You need X11 to run Basilisk II." 1>&2; exit 1; }
2144   fi
1947
2145   CFLAGS="$CFLAGS $X_CFLAGS"
2146   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2147   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
1951 STATICLIBS=
2148  
2149   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2150 < echo "configure:1955: checking for pthread_create in -lpthread" >&5
2150 > echo "configure:2151: checking for pthread_create in -lpthread" >&5
2151   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2152   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2153    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1959 | Line 2155 | else
2155    ac_save_LIBS="$LIBS"
2156   LIBS="-lpthread  $LIBS"
2157   cat > conftest.$ac_ext <<EOF
2158 < #line 1963 "configure"
2158 > #line 2159 "configure"
2159   #include "confdefs.h"
2160   /* Override any gcc2 internal prototype to avoid an error.  */
2161   /* We use char because int might match the return type of a gcc2
# Line 1970 | Line 2166 | int main() {
2166   pthread_create()
2167   ; return 0; }
2168   EOF
2169 < if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2169 > if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2170    rm -rf conftest*
2171    eval "ac_cv_lib_$ac_lib_var=yes"
2172   else
# Line 1985 | Line 2181 | LIBS="$ac_save_LIBS"
2181   fi
2182   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2183    echo "$ac_t""yes" 1>&6
2184 <  HAVE_PTHREADS=yes
2184 >    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2185 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2186 >  cat >> confdefs.h <<EOF
2187 > #define $ac_tr_lib 1
2188 > EOF
2189 >
2190 >  LIBS="-lpthread $LIBS"
2191 >
2192   else
2193    echo "$ac_t""no" 1>&6
1991 HAVE_PTHREADS=no
1992 fi
2194  
2195 < if [ "x$HAVE_PTHREADS" = "xno" ]; then
2196 <    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
2195 >  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2196 > echo "configure:2197: checking for pthread_create in -lc_r" >&5
2197   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2198   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2199    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2001 | Line 2201 | else
2201    ac_save_LIBS="$LIBS"
2202   LIBS="-lc_r  $LIBS"
2203   cat > conftest.$ac_ext <<EOF
2204 < #line 2005 "configure"
2204 > #line 2205 "configure"
2205   #include "confdefs.h"
2206   /* Override any gcc2 internal prototype to avoid an error.  */
2207   /* We use char because int might match the return type of a gcc2
# Line 2012 | Line 2212 | int main() {
2212   pthread_create()
2213   ; return 0; }
2214   EOF
2215 < if { (eval echo configure:2016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2215 > if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2216    rm -rf conftest*
2217    eval "ac_cv_lib_$ac_lib_var=yes"
2218   else
# Line 2027 | Line 2227 | LIBS="$ac_save_LIBS"
2227   fi
2228   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2229    echo "$ac_t""yes" 1>&6
2230 <  HAVE_PTHREADS=yes
2230 >    ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2231 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2232 >  cat >> confdefs.h <<EOF
2233 > #define $ac_tr_lib 1
2234 > EOF
2235 >
2236 >  LIBS="-lc_r $LIBS"
2237 >
2238   else
2239    echo "$ac_t""no" 1>&6
2240 < HAVE_PTHREADS=no
2240 >
2241 >    echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2242 > echo "configure:2243: checking for pthread_create in -lPTL" >&5
2243 > ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2244 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2245 >  echo $ac_n "(cached) $ac_c" 1>&6
2246 > else
2247 >  ac_save_LIBS="$LIBS"
2248 > LIBS="-lPTL  $LIBS"
2249 > cat > conftest.$ac_ext <<EOF
2250 > #line 2251 "configure"
2251 > #include "confdefs.h"
2252 > /* Override any gcc2 internal prototype to avoid an error.  */
2253 > /* We use char because int might match the return type of a gcc2
2254 >    builtin and then its argument prototype would still apply.  */
2255 > char pthread_create();
2256 >
2257 > int main() {
2258 > pthread_create()
2259 > ; return 0; }
2260 > EOF
2261 > if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2262 >  rm -rf conftest*
2263 >  eval "ac_cv_lib_$ac_lib_var=yes"
2264 > else
2265 >  echo "configure: failed program was:" >&5
2266 >  cat conftest.$ac_ext >&5
2267 >  rm -rf conftest*
2268 >  eval "ac_cv_lib_$ac_lib_var=no"
2269   fi
2270 + rm -f conftest*
2271 + LIBS="$ac_save_LIBS"
2272 +
2273 + fi
2274 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2275 +  echo "$ac_t""yes" 1>&6
2276 +    ac_tr_lib=HAVE_LIB`echo PTL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2277 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2278 +  cat >> confdefs.h <<EOF
2279 + #define $ac_tr_lib 1
2280 + EOF
2281 +
2282 +  LIBS="-lPTL $LIBS"
2283  
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
2284   else
2285 <  LIBS="$LIBS -lpthread"
2285 >  echo "$ac_t""no" 1>&6
2286 >
2287 >      { echo "configure: error: You need pthreads to run Basilisk II." 1>&2; exit 1; }
2288 >    
2289   fi
2290 < for ac_func in pthread_cancel
2290 >
2291 >  
2292 > fi
2293 >
2294 >
2295 > fi
2296 >
2297 >
2298 > SEMSRCS=
2299 > for ac_func in sem_init
2300   do
2301   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2302 < echo "configure:2048: checking for $ac_func" >&5
2302 > echo "configure:2303: checking for $ac_func" >&5
2303   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2304    echo $ac_n "(cached) $ac_c" 1>&6
2305   else
2306    cat > conftest.$ac_ext <<EOF
2307 < #line 2053 "configure"
2307 > #line 2308 "configure"
2308   #include "confdefs.h"
2309   /* System header to define __stub macros and hopefully few prototypes,
2310      which can conflict with char $ac_func(); below.  */
# Line 2072 | Line 2327 | $ac_func();
2327  
2328   ; return 0; }
2329   EOF
2330 < if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2330 > if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2331    rm -rf conftest*
2332    eval "ac_cv_func_$ac_func=yes"
2333   else
# Line 2093 | Line 2348 | EOF
2348  
2349   else
2350    echo "$ac_t""no" 1>&6
2351 + SEMSRCS=posix_sem.cpp
2352 +
2353   fi
2354   done
2355  
2356  
2357 < if [ "x$WANT_DGA" = "xyes" ]; then
2357 > if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2358    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2359 < echo "configure:2103: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2359 > echo "configure:2360: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2360   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2361   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2362    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2107 | Line 2364 | else
2364    ac_save_LIBS="$LIBS"
2365   LIBS="-lXxf86dga  $LIBS"
2366   cat > conftest.$ac_ext <<EOF
2367 < #line 2111 "configure"
2367 > #line 2368 "configure"
2368   #include "confdefs.h"
2369   /* Override any gcc2 internal prototype to avoid an error.  */
2370   /* We use char because int might match the return type of a gcc2
# Line 2118 | Line 2375 | int main() {
2375   XF86DGAQueryExtension()
2376   ; return 0; }
2377   EOF
2378 < if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2378 > if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2379 >  rm -rf conftest*
2380 >  eval "ac_cv_lib_$ac_lib_var=yes"
2381 > else
2382 >  echo "configure: failed program was:" >&5
2383 >  cat conftest.$ac_ext >&5
2384 >  rm -rf conftest*
2385 >  eval "ac_cv_lib_$ac_lib_var=no"
2386 > fi
2387 > rm -f conftest*
2388 > LIBS="$ac_save_LIBS"
2389 >
2390 > fi
2391 > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2392 >  echo "$ac_t""yes" 1>&6
2393 >  
2394 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
2395 >    LIBS="$LIBS -lXxf86dga"
2396 >    if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2397 >      echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2
2398 >      WANT_FBDEV_DGA=no
2399 >    fi
2400 >  
2401 > else
2402 >  echo "$ac_t""no" 1>&6
2403 >
2404 >    echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2405 >    WANT_XF86_DGA=no
2406 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2407 >  
2408 > fi
2409 >
2410 > else
2411 >  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2412 > fi
2413 > if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2414 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
2415 > else
2416 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2417 > fi
2418 >
2419 > if [ "x$WANT_XF86_VIDMODE" = "xyes" ]; then
2420 >  echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
2421 > echo "configure:2422: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
2422 > ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'`
2423 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2424 >  echo $ac_n "(cached) $ac_c" 1>&6
2425 > else
2426 >  ac_save_LIBS="$LIBS"
2427 > LIBS="-lXxf86vm  $LIBS"
2428 > cat > conftest.$ac_ext <<EOF
2429 > #line 2430 "configure"
2430 > #include "confdefs.h"
2431 > /* Override any gcc2 internal prototype to avoid an error.  */
2432 > /* We use char because int might match the return type of a gcc2
2433 >    builtin and then its argument prototype would still apply.  */
2434 > char XF86VidModeQueryExtension();
2435 >
2436 > int main() {
2437 > XF86VidModeQueryExtension()
2438 > ; return 0; }
2439 > EOF
2440 > if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2441    rm -rf conftest*
2442    eval "ac_cv_lib_$ac_lib_var=yes"
2443   else
# Line 2133 | Line 2452 | LIBS="$ac_save_LIBS"
2452   fi
2453   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2454    echo "$ac_t""yes" 1>&6
2455 <  HAVE_DGA=yes
2455 >  
2456 >    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=1"
2457 >    LIBS="$LIBS -lXxf86vm"
2458 >  
2459   else
2460    echo "$ac_t""no" 1>&6
2461 < HAVE_DGA=no
2461 >
2462 >    echo "configure: warning: Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode." 1>&2
2463 >    WANT_XF86_VIDMODE=no
2464 >    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=0"
2465 >  
2466   fi
2467  
2142  if [ "x$HAVE_DGA" = "xno" ]; then
2143    echo "configure: warning: Could not find DGA extension, ignoring --enable-dga." 1>&2
2144  else
2145    DEFINES="$DEFINES -DENABLE_DGA=1"
2146    LIBS="$LIBS -lXxf86dga"
2147  fi
2468   fi
2469  
2470 < if [ "x$WANT_UI" = "xyes" ]; then
2470 > UISRCS=../dummy/prefs_editor_dummy.cpp
2471 > if [ "x$WANT_GTK" = "xyes" ]; then
2472    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2473   if test "${with_gtk_prefix+set}" = set; then
2474    withval="$with_gtk_prefix"
# Line 2189 | Line 2510 | fi
2510    # Extract the first word of "gtk-config", so it can be a program name with args.
2511   set dummy gtk-config; ac_word=$2
2512   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2513 < echo "configure:2193: checking for $ac_word" >&5
2513 > echo "configure:2514: checking for $ac_word" >&5
2514   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2515    echo $ac_n "(cached) $ac_c" 1>&6
2516   else
# Line 2224 | Line 2545 | fi
2545  
2546    min_gtk_version=1.2.0
2547    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2548 < echo "configure:2228: checking for GTK - version >= $min_gtk_version" >&5
2548 > echo "configure:2549: checking for GTK - version >= $min_gtk_version" >&5
2549    no_gtk=""
2550    if test "$GTK_CONFIG" = "no" ; then
2551      no_gtk=yes
# Line 2247 | Line 2568 | echo "configure:2228: checking for GTK -
2568    echo $ac_n "cross compiling; assumed OK... $ac_c"
2569   else
2570    cat > conftest.$ac_ext <<EOF
2571 < #line 2251 "configure"
2571 > #line 2572 "configure"
2572   #include "confdefs.h"
2573  
2574   #include <gtk/gtk.h>
# Line 2310 | Line 2631 | main ()
2631   }
2632  
2633   EOF
2634 < if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2634 > if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2635   then
2636    :
2637   else
# Line 2328 | Line 2649 | fi
2649    fi
2650    if test "x$no_gtk" = x ; then
2651       echo "$ac_t""yes" 1>&6
2652 <     :    
2652 >    
2653 >    DEFINES="$DEFINES -DENABLE_GTK=1"
2654 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
2655 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2656 >    LIBS="$LIBS $GTK_LIBS"
2657 >    UISRCS=prefs_editor_gtk.cpp
2658 >      
2659    else
2660       echo "$ac_t""no" 1>&6
2661       if test "$GTK_CONFIG" = "no" ; then
# Line 2344 | Line 2671 | fi
2671            CFLAGS="$CFLAGS $GTK_CFLAGS"
2672            LIBS="$LIBS $GTK_LIBS"
2673            cat > conftest.$ac_ext <<EOF
2674 < #line 2348 "configure"
2674 > #line 2675 "configure"
2675   #include "confdefs.h"
2676  
2677   #include <gtk/gtk.h>
# Line 2354 | Line 2681 | int main() {
2681   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2682   ; return 0; }
2683   EOF
2684 < if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2684 > if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2685    rm -rf conftest*
2686     echo "*** The test program compiled, but did not run. This usually means"
2687            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2386 | Line 2713 | rm -f conftest*
2713       fi
2714       GTK_CFLAGS=""
2715       GTK_LIBS=""
2716 <     :
2716 >    
2717 >    echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2718 >    WANT_GTK=no
2719 >    DEFINES="$DEFINES -DENABLE_GTK=0"
2720 >  
2721    fi
2722    
2723    
2724    rm -f conf.gtktest
2725  
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"
2726   fi
2727  
2728 < SEMSRCS=
2729 < for ac_func in sem_init
2730 < do
2731 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2732 < 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
2728 > if [ "x$WANT_ESD" = "xyes" ]; then
2729 >  # Check whether --with-esd-prefix or --without-esd-prefix was given.
2730 > if test "${with_esd_prefix+set}" = set; then
2731 >  withval="$with_esd_prefix"
2732 >  esd_prefix="$withval"
2733   else
2734 <  cat > conftest.$ac_ext <<EOF
2735 < #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
2734 >  esd_prefix=""
2735 > fi
2736  
2737 < ; return 0; }
2738 < EOF
2739 < if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2740 <  rm -rf conftest*
2442 <  eval "ac_cv_func_$ac_func=yes"
2737 > # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
2738 > if test "${with_esd_exec_prefix+set}" = set; then
2739 >  withval="$with_esd_exec_prefix"
2740 >  esd_exec_prefix="$withval"
2741   else
2742 <  echo "configure: failed program was:" >&5
2445 <  cat conftest.$ac_ext >&5
2446 <  rm -rf conftest*
2447 <  eval "ac_cv_func_$ac_func=no"
2742 >  esd_exec_prefix=""
2743   fi
2744 < rm -f conftest*
2744 >
2745 > # Check whether --enable-esdtest or --disable-esdtest was given.
2746 > if test "${enable_esdtest+set}" = set; then
2747 >  enableval="$enable_esdtest"
2748 >  :
2749 > else
2750 >  enable_esdtest=yes
2751   fi
2752  
2753 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2754 <  echo "$ac_t""yes" 1>&6
2755 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2756 <  cat >> confdefs.h <<EOF
2757 < #define $ac_tr_func 1
2758 < EOF
2759 <
2753 >
2754 >  if test x$esd_exec_prefix != x ; then
2755 >     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
2756 >     if test x${ESD_CONFIG+set} != xset ; then
2757 >        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
2758 >     fi
2759 >  fi
2760 >  if test x$esd_prefix != x ; then
2761 >     esd_args="$esd_args --prefix=$esd_prefix"
2762 >     if test x${ESD_CONFIG+set} != xset ; then
2763 >        ESD_CONFIG=$esd_prefix/bin/esd-config
2764 >     fi
2765 >  fi
2766 >
2767 >  # Extract the first word of "esd-config", so it can be a program name with args.
2768 > set dummy esd-config; ac_word=$2
2769 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2770 > echo "configure:2771: checking for $ac_word" >&5
2771 > if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2772 >  echo $ac_n "(cached) $ac_c" 1>&6
2773 > else
2774 >  case "$ESD_CONFIG" in
2775 >  /*)
2776 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
2777 >  ;;
2778 >  ?:/*)                  
2779 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
2780 >  ;;
2781 >  *)
2782 >  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
2783 >  ac_dummy="$PATH"
2784 >  for ac_dir in $ac_dummy; do
2785 >    test -z "$ac_dir" && ac_dir=.
2786 >    if test -f $ac_dir/$ac_word; then
2787 >      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
2788 >      break
2789 >    fi
2790 >  done
2791 >  IFS="$ac_save_ifs"
2792 >  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
2793 >  ;;
2794 > esac
2795 > fi
2796 > ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
2797 > if test -n "$ESD_CONFIG"; then
2798 >  echo "$ac_t""$ESD_CONFIG" 1>&6
2799   else
2800    echo "$ac_t""no" 1>&6
2801   fi
2462 done
2802  
2803 < if [ "x$ac_cv_func_sem_init" = "xno" ]; then
2804 <  echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
2805 < echo "configure:2467: checking for sem_init in -lposix4" >&5
2806 < ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
2807 < if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2808 <  echo $ac_n "(cached) $ac_c" 1>&6
2803 >  min_esd_version=0.2.8
2804 >  echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2805 > echo "configure:2806: checking for ESD - version >= $min_esd_version" >&5
2806 >  no_esd=""
2807 >  if test "$ESD_CONFIG" = "no" ; then
2808 >    no_esd=yes
2809 >  else
2810 >    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
2811 >    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
2812 >
2813 >    esd_major_version=`$ESD_CONFIG $esd_args --version | \
2814 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
2815 >    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
2816 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
2817 >    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
2818 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
2819 >    if test "x$enable_esdtest" = "xyes" ; then
2820 >      ac_save_CFLAGS="$CFLAGS"
2821 >      ac_save_LIBS="$LIBS"
2822 >      CFLAGS="$CFLAGS $ESD_CFLAGS"
2823 >      LIBS="$LIBS $ESD_LIBS"
2824 >      rm -f conf.esdtest
2825 >      if test "$cross_compiling" = yes; then
2826 >  echo $ac_n "cross compiling; assumed OK... $ac_c"
2827   else
2828 <  ac_save_LIBS="$LIBS"
2829 < LIBS="-lposix4  $LIBS"
2473 < cat > conftest.$ac_ext <<EOF
2474 < #line 2475 "configure"
2828 >  cat > conftest.$ac_ext <<EOF
2829 > #line 2830 "configure"
2830   #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();
2831  
2832 < int main() {
2833 < sem_init()
2834 < ; return 0; }
2832 > #include <stdio.h>
2833 > #include <stdlib.h>
2834 > #include <string.h>
2835 > #include <esd.h>
2836 >
2837 > char*
2838 > my_strdup (char *str)
2839 > {
2840 >  char *new_str;
2841 >  
2842 >  if (str)
2843 >    {
2844 >      new_str = malloc ((strlen (str) + 1) * sizeof(char));
2845 >      strcpy (new_str, str);
2846 >    }
2847 >  else
2848 >    new_str = NULL;
2849 >  
2850 >  return new_str;
2851 > }
2852 >
2853 > int main ()
2854 > {
2855 >  int major, minor, micro;
2856 >  char *tmp_version;
2857 >
2858 >  system ("touch conf.esdtest");
2859 >
2860 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
2861 >  tmp_version = my_strdup("$min_esd_version");
2862 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
2863 >     printf("%s, bad version string\n", "$min_esd_version");
2864 >     exit(1);
2865 >   }
2866 >
2867 >   if (($esd_major_version > major) ||
2868 >      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
2869 >      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
2870 >    {
2871 >      return 0;
2872 >    }
2873 >  else
2874 >    {
2875 >      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
2876 >      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
2877 >      printf("*** best to upgrade to the required version.\n");
2878 >      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
2879 >      printf("*** to point to the correct copy of esd-config, and remove the file\n");
2880 >      printf("*** config.cache before re-running configure\n");
2881 >      return 1;
2882 >    }
2883 > }
2884 >
2885 >
2886   EOF
2887 < if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2888 <  rm -rf conftest*
2889 <  eval "ac_cv_lib_$ac_lib_var=yes"
2887 > if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2888 > then
2889 >  :
2890   else
2891    echo "configure: failed program was:" >&5
2892    cat conftest.$ac_ext >&5
2893 <  rm -rf conftest*
2894 <  eval "ac_cv_lib_$ac_lib_var=no"
2493 < fi
2494 < rm -f conftest*
2495 < LIBS="$ac_save_LIBS"
2496 <
2893 >  rm -fr conftest*
2894 >  no_esd=yes
2895   fi
2896 < 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
2896 > rm -fr conftest*
2897   fi
2898  
2899 <  if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then
2900 <        for ac_func in semget
2901 < do
2902 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2903 < echo "configure:2511: checking for $ac_func" >&5
2904 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2905 <  echo $ac_n "(cached) $ac_c" 1>&6
2906 < else
2907 <  cat > conftest.$ac_ext <<EOF
2908 < #line 2516 "configure"
2899 >       CFLAGS="$ac_save_CFLAGS"
2900 >       LIBS="$ac_save_LIBS"
2901 >     fi
2902 >  fi
2903 >  if test "x$no_esd" = x ; then
2904 >     echo "$ac_t""yes" 1>&6
2905 >    
2906 >    DEFINES="$DEFINES -DENABLE_ESD=1"
2907 >    CFLAGS="$CFLAGS $ESD_CFLAGS"
2908 >    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
2909 >    LIBS="$LIBS $ESD_LIBS"
2910 >      
2911 >  else
2912 >     echo "$ac_t""no" 1>&6
2913 >     if test "$ESD_CONFIG" = "no" ; then
2914 >       echo "*** The esd-config script installed by ESD could not be found"
2915 >       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
2916 >       echo "*** your path, or set the ESD_CONFIG environment variable to the"
2917 >       echo "*** full path to esd-config."
2918 >     else
2919 >       if test -f conf.esdtest ; then
2920 >        :
2921 >       else
2922 >          echo "*** Could not run ESD test program, checking why..."
2923 >          CFLAGS="$CFLAGS $ESD_CFLAGS"
2924 >          LIBS="$LIBS $ESD_LIBS"
2925 >          cat > conftest.$ac_ext <<EOF
2926 > #line 2927 "configure"
2927   #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() {
2928  
2929 < /* The GNU C library defines this for functions which it implements
2930 <    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
2929 > #include <stdio.h>
2930 > #include <esd.h>
2931  
2932 + int main() {
2933 + return 0;
2934   ; return 0; }
2935   EOF
2936 < if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2936 > if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2937    rm -rf conftest*
2938 <  eval "ac_cv_func_$ac_func=yes"
2938 >   echo "*** The test program compiled, but did not run. This usually means"
2939 >          echo "*** that the run-time linker is not finding ESD or finding the wrong"
2940 >          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
2941 >          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2942 >          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
2943 >          echo "*** is required on your system"
2944 >          echo "***"
2945 >          echo "*** If you have an old version installed, it is best to remove it, although"
2946 >          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
2947   else
2948    echo "configure: failed program was:" >&5
2949    cat conftest.$ac_ext >&5
2950    rm -rf conftest*
2951 <  eval "ac_cv_func_$ac_func=no"
2951 >   echo "*** The test program failed to compile or link. See the file config.log for the"
2952 >          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
2953 >          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
2954 >          echo "*** may want to edit the esd-config script: $ESD_CONFIG"
2955   fi
2956   rm -f conftest*
2957 < fi
2958 <
2959 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2960 <  echo "$ac_t""yes" 1>&6
2961 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2962 <  cat >> confdefs.h <<EOF
2963 < #define $ac_tr_func 1
2964 < EOF
2965 <
2966 < else
2967 <  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"
2957 >          CFLAGS="$ac_save_CFLAGS"
2958 >          LIBS="$ac_save_LIBS"
2959 >       fi
2960 >     fi
2961 >     ESD_CFLAGS=""
2962 >     ESD_LIBS=""
2963 >    
2964 >    echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
2965 >    WANT_ESD=no
2966 >    DEFINES="$DEFINES -DENABLE_ESD=0"
2967 >  
2968    fi
2969 +  
2970 +  
2971 +  rm -f conf.esdtest
2972 +
2973   fi
2974  
2975   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2976 < echo "configure:2574: checking for ANSI C header files" >&5
2976 > echo "configure:2977: checking for ANSI C header files" >&5
2977   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2978    echo $ac_n "(cached) $ac_c" 1>&6
2979   else
2980    cat > conftest.$ac_ext <<EOF
2981 < #line 2579 "configure"
2981 > #line 2982 "configure"
2982   #include "confdefs.h"
2983   #include <stdlib.h>
2984   #include <stdarg.h>
# Line 2583 | Line 2986 | else
2986   #include <float.h>
2987   EOF
2988   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2989 < { (eval echo configure:2587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2989 > { (eval echo configure:2990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2990   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2991   if test -z "$ac_err"; then
2992    rm -rf conftest*
# Line 2600 | Line 3003 | rm -f conftest*
3003   if test $ac_cv_header_stdc = yes; then
3004    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3005   cat > conftest.$ac_ext <<EOF
3006 < #line 2604 "configure"
3006 > #line 3007 "configure"
3007   #include "confdefs.h"
3008   #include <string.h>
3009   EOF
# Line 2618 | Line 3021 | fi
3021   if test $ac_cv_header_stdc = yes; then
3022    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3023   cat > conftest.$ac_ext <<EOF
3024 < #line 2622 "configure"
3024 > #line 3025 "configure"
3025   #include "confdefs.h"
3026   #include <stdlib.h>
3027   EOF
# Line 2639 | Line 3042 | if test "$cross_compiling" = yes; then
3042    :
3043   else
3044    cat > conftest.$ac_ext <<EOF
3045 < #line 2643 "configure"
3045 > #line 3046 "configure"
3046   #include "confdefs.h"
3047   #include <ctype.h>
3048   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2650 | Line 3053 | if (XOR (islower (i), ISLOWER (i)) || to
3053   exit (0); }
3054  
3055   EOF
3056 < if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3056 > if { (eval echo configure:3057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3057   then
3058    :
3059   else
# Line 2677 | Line 3080 | for ac_hdr in unistd.h fcntl.h sys/time.
3080   do
3081   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3082   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3083 < echo "configure:2681: checking for $ac_hdr" >&5
3083 > echo "configure:3084: checking for $ac_hdr" >&5
3084   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3085    echo $ac_n "(cached) $ac_c" 1>&6
3086   else
3087    cat > conftest.$ac_ext <<EOF
3088 < #line 2686 "configure"
3088 > #line 3089 "configure"
3089   #include "confdefs.h"
3090   #include <$ac_hdr>
3091   EOF
3092   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3093 < { (eval echo configure:2691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3093 > { (eval echo configure:3094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3094   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3095   if test -z "$ac_err"; then
3096    rm -rf conftest*
# Line 2715 | Line 3118 | done
3118  
3119  
3120   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
3121 < echo "configure:2719: checking whether byte ordering is bigendian" >&5
3121 > echo "configure:3122: checking whether byte ordering is bigendian" >&5
3122   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
3123    echo $ac_n "(cached) $ac_c" 1>&6
3124   else
3125    ac_cv_c_bigendian=unknown
3126   # See if sys/param.h defines the BYTE_ORDER macro.
3127   cat > conftest.$ac_ext <<EOF
3128 < #line 2726 "configure"
3128 > #line 3129 "configure"
3129   #include "confdefs.h"
3130   #include <sys/types.h>
3131   #include <sys/param.h>
# Line 2733 | Line 3136 | int main() {
3136   #endif
3137   ; return 0; }
3138   EOF
3139 < if { (eval echo configure:2737: \"$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    # It does; now see whether it defined to BIG_ENDIAN or not.
3142   cat > conftest.$ac_ext <<EOF
3143 < #line 2741 "configure"
3143 > #line 3144 "configure"
3144   #include "confdefs.h"
3145   #include <sys/types.h>
3146   #include <sys/param.h>
# Line 2748 | Line 3151 | int main() {
3151   #endif
3152   ; return 0; }
3153   EOF
3154 < if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3154 > if { (eval echo configure:3155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3155    rm -rf conftest*
3156    ac_cv_c_bigendian=yes
3157   else
# Line 2768 | Line 3171 | if test "$cross_compiling" = yes; then
3171      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3172   else
3173    cat > conftest.$ac_ext <<EOF
3174 < #line 2772 "configure"
3174 > #line 3175 "configure"
3175   #include "confdefs.h"
3176   main () {
3177    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 2781 | Line 3184 | main () {
3184    exit (u.c[sizeof (long) - 1] == 1);
3185   }
3186   EOF
3187 < if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3187 > if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3188   then
3189    ac_cv_c_bigendian=no
3190   else
# Line 2805 | Line 3208 | EOF
3208   fi
3209  
3210   echo $ac_n "checking for working const""... $ac_c" 1>&6
3211 < echo "configure:2809: checking for working const" >&5
3211 > echo "configure:3212: checking for working const" >&5
3212   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3213    echo $ac_n "(cached) $ac_c" 1>&6
3214   else
3215    cat > conftest.$ac_ext <<EOF
3216 < #line 2814 "configure"
3216 > #line 3217 "configure"
3217   #include "confdefs.h"
3218  
3219   int main() {
# Line 2859 | Line 3262 | ccp = (char const *const *) p;
3262  
3263   ; return 0; }
3264   EOF
3265 < if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3265 > if { (eval echo configure:3266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3266    rm -rf conftest*
3267    ac_cv_c_const=yes
3268   else
# Line 2880 | Line 3283 | EOF
3283   fi
3284  
3285   echo $ac_n "checking for inline""... $ac_c" 1>&6
3286 < echo "configure:2884: checking for inline" >&5
3286 > echo "configure:3287: checking for inline" >&5
3287   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3288    echo $ac_n "(cached) $ac_c" 1>&6
3289   else
3290    ac_cv_c_inline=no
3291   for ac_kw in inline __inline__ __inline; do
3292    cat > conftest.$ac_ext <<EOF
3293 < #line 2891 "configure"
3293 > #line 3294 "configure"
3294   #include "confdefs.h"
3295  
3296   int main() {
3297   } $ac_kw foo() {
3298   ; return 0; }
3299   EOF
3300 < if { (eval echo configure:2898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3300 > if { (eval echo configure:3301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3301    rm -rf conftest*
3302    ac_cv_c_inline=$ac_kw; break
3303   else
# Line 2920 | Line 3323 | EOF
3323   esac
3324  
3325   echo $ac_n "checking size of short""... $ac_c" 1>&6
3326 < echo "configure:2924: checking size of short" >&5
3326 > echo "configure:3327: checking size of short" >&5
3327   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3328    echo $ac_n "(cached) $ac_c" 1>&6
3329   else
# Line 2928 | Line 3331 | else
3331    ac_cv_sizeof_short=2
3332   else
3333    cat > conftest.$ac_ext <<EOF
3334 < #line 2932 "configure"
3334 > #line 3335 "configure"
3335   #include "confdefs.h"
3336   #include <stdio.h>
3337   main()
# Line 2939 | Line 3342 | main()
3342    exit(0);
3343   }
3344   EOF
3345 < if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3345 > if { (eval echo configure:3346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3346   then
3347    ac_cv_sizeof_short=`cat conftestval`
3348   else
# Line 2959 | Line 3362 | EOF
3362  
3363  
3364   echo $ac_n "checking size of int""... $ac_c" 1>&6
3365 < echo "configure:2963: checking size of int" >&5
3365 > echo "configure:3366: checking size of int" >&5
3366   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3367    echo $ac_n "(cached) $ac_c" 1>&6
3368   else
# Line 2967 | Line 3370 | else
3370    ac_cv_sizeof_int=4
3371   else
3372    cat > conftest.$ac_ext <<EOF
3373 < #line 2971 "configure"
3373 > #line 3374 "configure"
3374   #include "confdefs.h"
3375   #include <stdio.h>
3376   main()
# Line 2978 | Line 3381 | main()
3381    exit(0);
3382   }
3383   EOF
3384 < if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3384 > if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3385   then
3386    ac_cv_sizeof_int=`cat conftestval`
3387   else
# Line 2998 | Line 3401 | EOF
3401  
3402  
3403   echo $ac_n "checking size of long""... $ac_c" 1>&6
3404 < echo "configure:3002: checking size of long" >&5
3404 > echo "configure:3405: checking size of long" >&5
3405   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3406    echo $ac_n "(cached) $ac_c" 1>&6
3407   else
# Line 3006 | Line 3409 | else
3409    ac_cv_sizeof_long=4
3410   else
3411    cat > conftest.$ac_ext <<EOF
3412 < #line 3010 "configure"
3412 > #line 3413 "configure"
3413   #include "confdefs.h"
3414   #include <stdio.h>
3415   main()
# Line 3017 | Line 3420 | main()
3420    exit(0);
3421   }
3422   EOF
3423 < if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3423 > if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3424   then
3425    ac_cv_sizeof_long=`cat conftestval`
3426   else
# Line 3037 | Line 3440 | EOF
3440  
3441  
3442   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3443 < echo "configure:3041: checking size of long long" >&5
3443 > echo "configure:3444: checking size of long long" >&5
3444   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3445    echo $ac_n "(cached) $ac_c" 1>&6
3446   else
# Line 3045 | Line 3448 | else
3448    ac_cv_sizeof_long_long=8
3449   else
3450    cat > conftest.$ac_ext <<EOF
3451 < #line 3049 "configure"
3451 > #line 3452 "configure"
3452   #include "confdefs.h"
3453   #include <stdio.h>
3454   main()
# Line 3056 | Line 3459 | main()
3459    exit(0);
3460   }
3461   EOF
3462 < if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3462 > if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3463   then
3464    ac_cv_sizeof_long_long=`cat conftestval`
3465   else
# Line 3076 | Line 3479 | EOF
3479  
3480  
3481   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3482 < echo "configure:3080: checking for off_t" >&5
3482 > echo "configure:3483: checking for off_t" >&5
3483   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3484    echo $ac_n "(cached) $ac_c" 1>&6
3485   else
3486    cat > conftest.$ac_ext <<EOF
3487 < #line 3085 "configure"
3487 > #line 3488 "configure"
3488   #include "confdefs.h"
3489   #include <sys/types.h>
3490   #if STDC_HEADERS
# Line 3109 | Line 3512 | EOF
3512   fi
3513  
3514   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3515 < echo "configure:3113: checking for loff_t" >&5
3515 > echo "configure:3516: checking for loff_t" >&5
3516   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3517    echo $ac_n "(cached) $ac_c" 1>&6
3518   else
3519    cat > conftest.$ac_ext <<EOF
3520 < #line 3118 "configure"
3520 > #line 3521 "configure"
3521   #include "confdefs.h"
3522   #include <sys/types.h>
3523   #if STDC_HEADERS
# Line 3142 | Line 3545 | EOF
3545   fi
3546  
3547   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3548 < echo "configure:3146: checking for size_t" >&5
3548 > echo "configure:3549: checking for size_t" >&5
3549   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3550    echo $ac_n "(cached) $ac_c" 1>&6
3551   else
3552    cat > conftest.$ac_ext <<EOF
3553 < #line 3151 "configure"
3553 > #line 3554 "configure"
3554   #include "confdefs.h"
3555   #include <sys/types.h>
3556   #if STDC_HEADERS
# Line 3175 | Line 3578 | EOF
3578   fi
3579  
3580   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3581 < echo "configure:3179: checking whether time.h and sys/time.h may both be included" >&5
3581 > echo "configure:3582: checking whether time.h and sys/time.h may both be included" >&5
3582   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3583    echo $ac_n "(cached) $ac_c" 1>&6
3584   else
3585    cat > conftest.$ac_ext <<EOF
3586 < #line 3184 "configure"
3586 > #line 3587 "configure"
3587   #include "confdefs.h"
3588   #include <sys/types.h>
3589   #include <sys/time.h>
# Line 3189 | Line 3592 | int main() {
3592   struct tm *tp;
3593   ; return 0; }
3594   EOF
3595 < if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3595 > if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3596    rm -rf conftest*
3597    ac_cv_header_time=yes
3598   else
# Line 3210 | Line 3613 | EOF
3613   fi
3614  
3615   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3616 < echo "configure:3214: checking whether struct tm is in sys/time.h or time.h" >&5
3616 > echo "configure:3617: checking whether struct tm is in sys/time.h or time.h" >&5
3617   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3618    echo $ac_n "(cached) $ac_c" 1>&6
3619   else
3620    cat > conftest.$ac_ext <<EOF
3621 < #line 3219 "configure"
3621 > #line 3622 "configure"
3622   #include "confdefs.h"
3623   #include <sys/types.h>
3624   #include <time.h>
# Line 3223 | Line 3626 | int main() {
3626   struct tm *tp; tp->tm_sec;
3627   ; return 0; }
3628   EOF
3629 < if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3629 > if { (eval echo configure:3630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3630    rm -rf conftest*
3631    ac_cv_struct_tm=time.h
3632   else
# Line 3247 | Line 3650 | fi
3650   for ac_func in strdup cfmakeraw
3651   do
3652   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3653 < echo "configure:3251: checking for $ac_func" >&5
3653 > echo "configure:3654: checking for $ac_func" >&5
3654   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3655    echo $ac_n "(cached) $ac_c" 1>&6
3656   else
3657    cat > conftest.$ac_ext <<EOF
3658 < #line 3256 "configure"
3658 > #line 3659 "configure"
3659   #include "confdefs.h"
3660   /* System header to define __stub macros and hopefully few prototypes,
3661      which can conflict with char $ac_func(); below.  */
# Line 3275 | Line 3678 | $ac_func();
3678  
3679   ; return 0; }
3680   EOF
3681 < if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3681 > if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3682    rm -rf conftest*
3683    eval "ac_cv_func_$ac_func=yes"
3684   else
# Line 3302 | Line 3705 | done
3705   for ac_func in nanosleep clock_gettime timer_create
3706   do
3707   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3708 < echo "configure:3306: checking for $ac_func" >&5
3708 > echo "configure:3709: checking for $ac_func" >&5
3709   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3710    echo $ac_n "(cached) $ac_c" 1>&6
3711   else
3712    cat > conftest.$ac_ext <<EOF
3713 < #line 3311 "configure"
3713 > #line 3714 "configure"
3714   #include "confdefs.h"
3715   /* System header to define __stub macros and hopefully few prototypes,
3716      which can conflict with char $ac_func(); below.  */
# Line 3330 | Line 3733 | $ac_func();
3733  
3734   ; return 0; }
3735   EOF
3736 < if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3736 > if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3737 >  rm -rf conftest*
3738 >  eval "ac_cv_func_$ac_func=yes"
3739 > else
3740 >  echo "configure: failed program was:" >&5
3741 >  cat conftest.$ac_ext >&5
3742 >  rm -rf conftest*
3743 >  eval "ac_cv_func_$ac_func=no"
3744 > fi
3745 > rm -f conftest*
3746 > fi
3747 >
3748 > if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
3749 >  echo "$ac_t""yes" 1>&6
3750 >    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3751 >  cat >> confdefs.h <<EOF
3752 > #define $ac_tr_func 1
3753 > EOF
3754 >
3755 > else
3756 >  echo "$ac_t""no" 1>&6
3757 > fi
3758 > done
3759 >
3760 > for ac_func in pthread_cancel
3761 > do
3762 > echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3763 > echo "configure:3764: checking for $ac_func" >&5
3764 > if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3765 >  echo $ac_n "(cached) $ac_c" 1>&6
3766 > else
3767 >  cat > conftest.$ac_ext <<EOF
3768 > #line 3769 "configure"
3769 > #include "confdefs.h"
3770 > /* System header to define __stub macros and hopefully few prototypes,
3771 >    which can conflict with char $ac_func(); below.  */
3772 > #include <assert.h>
3773 > /* Override any gcc2 internal prototype to avoid an error.  */
3774 > /* We use char because int might match the return type of a gcc2
3775 >    builtin and then its argument prototype would still apply.  */
3776 > char $ac_func();
3777 >
3778 > int main() {
3779 >
3780 > /* The GNU C library defines this for functions which it implements
3781 >    to always fail with ENOSYS.  Some functions are actually named
3782 >    something starting with __ and the normal name is an alias.  */
3783 > #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
3784 > choke me
3785 > #else
3786 > $ac_func();
3787 > #endif
3788 >
3789 > ; return 0; }
3790 > EOF
3791 > if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3792    rm -rf conftest*
3793    eval "ac_cv_func_$ac_func=yes"
3794   else
# Line 3359 | Line 3817 | SYSSRCS="../dummy/ether_dummy.cpp ../dum
3817   if MACHINE=`uname -a 2>/dev/null`; then
3818    case "$MACHINE" in
3819    Linux*)
3820 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp"
3820 >    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
3821      ;;
3822    FreeBSD*3.*)
3823          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3824 < echo "configure:3367: checking for cam_open_btl in -lcam" >&5
3824 > echo "configure:3825: checking for cam_open_btl in -lcam" >&5
3825   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3826   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3827    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3371 | Line 3829 | else
3829    ac_save_LIBS="$LIBS"
3830   LIBS="-lcam  $LIBS"
3831   cat > conftest.$ac_ext <<EOF
3832 < #line 3375 "configure"
3832 > #line 3833 "configure"
3833   #include "confdefs.h"
3834   /* Override any gcc2 internal prototype to avoid an error.  */
3835   /* We use char because int might match the return type of a gcc2
# Line 3382 | Line 3840 | int main() {
3840   cam_open_btl()
3841   ; return 0; }
3842   EOF
3843 < if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3843 > if { (eval echo configure:3844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3844    rm -rf conftest*
3845    eval "ac_cv_lib_$ac_lib_var=yes"
3846   else
# Line 3408 | Line 3866 | fi
3866      else
3867              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3868   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3869 < echo "configure:3412: checking for /sys/cam/cam.h" >&5
3869 > echo "configure:3870: checking for /sys/cam/cam.h" >&5
3870   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3871    echo $ac_n "(cached) $ac_c" 1>&6
3872   else
3873    cat > conftest.$ac_ext <<EOF
3874 < #line 3417 "configure"
3874 > #line 3875 "configure"
3875   #include "confdefs.h"
3876   #include </sys/cam/cam.h>
3877   EOF
3878   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3879 < { (eval echo configure:3422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3879 > { (eval echo configure:3880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3880   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3881   if test -z "$ac_err"; then
3882    rm -rf conftest*
# Line 3442 | Line 3900 | fi
3900        if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then
3901                          { echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; }
3902        fi
3903 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3903 >      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
3904        CXXFLAGS="$CXXFLAGS -I/sys"
3905        CFLAGS="$CFLAGS -I/sys"
3906        LIBS="$LIBS -lcam"
# Line 3451 | Line 3909 | fi
3909      ;;
3910    FreeBSD*)
3911          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3912 < echo "configure:3455: checking for scsi_open in -lscsi" >&5
3912 > echo "configure:3913: checking for scsi_open in -lscsi" >&5
3913   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3914   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3915    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3459 | Line 3917 | else
3917    ac_save_LIBS="$LIBS"
3918   LIBS="-lscsi  $LIBS"
3919   cat > conftest.$ac_ext <<EOF
3920 < #line 3463 "configure"
3920 > #line 3921 "configure"
3921   #include "confdefs.h"
3922   /* Override any gcc2 internal prototype to avoid an error.  */
3923   /* We use char because int might match the return type of a gcc2
# Line 3470 | Line 3928 | int main() {
3928   scsi_open()
3929   ; return 0; }
3930   EOF
3931 < if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3931 > if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3932    rm -rf conftest*
3933    eval "ac_cv_lib_$ac_lib_var=yes"
3934   else
# Line 3496 | Line 3954 | fi
3954      else
3955              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3956   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3957 < echo "configure:3500: checking for scsi.h sys/scsiio.h" >&5
3957 > echo "configure:3958: checking for scsi.h sys/scsiio.h" >&5
3958   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3959    echo $ac_n "(cached) $ac_c" 1>&6
3960   else
3961    cat > conftest.$ac_ext <<EOF
3962 < #line 3505 "configure"
3962 > #line 3963 "configure"
3963   #include "confdefs.h"
3964   #include <scsi.h sys/scsiio.h>
3965   EOF
3966   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3967 < { (eval echo configure:3510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3967 > { (eval echo configure:3968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3968   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3969   if test -z "$ac_err"; then
3970    rm -rf conftest*
# Line 3545 | Line 4003 | fi
4003      LIBS="$LIBS -lm"
4004      ;;
4005    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
4006   fi
4007 < if [ "x$SEMSRCS" != "x" ]; then
3555 <  SYSSRCS="$SYSSRCS $SEMSRCS"
3556 < fi
3557 <
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"
4007 > SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
4008  
4009   HAVE_I386=no
4010   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
4011 < echo "configure:3564: checking for x86 target CPU" >&5
4011 > echo "configure:4012: checking for x86 target CPU" >&5
4012   cat > conftest.$ac_ext <<EOF
4013 < #line 3566 "configure"
4013 > #line 4014 "configure"
4014   #include "confdefs.h"
4015  
4016   #ifdef __i386__
# Line 3581 | Line 4029 | fi
4029   rm -f conftest*
4030  
4031  
4032 + HAVE_SPARC=no
4033 + echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
4034 + echo "configure:4035: checking for SPARC target CPU" >&5
4035 + cat > conftest.$ac_ext <<EOF
4036 + #line 4037 "configure"
4037 + #include "confdefs.h"
4038 +
4039 + #ifdef __sparc__
4040 +  yes
4041 + #endif
4042 +
4043 + EOF
4044 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
4045 +  egrep "yes" >/dev/null 2>&1; then
4046 +  rm -rf conftest*
4047 +  echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes
4048 + else
4049 +  rm -rf conftest*
4050 +  echo "$ac_t""no" 1>&6
4051 + fi
4052 + rm -f conftest*
4053 +
4054 +
4055   HAVE_GAS=no
4056   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
4057 < echo "configure:3587: checking for GAS .p2align feature" >&5
4057 > echo "configure:4058: checking for GAS .p2align feature" >&5
4058   cat >conftest.S << EOF
4059          .text
4060          .p2align 5
# Line 3593 | Line 4064 | echo "$ac_t""$HAVE_GAS" 1>&6
4064  
4065   HAVE_GCC27=no
4066   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
4067 < echo "configure:3597: checking for GCC 2.7 or higher" >&5
4067 > echo "configure:4068: checking for GCC 2.7 or higher" >&5
4068   cat > conftest.$ac_ext <<EOF
4069 < #line 3599 "configure"
4069 > #line 4070 "configure"
4070   #include "confdefs.h"
4071   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
4072    yes
# Line 3618 | Line 4089 | if [ "x$HAVE_GCC27" = "xyes" ]; then
4089    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
4090   fi
4091  
4092 + WANT_X86_ASSEMBLY=no
4093 + WANT_SPARC_V8_ASSEMBLY=no
4094 + WANT_SPARC_V9_ASSEMBLY=no
4095 + CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
4096   if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
4097 <  DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4097 >    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4098    if [ "x$HAVE_GAS" = "xyes" ]; then
4099 +    WANT_X86_ASSEMBLY=yes
4100      DEFINES="$DEFINES -DX86_ASSEMBLY"
4101 <    CPUSRCS="$CPUSRCS cpufast.s"
3626 <  else
3627 <    CPUSRCS="$CPUSRCS cpuemu.cpp"
4101 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4102    fi
4103 < else
4104 <  CPUSRCS="$CPUSRCS cpuemu.cpp"
4103 > elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
4104 >    case "$MACHINE" in
4105 >  SunOS*)
4106 >    echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
4107 > echo "configure:4108: checking SPARC CPU architecture" >&5
4108 >    SPARC_TYPE=`Solaris/which_sparc`
4109 >    echo "$ac_t""$SPARC_TYPE" 1>&6
4110 >    case "$SPARC_TYPE" in
4111 >    SPARC_V8)
4112 >      WANT_SPARC_V8_ASSEMBLY=yes
4113 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
4114 >      CFLAGS="$CFLAGS -Wa,-Av8"
4115 >      CXXFLAGS="$CXXFLAGS -Wa,-Av8"
4116 >      ;;
4117 >    SPARC_V9)
4118 >      WANT_SPARC_V9_ASSEMBLY=yes
4119 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
4120 >      CFLAGS="$CFLAGS -Wa,-Av9"
4121 >      CXXFLAGS="$CXXFLAGS -Wa,-Av9"
4122 >      ;;
4123 >    esac
4124 >    ;;
4125 >  esac
4126   fi
4127  
4128 + CPUINCLUDES="-I../uae_cpu"
4129 + 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"
4130  
4131  
4132  
# Line 3769 | Line 4266 | s%@oldincludedir@%$oldincludedir%g
4266   s%@infodir@%$infodir%g
4267   s%@mandir@%$mandir%g
4268   s%@CC@%$CC%g
3772 s%@CXX@%$CXX%g
4269   s%@CPP@%$CPP%g
4270 + s%@CXX@%$CXX%g
4271   s%@SET_MAKE@%$SET_MAKE%g
4272   s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
4273   s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
# Line 3782 | Line 4279 | s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
4279   s%@GTK_CONFIG@%$GTK_CONFIG%g
4280   s%@GTK_CFLAGS@%$GTK_CFLAGS%g
4281   s%@GTK_LIBS@%$GTK_LIBS%g
4282 + s%@ESD_CONFIG@%$ESD_CONFIG%g
4283 + s%@ESD_CFLAGS@%$ESD_CFLAGS%g
4284 + s%@ESD_LIBS@%$ESD_LIBS%g
4285   s%@DEFINES@%$DEFINES%g
3786 s%@STATICLIBS@%$STATICLIBS%g
4286   s%@SYSSRCS@%$SYSSRCS%g
4287   s%@CPUINCLUDES@%$CPUINCLUDES%g
4288   s%@CPUSRCS@%$CPUSRCS%g
# Line 4006 | Line 4505 | chmod +x $CONFIG_STATUS
4505   rm -fr confdefs* $ac_clean_files
4506   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
4507  
4508 +
4509 + echo
4510 + echo Basilisk II configuration summary:
4511 + echo
4512 + echo XFree86 DGA support .............. : $WANT_XF86_DGA
4513 + echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
4514 + echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4515 + echo ESD sound support ................ : $WANT_ESD
4516 + echo GTK user interface ............... : $WANT_GTK
4517 + echo mon debugger support ............. : $WANT_MON
4518 + echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4519 + echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
4520 + echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
4521 + echo
4522   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines