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.20 by cebix, 2000-07-22T18:12:31Z

# 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 + HAVE_I386=no
1159 + echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
1160 + echo "configure:1161: checking for x86 target CPU" >&5
1161 + cat > conftest.$ac_ext <<EOF
1162 + #line 1163 "configure"
1163 + #include "confdefs.h"
1164 +
1165 + #ifdef __i386__
1166 +  yes
1167 + #endif
1168 +
1169 + EOF
1170 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1171 +  egrep "yes" >/dev/null 2>&1; then
1172 +  rm -rf conftest*
1173 +  echo "$ac_t""yes" 1>&6; HAVE_I386=yes
1174 + else
1175 +  rm -rf conftest*
1176 +  echo "$ac_t""no" 1>&6
1177 + fi
1178 + rm -f conftest*
1179 +
1180 +
1181 + HAVE_SPARC=no
1182 + echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
1183 + echo "configure:1184: checking for SPARC target CPU" >&5
1184 + cat > conftest.$ac_ext <<EOF
1185 + #line 1186 "configure"
1186 + #include "confdefs.h"
1187 +
1188 + #ifdef __sparc__
1189 +  yes
1190 + #endif
1191 +
1192 + EOF
1193 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1194 +  egrep "yes" >/dev/null 2>&1; then
1195 +  rm -rf conftest*
1196 +  echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes
1197 + else
1198 +  rm -rf conftest*
1199 +  echo "$ac_t""no" 1>&6
1200 + fi
1201 + rm -f conftest*
1202 +
1203 +
1204 + HAVE_M68K=no
1205 + echo $ac_n "checking for m68k target CPU""... $ac_c" 1>&6
1206 + echo "configure:1207: checking for m68k target CPU" >&5
1207 + cat > conftest.$ac_ext <<EOF
1208 + #line 1209 "configure"
1209 + #include "confdefs.h"
1210 +
1211 + #ifdef __m68k__
1212 +  yes
1213 + #endif
1214 +
1215 + EOF
1216 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1217 +  egrep "yes" >/dev/null 2>&1; then
1218 +  rm -rf conftest*
1219 +  echo "$ac_t""yes" 1>&6; HAVE_M68K=yes
1220 + else
1221 +  rm -rf conftest*
1222 +  echo "$ac_t""no" 1>&6
1223 + fi
1224 + rm -f conftest*
1225 +
1226 +
1227 + MONSRCS=
1228 + if [ "x$WANT_MON" = "xyes" ]; then
1229 +  echo $ac_n "checking for mon""... $ac_c" 1>&6
1230 + echo "configure:1231: checking for mon" >&5
1231 +  if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1232 +    echo "$ac_t""yes" 1>&6
1233 +    cat >> confdefs.h <<\EOF
1234 + #define ENABLE_MON 1
1235 + EOF
1236 +
1237 +    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"
1238 +    CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1239 +    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
1240 + echo "configure:1241: checking for readline in -lreadline" >&5
1241 + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
1242 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1243 +  echo $ac_n "(cached) $ac_c" 1>&6
1244 + else
1245 +  ac_save_LIBS="$LIBS"
1246 + LIBS="-lreadline  $LIBS"
1247 + cat > conftest.$ac_ext <<EOF
1248 + #line 1249 "configure"
1249 + #include "confdefs.h"
1250 + /* Override any gcc2 internal prototype to avoid an error.  */
1251 + /* We use char because int might match the return type of a gcc2
1252 +    builtin and then its argument prototype would still apply.  */
1253 + char readline();
1254 +
1255 + int main() {
1256 + readline()
1257 + ; return 0; }
1258 + EOF
1259 + if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1260 +  rm -rf conftest*
1261 +  eval "ac_cv_lib_$ac_lib_var=yes"
1262 + else
1263 +  echo "configure: failed program was:" >&5
1264 +  cat conftest.$ac_ext >&5
1265 +  rm -rf conftest*
1266 +  eval "ac_cv_lib_$ac_lib_var=no"
1267 + fi
1268 + rm -f conftest*
1269 + LIBS="$ac_save_LIBS"
1270 +
1271 + fi
1272 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1273 +  echo "$ac_t""yes" 1>&6
1274 +    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1275 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1276 +  cat >> confdefs.h <<EOF
1277 + #define $ac_tr_lib 1
1278 + EOF
1279 +
1280 +  LIBS="-lreadline $LIBS"
1281 +
1282 + else
1283 +  echo "$ac_t""no" 1>&6
1284 + fi
1285 +
1286 +    echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6
1287 + echo "configure:1288: checking for tputs in -ltermcap" >&5
1288 + ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-%__p_%'`
1289 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1290 +  echo $ac_n "(cached) $ac_c" 1>&6
1291 + else
1292 +  ac_save_LIBS="$LIBS"
1293 + LIBS="-ltermcap  $LIBS"
1294 + cat > conftest.$ac_ext <<EOF
1295 + #line 1296 "configure"
1296 + #include "confdefs.h"
1297 + /* Override any gcc2 internal prototype to avoid an error.  */
1298 + /* We use char because int might match the return type of a gcc2
1299 +    builtin and then its argument prototype would still apply.  */
1300 + char tputs();
1301 +
1302 + int main() {
1303 + tputs()
1304 + ; return 0; }
1305 + EOF
1306 + if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1307 +  rm -rf conftest*
1308 +  eval "ac_cv_lib_$ac_lib_var=yes"
1309 + else
1310 +  echo "configure: failed program was:" >&5
1311 +  cat conftest.$ac_ext >&5
1312 +  rm -rf conftest*
1313 +  eval "ac_cv_lib_$ac_lib_var=no"
1314 + fi
1315 + rm -f conftest*
1316 + LIBS="$ac_save_LIBS"
1317 +
1318 + fi
1319 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1320 +  echo "$ac_t""yes" 1>&6
1321 +    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1322 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1323 +  cat >> confdefs.h <<EOF
1324 + #define $ac_tr_lib 1
1325 + EOF
1326 +
1327 +  LIBS="-ltermcap $LIBS"
1328 +
1329 + else
1330 +  echo "$ac_t""no" 1>&6
1331 + fi
1332 +
1333 +    for ac_hdr in readline.h history.h readline/readline.h readline/history.h
1334 + do
1335 + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1336 + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1337 + echo "configure:1338: checking for $ac_hdr" >&5
1338 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1339 +  echo $ac_n "(cached) $ac_c" 1>&6
1340 + else
1341 +  cat > conftest.$ac_ext <<EOF
1342 + #line 1343 "configure"
1343 + #include "confdefs.h"
1344 + #include <$ac_hdr>
1345 + EOF
1346 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1347 + { (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1348 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1349 + if test -z "$ac_err"; then
1350 +  rm -rf conftest*
1351 +  eval "ac_cv_header_$ac_safe=yes"
1352 + else
1353 +  echo "$ac_err" >&5
1354 +  echo "configure: failed program was:" >&5
1355 +  cat conftest.$ac_ext >&5
1356 +  rm -rf conftest*
1357 +  eval "ac_cv_header_$ac_safe=no"
1358 + fi
1359 + rm -f conftest*
1360 + fi
1361 + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
1362 +  echo "$ac_t""yes" 1>&6
1363 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
1364 +  cat >> confdefs.h <<EOF
1365 + #define $ac_tr_hdr 1
1366 + EOF
1367 +
1368 + else
1369 +  echo "$ac_t""no" 1>&6
1370 + fi
1371 + done
1372 +
1373 +  else
1374 +    echo "$ac_t""no" 1>&6
1375 +    echo "configure: warning: Could not find mon, ignoring --with-mon." 1>&2
1376 +    WANT_MON=no
1377 +  fi
1378 + fi
1379 +
1380 + echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1381 + echo "configure:1382: checking for sem_init in -lposix4" >&5
1382 + ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1383 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1384 +  echo $ac_n "(cached) $ac_c" 1>&6
1385 + else
1386 +  ac_save_LIBS="$LIBS"
1387 + LIBS="-lposix4  $LIBS"
1388 + cat > conftest.$ac_ext <<EOF
1389 + #line 1390 "configure"
1390 + #include "confdefs.h"
1391 + /* Override any gcc2 internal prototype to avoid an error.  */
1392 + /* We use char because int might match the return type of a gcc2
1393 +    builtin and then its argument prototype would still apply.  */
1394 + char sem_init();
1395 +
1396 + int main() {
1397 + sem_init()
1398 + ; return 0; }
1399 + EOF
1400 + if { (eval echo configure:1401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1401 +  rm -rf conftest*
1402 +  eval "ac_cv_lib_$ac_lib_var=yes"
1403 + else
1404 +  echo "configure: failed program was:" >&5
1405 +  cat conftest.$ac_ext >&5
1406 +  rm -rf conftest*
1407 +  eval "ac_cv_lib_$ac_lib_var=no"
1408 + fi
1409 + rm -f conftest*
1410 + LIBS="$ac_save_LIBS"
1411 +
1412 + fi
1413 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1414 +  echo "$ac_t""yes" 1>&6
1415 +    ac_tr_lib=HAVE_LIB`echo posix4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1416 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1417 +  cat >> confdefs.h <<EOF
1418 + #define $ac_tr_lib 1
1419 + EOF
1420 +
1421 +  LIBS="-lposix4 $LIBS"
1422 +
1423 + else
1424 +  echo "$ac_t""no" 1>&6
1425 + fi
1426 +
1427 +
1428   # If we find X, set shell vars x_includes and x_libraries to the
1429   # paths, otherwise set no_x=yes.
1430   # Uses ac_ vars as temps to allow command line to override cache and checks.
1431   # --without-x overrides everything else, but does not touch the cache.
1432   echo $ac_n "checking for X""... $ac_c" 1>&6
1433 < echo "configure:1116: checking for X" >&5
1433 > echo "configure:1434: checking for X" >&5
1434  
1435   # Check whether --with-x or --without-x was given.
1436   if test "${with_x+set}" = set; then
# Line 1174 | Line 1492 | if test "$ac_x_includes" = NO; then
1492  
1493    # First, try using that file with no special directory specified.
1494   cat > conftest.$ac_ext <<EOF
1495 < #line 1178 "configure"
1495 > #line 1496 "configure"
1496   #include "confdefs.h"
1497   #include <$x_direct_test_include>
1498   EOF
1499   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1500 < { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1500 > { (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1501   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1502   if test -z "$ac_err"; then
1503    rm -rf conftest*
# Line 1248 | Line 1566 | if test "$ac_x_libraries" = NO; then
1566    ac_save_LIBS="$LIBS"
1567    LIBS="-l$x_direct_test_library $LIBS"
1568   cat > conftest.$ac_ext <<EOF
1569 < #line 1252 "configure"
1569 > #line 1570 "configure"
1570   #include "confdefs.h"
1571  
1572   int main() {
1573   ${x_direct_test_function}()
1574   ; return 0; }
1575   EOF
1576 < if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1576 > if { (eval echo configure:1577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1577    rm -rf conftest*
1578    LIBS="$ac_save_LIBS"
1579   # We can link X programs with no special library path.
# Line 1361 | Line 1679 | else
1679      case "`(uname -sr) 2>/dev/null`" in
1680      "SunOS 5"*)
1681        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1682 < echo "configure:1365: checking whether -R must be followed by a space" >&5
1682 > echo "configure:1683: checking whether -R must be followed by a space" >&5
1683        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1684        cat > conftest.$ac_ext <<EOF
1685 < #line 1368 "configure"
1685 > #line 1686 "configure"
1686   #include "confdefs.h"
1687  
1688   int main() {
1689  
1690   ; return 0; }
1691   EOF
1692 < if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1692 > if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1693    rm -rf conftest*
1694    ac_R_nospace=yes
1695   else
# Line 1387 | Line 1705 | rm -f conftest*
1705        else
1706          LIBS="$ac_xsave_LIBS -R $x_libraries"
1707          cat > conftest.$ac_ext <<EOF
1708 < #line 1391 "configure"
1708 > #line 1709 "configure"
1709   #include "confdefs.h"
1710  
1711   int main() {
1712  
1713   ; return 0; }
1714   EOF
1715 < if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1715 > if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1716    rm -rf conftest*
1717    ac_R_space=yes
1718   else
# Line 1426 | Line 1744 | rm -f conftest*
1744      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1745      # the Alpha needs dnet_stub (dnet does not exist).
1746      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1747 < echo "configure:1430: checking for dnet_ntoa in -ldnet" >&5
1747 > echo "configure:1748: checking for dnet_ntoa in -ldnet" >&5
1748   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1749   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1750    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1434 | Line 1752 | else
1752    ac_save_LIBS="$LIBS"
1753   LIBS="-ldnet  $LIBS"
1754   cat > conftest.$ac_ext <<EOF
1755 < #line 1438 "configure"
1755 > #line 1756 "configure"
1756   #include "confdefs.h"
1757   /* Override any gcc2 internal prototype to avoid an error.  */
1758   /* We use char because int might match the return type of a gcc2
# Line 1445 | Line 1763 | int main() {
1763   dnet_ntoa()
1764   ; return 0; }
1765   EOF
1766 < if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1766 > if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1767    rm -rf conftest*
1768    eval "ac_cv_lib_$ac_lib_var=yes"
1769   else
# Line 1467 | Line 1785 | fi
1785  
1786      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1787        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1788 < echo "configure:1471: checking for dnet_ntoa in -ldnet_stub" >&5
1788 > echo "configure:1789: checking for dnet_ntoa in -ldnet_stub" >&5
1789   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1790   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1791    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1475 | Line 1793 | else
1793    ac_save_LIBS="$LIBS"
1794   LIBS="-ldnet_stub  $LIBS"
1795   cat > conftest.$ac_ext <<EOF
1796 < #line 1479 "configure"
1796 > #line 1797 "configure"
1797   #include "confdefs.h"
1798   /* Override any gcc2 internal prototype to avoid an error.  */
1799   /* We use char because int might match the return type of a gcc2
# Line 1486 | Line 1804 | int main() {
1804   dnet_ntoa()
1805   ; return 0; }
1806   EOF
1807 < if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1807 > if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1808    rm -rf conftest*
1809    eval "ac_cv_lib_$ac_lib_var=yes"
1810   else
# Line 1515 | Line 1833 | fi
1833      # The nsl library prevents programs from opening the X display
1834      # on Irix 5.2, according to dickey@clark.net.
1835      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1836 < echo "configure:1519: checking for gethostbyname" >&5
1836 > echo "configure:1837: checking for gethostbyname" >&5
1837   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1838    echo $ac_n "(cached) $ac_c" 1>&6
1839   else
1840    cat > conftest.$ac_ext <<EOF
1841 < #line 1524 "configure"
1841 > #line 1842 "configure"
1842   #include "confdefs.h"
1843   /* System header to define __stub macros and hopefully few prototypes,
1844      which can conflict with char gethostbyname(); below.  */
# Line 1543 | Line 1861 | gethostbyname();
1861  
1862   ; return 0; }
1863   EOF
1864 < if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1864 > if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1865    rm -rf conftest*
1866    eval "ac_cv_func_gethostbyname=yes"
1867   else
# Line 1564 | Line 1882 | fi
1882  
1883      if test $ac_cv_func_gethostbyname = no; then
1884        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1885 < echo "configure:1568: checking for gethostbyname in -lnsl" >&5
1885 > echo "configure:1886: checking for gethostbyname in -lnsl" >&5
1886   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1887   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1888    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1572 | Line 1890 | else
1890    ac_save_LIBS="$LIBS"
1891   LIBS="-lnsl  $LIBS"
1892   cat > conftest.$ac_ext <<EOF
1893 < #line 1576 "configure"
1893 > #line 1894 "configure"
1894   #include "confdefs.h"
1895   /* Override any gcc2 internal prototype to avoid an error.  */
1896   /* We use char because int might match the return type of a gcc2
# Line 1583 | Line 1901 | int main() {
1901   gethostbyname()
1902   ; return 0; }
1903   EOF
1904 < if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1904 > if { (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1905    rm -rf conftest*
1906    eval "ac_cv_lib_$ac_lib_var=yes"
1907   else
# Line 1613 | Line 1931 | fi
1931      # -lsocket must be given before -lnsl if both are needed.
1932      # We assume that if connect needs -lnsl, so does gethostbyname.
1933      echo $ac_n "checking for connect""... $ac_c" 1>&6
1934 < echo "configure:1617: checking for connect" >&5
1934 > echo "configure:1935: checking for connect" >&5
1935   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1936    echo $ac_n "(cached) $ac_c" 1>&6
1937   else
1938    cat > conftest.$ac_ext <<EOF
1939 < #line 1622 "configure"
1939 > #line 1940 "configure"
1940   #include "confdefs.h"
1941   /* System header to define __stub macros and hopefully few prototypes,
1942      which can conflict with char connect(); below.  */
# Line 1641 | Line 1959 | connect();
1959  
1960   ; return 0; }
1961   EOF
1962 < if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1962 > if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1963    rm -rf conftest*
1964    eval "ac_cv_func_connect=yes"
1965   else
# Line 1662 | Line 1980 | fi
1980  
1981      if test $ac_cv_func_connect = no; then
1982        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1983 < echo "configure:1666: checking for connect in -lsocket" >&5
1983 > echo "configure:1984: checking for connect in -lsocket" >&5
1984   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1985   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1986    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1670 | Line 1988 | else
1988    ac_save_LIBS="$LIBS"
1989   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1990   cat > conftest.$ac_ext <<EOF
1991 < #line 1674 "configure"
1991 > #line 1992 "configure"
1992   #include "confdefs.h"
1993   /* Override any gcc2 internal prototype to avoid an error.  */
1994   /* We use char because int might match the return type of a gcc2
# Line 1681 | Line 1999 | int main() {
1999   connect()
2000   ; return 0; }
2001   EOF
2002 < if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2002 > if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2003    rm -rf conftest*
2004    eval "ac_cv_lib_$ac_lib_var=yes"
2005   else
# Line 1705 | Line 2023 | fi
2023  
2024      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
2025      echo $ac_n "checking for remove""... $ac_c" 1>&6
2026 < echo "configure:1709: checking for remove" >&5
2026 > echo "configure:2027: checking for remove" >&5
2027   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
2028    echo $ac_n "(cached) $ac_c" 1>&6
2029   else
2030    cat > conftest.$ac_ext <<EOF
2031 < #line 1714 "configure"
2031 > #line 2032 "configure"
2032   #include "confdefs.h"
2033   /* System header to define __stub macros and hopefully few prototypes,
2034      which can conflict with char remove(); below.  */
# Line 1733 | Line 2051 | remove();
2051  
2052   ; return 0; }
2053   EOF
2054 < if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2054 > if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2055    rm -rf conftest*
2056    eval "ac_cv_func_remove=yes"
2057   else
# Line 1754 | Line 2072 | fi
2072  
2073      if test $ac_cv_func_remove = no; then
2074        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
2075 < echo "configure:1758: checking for remove in -lposix" >&5
2075 > echo "configure:2076: checking for remove in -lposix" >&5
2076   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
2077   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2078    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1762 | Line 2080 | else
2080    ac_save_LIBS="$LIBS"
2081   LIBS="-lposix  $LIBS"
2082   cat > conftest.$ac_ext <<EOF
2083 < #line 1766 "configure"
2083 > #line 2084 "configure"
2084   #include "confdefs.h"
2085   /* Override any gcc2 internal prototype to avoid an error.  */
2086   /* We use char because int might match the return type of a gcc2
# Line 1773 | Line 2091 | int main() {
2091   remove()
2092   ; return 0; }
2093   EOF
2094 < if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2094 > if { (eval echo configure:2095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2095    rm -rf conftest*
2096    eval "ac_cv_lib_$ac_lib_var=yes"
2097   else
# Line 1797 | Line 2115 | fi
2115  
2116      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
2117      echo $ac_n "checking for shmat""... $ac_c" 1>&6
2118 < echo "configure:1801: checking for shmat" >&5
2118 > echo "configure:2119: checking for shmat" >&5
2119   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
2120    echo $ac_n "(cached) $ac_c" 1>&6
2121   else
2122    cat > conftest.$ac_ext <<EOF
2123 < #line 1806 "configure"
2123 > #line 2124 "configure"
2124   #include "confdefs.h"
2125   /* System header to define __stub macros and hopefully few prototypes,
2126      which can conflict with char shmat(); below.  */
# Line 1825 | Line 2143 | shmat();
2143  
2144   ; return 0; }
2145   EOF
2146 < if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2146 > if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2147    rm -rf conftest*
2148    eval "ac_cv_func_shmat=yes"
2149   else
# Line 1846 | Line 2164 | fi
2164  
2165      if test $ac_cv_func_shmat = no; then
2166        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
2167 < echo "configure:1850: checking for shmat in -lipc" >&5
2167 > echo "configure:2168: checking for shmat in -lipc" >&5
2168   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
2169   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2170    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1854 | Line 2172 | else
2172    ac_save_LIBS="$LIBS"
2173   LIBS="-lipc  $LIBS"
2174   cat > conftest.$ac_ext <<EOF
2175 < #line 1858 "configure"
2175 > #line 2176 "configure"
2176   #include "confdefs.h"
2177   /* Override any gcc2 internal prototype to avoid an error.  */
2178   /* We use char because int might match the return type of a gcc2
# Line 1865 | Line 2183 | int main() {
2183   shmat()
2184   ; return 0; }
2185   EOF
2186 < if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2186 > if { (eval echo configure:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2187    rm -rf conftest*
2188    eval "ac_cv_lib_$ac_lib_var=yes"
2189   else
# Line 1898 | Line 2216 | fi
2216    # libraries we check for below, so use a different variable.
2217    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
2218    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
2219 < echo "configure:1902: checking for IceConnectionNumber in -lICE" >&5
2219 > echo "configure:2220: checking for IceConnectionNumber in -lICE" >&5
2220   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
2221   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2222    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1906 | Line 2224 | else
2224    ac_save_LIBS="$LIBS"
2225   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
2226   cat > conftest.$ac_ext <<EOF
2227 < #line 1910 "configure"
2227 > #line 2228 "configure"
2228   #include "confdefs.h"
2229   /* Override any gcc2 internal prototype to avoid an error.  */
2230   /* We use char because int might match the return type of a gcc2
# Line 1917 | Line 2235 | int main() {
2235   IceConnectionNumber()
2236   ; return 0; }
2237   EOF
2238 < if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2238 > if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2239    rm -rf conftest*
2240    eval "ac_cv_lib_$ac_lib_var=yes"
2241   else
# Line 1944 | Line 2262 | fi
2262   if [ "x$no_x" = "xyes" ]; then
2263    { echo "configure: error: You need X11 to run Basilisk II." 1>&2; exit 1; }
2264   fi
1947 –
2265   CFLAGS="$CFLAGS $X_CFLAGS"
2266   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2267   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
1951 – STATICLIBS=
2268  
2269 + HAVE_PTHREADS=yes
2270   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2271 < echo "configure:1955: checking for pthread_create in -lpthread" >&5
2271 > echo "configure:2272: checking for pthread_create in -lpthread" >&5
2272   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2273   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2274    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1959 | Line 2276 | else
2276    ac_save_LIBS="$LIBS"
2277   LIBS="-lpthread  $LIBS"
2278   cat > conftest.$ac_ext <<EOF
2279 < #line 1963 "configure"
2279 > #line 2280 "configure"
2280   #include "confdefs.h"
2281   /* Override any gcc2 internal prototype to avoid an error.  */
2282   /* We use char because int might match the return type of a gcc2
# Line 1970 | Line 2287 | int main() {
2287   pthread_create()
2288   ; return 0; }
2289   EOF
2290 < if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2290 > if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2291    rm -rf conftest*
2292    eval "ac_cv_lib_$ac_lib_var=yes"
2293   else
# Line 1985 | Line 2302 | LIBS="$ac_save_LIBS"
2302   fi
2303   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2304    echo "$ac_t""yes" 1>&6
2305 <  HAVE_PTHREADS=yes
2305 >    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2306 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2307 >  cat >> confdefs.h <<EOF
2308 > #define $ac_tr_lib 1
2309 > EOF
2310 >
2311 >  LIBS="-lpthread $LIBS"
2312 >
2313   else
2314    echo "$ac_t""no" 1>&6
1991 – HAVE_PTHREADS=no
1992 – fi
2315  
2316 < if [ "x$HAVE_PTHREADS" = "xno" ]; then
2317 <    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
2316 >  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2317 > echo "configure:2318: checking for pthread_create in -lc_r" >&5
2318   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2319   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2320    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2001 | Line 2322 | else
2322    ac_save_LIBS="$LIBS"
2323   LIBS="-lc_r  $LIBS"
2324   cat > conftest.$ac_ext <<EOF
2325 < #line 2005 "configure"
2325 > #line 2326 "configure"
2326   #include "confdefs.h"
2327   /* Override any gcc2 internal prototype to avoid an error.  */
2328   /* We use char because int might match the return type of a gcc2
# Line 2012 | Line 2333 | int main() {
2333   pthread_create()
2334   ; return 0; }
2335   EOF
2336 < if { (eval echo configure:2016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2336 > if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2337    rm -rf conftest*
2338    eval "ac_cv_lib_$ac_lib_var=yes"
2339   else
# Line 2027 | Line 2348 | LIBS="$ac_save_LIBS"
2348   fi
2349   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2350    echo "$ac_t""yes" 1>&6
2351 <  HAVE_PTHREADS=yes
2351 >    ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2352 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2353 >  cat >> confdefs.h <<EOF
2354 > #define $ac_tr_lib 1
2355 > EOF
2356 >
2357 >  LIBS="-lc_r $LIBS"
2358 >
2359   else
2360    echo "$ac_t""no" 1>&6
2361 < HAVE_PTHREADS=no
2361 >
2362 >    echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2363 > echo "configure:2364: checking for pthread_create in -lPTL" >&5
2364 > ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2365 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2366 >  echo $ac_n "(cached) $ac_c" 1>&6
2367 > else
2368 >  ac_save_LIBS="$LIBS"
2369 > LIBS="-lPTL  $LIBS"
2370 > cat > conftest.$ac_ext <<EOF
2371 > #line 2372 "configure"
2372 > #include "confdefs.h"
2373 > /* Override any gcc2 internal prototype to avoid an error.  */
2374 > /* We use char because int might match the return type of a gcc2
2375 >    builtin and then its argument prototype would still apply.  */
2376 > char pthread_create();
2377 >
2378 > int main() {
2379 > pthread_create()
2380 > ; return 0; }
2381 > EOF
2382 > if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2383 >  rm -rf conftest*
2384 >  eval "ac_cv_lib_$ac_lib_var=yes"
2385 > else
2386 >  echo "configure: failed program was:" >&5
2387 >  cat conftest.$ac_ext >&5
2388 >  rm -rf conftest*
2389 >  eval "ac_cv_lib_$ac_lib_var=no"
2390   fi
2391 + rm -f conftest*
2392 + LIBS="$ac_save_LIBS"
2393 +
2394 + fi
2395 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2396 +  echo "$ac_t""yes" 1>&6
2397 +    ac_tr_lib=HAVE_LIB`echo PTL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2398 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2399 +  cat >> confdefs.h <<EOF
2400 + #define $ac_tr_lib 1
2401 + EOF
2402 +
2403 +  LIBS="-lPTL $LIBS"
2404  
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
2405   else
2406 <  LIBS="$LIBS -lpthread"
2406 >  echo "$ac_t""no" 1>&6
2407 >
2408 >      HAVE_PTHREADS=no
2409 >    
2410 > fi
2411 >
2412 >  
2413 > fi
2414 >
2415 >
2416 > fi
2417 >
2418 > if [ "x$HAVE_PTHREADS" = "xyes" ]; then
2419 >  cat >> confdefs.h <<\EOF
2420 > #define HAVE_PTHREADS 1
2421 > EOF
2422 >
2423   fi
2424   for ac_func in pthread_cancel
2425   do
2426   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2427 < echo "configure:2048: checking for $ac_func" >&5
2427 > echo "configure:2428: checking for $ac_func" >&5
2428 > if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2429 >  echo $ac_n "(cached) $ac_c" 1>&6
2430 > else
2431 >  cat > conftest.$ac_ext <<EOF
2432 > #line 2433 "configure"
2433 > #include "confdefs.h"
2434 > /* System header to define __stub macros and hopefully few prototypes,
2435 >    which can conflict with char $ac_func(); below.  */
2436 > #include <assert.h>
2437 > /* Override any gcc2 internal prototype to avoid an error.  */
2438 > /* We use char because int might match the return type of a gcc2
2439 >    builtin and then its argument prototype would still apply.  */
2440 > char $ac_func();
2441 >
2442 > int main() {
2443 >
2444 > /* The GNU C library defines this for functions which it implements
2445 >    to always fail with ENOSYS.  Some functions are actually named
2446 >    something starting with __ and the normal name is an alias.  */
2447 > #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
2448 > choke me
2449 > #else
2450 > $ac_func();
2451 > #endif
2452 >
2453 > ; return 0; }
2454 > EOF
2455 > if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2456 >  rm -rf conftest*
2457 >  eval "ac_cv_func_$ac_func=yes"
2458 > else
2459 >  echo "configure: failed program was:" >&5
2460 >  cat conftest.$ac_ext >&5
2461 >  rm -rf conftest*
2462 >  eval "ac_cv_func_$ac_func=no"
2463 > fi
2464 > rm -f conftest*
2465 > fi
2466 >
2467 > if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2468 >  echo "$ac_t""yes" 1>&6
2469 >    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2470 >  cat >> confdefs.h <<EOF
2471 > #define $ac_tr_func 1
2472 > EOF
2473 >
2474 > else
2475 >  echo "$ac_t""no" 1>&6
2476 > fi
2477 > done
2478 >
2479 >
2480 > SEMSRC=
2481 > for ac_func in sem_init
2482 > do
2483 > echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2484 > echo "configure:2485: checking for $ac_func" >&5
2485   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2486    echo $ac_n "(cached) $ac_c" 1>&6
2487   else
2488    cat > conftest.$ac_ext <<EOF
2489 < #line 2053 "configure"
2489 > #line 2490 "configure"
2490   #include "confdefs.h"
2491   /* System header to define __stub macros and hopefully few prototypes,
2492      which can conflict with char $ac_func(); below.  */
# Line 2072 | Line 2509 | $ac_func();
2509  
2510   ; return 0; }
2511   EOF
2512 < if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2512 > if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2513    rm -rf conftest*
2514    eval "ac_cv_func_$ac_func=yes"
2515   else
# Line 2093 | Line 2530 | EOF
2530  
2531   else
2532    echo "$ac_t""no" 1>&6
2533 + if  "x$HAVE_PTHREADS" = "xyes" ; then
2534 +    SEMSRC=posix_sem.cpp
2535 +  fi
2536 +
2537   fi
2538   done
2539  
2540  
2541 < if [ "x$WANT_DGA" = "xyes" ]; then
2541 > if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2542    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2543 < echo "configure:2103: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2543 > echo "configure:2544: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2544   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2545   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2546    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2107 | Line 2548 | else
2548    ac_save_LIBS="$LIBS"
2549   LIBS="-lXxf86dga  $LIBS"
2550   cat > conftest.$ac_ext <<EOF
2551 < #line 2111 "configure"
2551 > #line 2552 "configure"
2552   #include "confdefs.h"
2553   /* Override any gcc2 internal prototype to avoid an error.  */
2554   /* We use char because int might match the return type of a gcc2
# Line 2118 | Line 2559 | int main() {
2559   XF86DGAQueryExtension()
2560   ; return 0; }
2561   EOF
2562 < if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2562 > if { (eval echo configure:2563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2563    rm -rf conftest*
2564    eval "ac_cv_lib_$ac_lib_var=yes"
2565   else
# Line 2133 | Line 2574 | LIBS="$ac_save_LIBS"
2574   fi
2575   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2576    echo "$ac_t""yes" 1>&6
2577 <  HAVE_DGA=yes
2577 >  
2578 >    cat >> confdefs.h <<\EOF
2579 > #define ENABLE_XF86_DGA 1
2580 > EOF
2581 >
2582 >    LIBS="$LIBS -lXxf86dga"
2583 >    if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2584 >      echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2
2585 >      WANT_FBDEV_DGA=no
2586 >    fi
2587 >  
2588   else
2589    echo "$ac_t""no" 1>&6
2590 < HAVE_DGA=no
2590 >
2591 >    echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2592 >    WANT_XF86_DGA=no
2593 >  
2594   fi
2595  
2596 <  if [ "x$HAVE_DGA" = "xno" ]; then
2597 <    echo "configure: warning: Could not find DGA extension, ignoring --enable-dga." 1>&2
2598 <  else
2599 <    DEFINES="$DEFINES -DENABLE_DGA=1"
2600 <    LIBS="$LIBS -lXxf86dga"
2601 <  fi
2596 > fi
2597 > if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2598 >  cat >> confdefs.h <<\EOF
2599 > #define ENABLE_FBDEV_DGA 1
2600 > EOF
2601 >
2602   fi
2603  
2604 < if [ "x$WANT_UI" = "xyes" ]; then
2604 > if [ "x$WANT_XF86_VIDMODE" = "xyes" ]; then
2605 >  echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
2606 > echo "configure:2607: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
2607 > ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'`
2608 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2609 >  echo $ac_n "(cached) $ac_c" 1>&6
2610 > else
2611 >  ac_save_LIBS="$LIBS"
2612 > LIBS="-lXxf86vm  $LIBS"
2613 > cat > conftest.$ac_ext <<EOF
2614 > #line 2615 "configure"
2615 > #include "confdefs.h"
2616 > /* Override any gcc2 internal prototype to avoid an error.  */
2617 > /* We use char because int might match the return type of a gcc2
2618 >    builtin and then its argument prototype would still apply.  */
2619 > char XF86VidModeQueryExtension();
2620 >
2621 > int main() {
2622 > XF86VidModeQueryExtension()
2623 > ; return 0; }
2624 > EOF
2625 > if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2626 >  rm -rf conftest*
2627 >  eval "ac_cv_lib_$ac_lib_var=yes"
2628 > else
2629 >  echo "configure: failed program was:" >&5
2630 >  cat conftest.$ac_ext >&5
2631 >  rm -rf conftest*
2632 >  eval "ac_cv_lib_$ac_lib_var=no"
2633 > fi
2634 > rm -f conftest*
2635 > LIBS="$ac_save_LIBS"
2636 >
2637 > fi
2638 > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2639 >  echo "$ac_t""yes" 1>&6
2640 >  
2641 >    cat >> confdefs.h <<\EOF
2642 > #define ENABLE_XF86_VIDMODE 1
2643 > EOF
2644 >
2645 >    LIBS="$LIBS -lXxf86vm"
2646 >  
2647 > else
2648 >  echo "$ac_t""no" 1>&6
2649 >
2650 >    echo "configure: warning: Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode." 1>&2
2651 >    WANT_XF86_VIDMODE=no
2652 >  
2653 > fi
2654 >
2655 > fi
2656 >
2657 > UISRCS=../dummy/prefs_editor_dummy.cpp
2658 > if [ "x$WANT_GTK" = "xyes" ]; then
2659    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2660   if test "${with_gtk_prefix+set}" = set; then
2661    withval="$with_gtk_prefix"
# Line 2173 | Line 2681 | else
2681   fi
2682  
2683  
2684 +  for module in .
2685 +  do
2686 +      case "$module" in
2687 +         gthread)
2688 +             gtk_config_args="$gtk_config_args gthread"
2689 +         ;;
2690 +      esac
2691 +  done
2692 +
2693    if test x$gtk_config_exec_prefix != x ; then
2694       gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
2695       if test x${GTK_CONFIG+set} != xset ; then
# Line 2189 | Line 2706 | fi
2706    # Extract the first word of "gtk-config", so it can be a program name with args.
2707   set dummy gtk-config; ac_word=$2
2708   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2709 < echo "configure:2193: checking for $ac_word" >&5
2709 > echo "configure:2710: checking for $ac_word" >&5
2710   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2711    echo $ac_n "(cached) $ac_c" 1>&6
2712   else
# Line 2224 | Line 2741 | fi
2741  
2742    min_gtk_version=1.2.0
2743    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2744 < echo "configure:2228: checking for GTK - version >= $min_gtk_version" >&5
2744 > echo "configure:2745: checking for GTK - version >= $min_gtk_version" >&5
2745    no_gtk=""
2746    if test "$GTK_CONFIG" = "no" ; then
2747      no_gtk=yes
# Line 2241 | Line 2758 | echo "configure:2228: checking for GTK -
2758        ac_save_CFLAGS="$CFLAGS"
2759        ac_save_LIBS="$LIBS"
2760        CFLAGS="$CFLAGS $GTK_CFLAGS"
2761 <      LIBS="$LIBS $GTK_LIBS"
2761 >      LIBS="$GTK_LIBS $LIBS"
2762        rm -f conf.gtktest
2763        if test "$cross_compiling" = yes; then
2764    echo $ac_n "cross compiling; assumed OK... $ac_c"
2765   else
2766    cat > conftest.$ac_ext <<EOF
2767 < #line 2251 "configure"
2767 > #line 2768 "configure"
2768   #include "confdefs.h"
2769  
2770   #include <gtk/gtk.h>
2771   #include <stdio.h>
2772 + #include <stdlib.h>
2773  
2774   int
2775   main ()
2776   {
2777    int major, minor, micro;
2778 +  char *tmp_version;
2779  
2780    system ("touch conf.gtktest");
2781  
2782 <  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
2782 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
2783 >  tmp_version = g_strdup("$min_gtk_version");
2784 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
2785       printf("%s, bad version string\n", "$min_gtk_version");
2786       exit(1);
2787     }
# Line 2281 | Line 2802 | main ()
2802        printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
2803        printf("*** before re-running configure\n");
2804      }
2805 + #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
2806 +  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
2807 +           (gtk_minor_version != GTK_MINOR_VERSION) ||
2808 +           (gtk_micro_version != GTK_MICRO_VERSION))
2809 +    {
2810 +      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
2811 +             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
2812 +      printf("*** library (version %d.%d.%d)\n",
2813 +             gtk_major_version, gtk_minor_version, gtk_micro_version);
2814 +    }
2815 + #endif /* defined (GTK_MAJOR_VERSION) ... */
2816    else
2817      {
2818        if ((gtk_major_version > major) ||
# Line 2310 | Line 2842 | main ()
2842   }
2843  
2844   EOF
2845 < if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2845 > if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2846   then
2847    :
2848   else
# Line 2328 | Line 2860 | fi
2860    fi
2861    if test "x$no_gtk" = x ; then
2862       echo "$ac_t""yes" 1>&6
2863 <     :    
2863 >    
2864 >    cat >> confdefs.h <<\EOF
2865 > #define ENABLE_GTK 1
2866 > EOF
2867 >
2868 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
2869 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2870 >    LIBS="$LIBS $GTK_LIBS"
2871 >    UISRCS=prefs_editor_gtk.cpp
2872 >      
2873    else
2874       echo "$ac_t""no" 1>&6
2875       if test "$GTK_CONFIG" = "no" ; then
# Line 2344 | Line 2885 | fi
2885            CFLAGS="$CFLAGS $GTK_CFLAGS"
2886            LIBS="$LIBS $GTK_LIBS"
2887            cat > conftest.$ac_ext <<EOF
2888 < #line 2348 "configure"
2888 > #line 2889 "configure"
2889   #include "confdefs.h"
2890  
2891   #include <gtk/gtk.h>
# Line 2354 | Line 2895 | int main() {
2895   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2896   ; return 0; }
2897   EOF
2898 < if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2898 > if { (eval echo configure:2899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2899    rm -rf conftest*
2900     echo "*** The test program compiled, but did not run. This usually means"
2901            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2386 | Line 2927 | rm -f conftest*
2927       fi
2928       GTK_CFLAGS=""
2929       GTK_LIBS=""
2930 <     :
2930 >    
2931 >    echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2932 >    WANT_GTK=no
2933 >  
2934    fi
2935    
2936    
2937    rm -f conf.gtktest
2938  
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"
2939   fi
2940  
2941 < SEMSRCS=
2942 < for ac_func in sem_init
2943 < do
2944 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2945 < 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
2941 > if [ "x$WANT_ESD" = "xyes" ]; then
2942 >  # Check whether --with-esd-prefix or --without-esd-prefix was given.
2943 > if test "${with_esd_prefix+set}" = set; then
2944 >  withval="$with_esd_prefix"
2945 >  esd_prefix="$withval"
2946   else
2947 <  cat > conftest.$ac_ext <<EOF
2948 < #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
2947 >  esd_prefix=""
2948 > fi
2949  
2950 < ; return 0; }
2951 < EOF
2952 < if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2953 <  rm -rf conftest*
2442 <  eval "ac_cv_func_$ac_func=yes"
2950 > # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
2951 > if test "${with_esd_exec_prefix+set}" = set; then
2952 >  withval="$with_esd_exec_prefix"
2953 >  esd_exec_prefix="$withval"
2954   else
2955 <  echo "configure: failed program was:" >&5
2445 <  cat conftest.$ac_ext >&5
2446 <  rm -rf conftest*
2447 <  eval "ac_cv_func_$ac_func=no"
2955 >  esd_exec_prefix=""
2956   fi
2957 < rm -f conftest*
2957 >
2958 > # Check whether --enable-esdtest or --disable-esdtest was given.
2959 > if test "${enable_esdtest+set}" = set; then
2960 >  enableval="$enable_esdtest"
2961 >  :
2962 > else
2963 >  enable_esdtest=yes
2964   fi
2965  
2966 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2967 <  echo "$ac_t""yes" 1>&6
2968 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2969 <  cat >> confdefs.h <<EOF
2970 < #define $ac_tr_func 1
2971 < EOF
2972 <
2966 >
2967 >  if test x$esd_exec_prefix != x ; then
2968 >     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
2969 >     if test x${ESD_CONFIG+set} != xset ; then
2970 >        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
2971 >     fi
2972 >  fi
2973 >  if test x$esd_prefix != x ; then
2974 >     esd_args="$esd_args --prefix=$esd_prefix"
2975 >     if test x${ESD_CONFIG+set} != xset ; then
2976 >        ESD_CONFIG=$esd_prefix/bin/esd-config
2977 >     fi
2978 >  fi
2979 >
2980 >  # Extract the first word of "esd-config", so it can be a program name with args.
2981 > set dummy esd-config; ac_word=$2
2982 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2983 > echo "configure:2984: checking for $ac_word" >&5
2984 > if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2985 >  echo $ac_n "(cached) $ac_c" 1>&6
2986 > else
2987 >  case "$ESD_CONFIG" in
2988 >  /*)
2989 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
2990 >  ;;
2991 >  ?:/*)                  
2992 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
2993 >  ;;
2994 >  *)
2995 >  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
2996 >  ac_dummy="$PATH"
2997 >  for ac_dir in $ac_dummy; do
2998 >    test -z "$ac_dir" && ac_dir=.
2999 >    if test -f $ac_dir/$ac_word; then
3000 >      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
3001 >      break
3002 >    fi
3003 >  done
3004 >  IFS="$ac_save_ifs"
3005 >  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
3006 >  ;;
3007 > esac
3008 > fi
3009 > ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
3010 > if test -n "$ESD_CONFIG"; then
3011 >  echo "$ac_t""$ESD_CONFIG" 1>&6
3012   else
3013    echo "$ac_t""no" 1>&6
3014   fi
2462 – done
3015  
3016 < if [ "x$ac_cv_func_sem_init" = "xno" ]; then
3017 <  echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
3018 < echo "configure:2467: checking for sem_init in -lposix4" >&5
3019 < ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
3020 < if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3021 <  echo $ac_n "(cached) $ac_c" 1>&6
3016 >  min_esd_version=0.2.8
3017 >  echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
3018 > echo "configure:3019: checking for ESD - version >= $min_esd_version" >&5
3019 >  no_esd=""
3020 >  if test "$ESD_CONFIG" = "no" ; then
3021 >    no_esd=yes
3022 >  else
3023 >    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
3024 >    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
3025 >
3026 >    esd_major_version=`$ESD_CONFIG $esd_args --version | \
3027 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
3028 >    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
3029 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
3030 >    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
3031 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
3032 >    if test "x$enable_esdtest" = "xyes" ; then
3033 >      ac_save_CFLAGS="$CFLAGS"
3034 >      ac_save_LIBS="$LIBS"
3035 >      CFLAGS="$CFLAGS $ESD_CFLAGS"
3036 >      LIBS="$LIBS $ESD_LIBS"
3037 >      rm -f conf.esdtest
3038 >      if test "$cross_compiling" = yes; then
3039 >  echo $ac_n "cross compiling; assumed OK... $ac_c"
3040   else
3041 <  ac_save_LIBS="$LIBS"
3042 < LIBS="-lposix4  $LIBS"
2473 < cat > conftest.$ac_ext <<EOF
2474 < #line 2475 "configure"
3041 >  cat > conftest.$ac_ext <<EOF
3042 > #line 3043 "configure"
3043   #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();
3044  
3045 < int main() {
3046 < sem_init()
3047 < ; return 0; }
3045 > #include <stdio.h>
3046 > #include <stdlib.h>
3047 > #include <string.h>
3048 > #include <esd.h>
3049 >
3050 > char*
3051 > my_strdup (char *str)
3052 > {
3053 >  char *new_str;
3054 >  
3055 >  if (str)
3056 >    {
3057 >      new_str = malloc ((strlen (str) + 1) * sizeof(char));
3058 >      strcpy (new_str, str);
3059 >    }
3060 >  else
3061 >    new_str = NULL;
3062 >  
3063 >  return new_str;
3064 > }
3065 >
3066 > int main ()
3067 > {
3068 >  int major, minor, micro;
3069 >  char *tmp_version;
3070 >
3071 >  system ("touch conf.esdtest");
3072 >
3073 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
3074 >  tmp_version = my_strdup("$min_esd_version");
3075 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
3076 >     printf("%s, bad version string\n", "$min_esd_version");
3077 >     exit(1);
3078 >   }
3079 >
3080 >   if (($esd_major_version > major) ||
3081 >      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
3082 >      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
3083 >    {
3084 >      return 0;
3085 >    }
3086 >  else
3087 >    {
3088 >      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
3089 >      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
3090 >      printf("*** best to upgrade to the required version.\n");
3091 >      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
3092 >      printf("*** to point to the correct copy of esd-config, and remove the file\n");
3093 >      printf("*** config.cache before re-running configure\n");
3094 >      return 1;
3095 >    }
3096 > }
3097 >
3098 >
3099   EOF
3100 < if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3101 <  rm -rf conftest*
3102 <  eval "ac_cv_lib_$ac_lib_var=yes"
3100 > if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3101 > then
3102 >  :
3103   else
3104    echo "configure: failed program was:" >&5
3105    cat conftest.$ac_ext >&5
3106 <  rm -rf conftest*
3107 <  eval "ac_cv_lib_$ac_lib_var=no"
2493 < fi
2494 < rm -f conftest*
2495 < LIBS="$ac_save_LIBS"
2496 <
3106 >  rm -fr conftest*
3107 >  no_esd=yes
3108   fi
3109 < 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
3109 > rm -fr conftest*
3110   fi
3111  
3112 <  if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then
3113 <        for ac_func in semget
3114 < do
3115 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3116 < echo "configure:2511: checking for $ac_func" >&5
3117 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3118 <  echo $ac_n "(cached) $ac_c" 1>&6
3119 < else
3120 <  cat > conftest.$ac_ext <<EOF
3121 < #line 2516 "configure"
2516 < #include "confdefs.h"
2517 < /* System header to define __stub macros and hopefully few prototypes,
2518 <    which can conflict with char $ac_func(); below.  */
2519 < #include <assert.h>
2520 < /* Override any gcc2 internal prototype to avoid an error.  */
2521 < /* We use char because int might match the return type of a gcc2
2522 <    builtin and then its argument prototype would still apply.  */
2523 < char $ac_func();
3112 >       CFLAGS="$ac_save_CFLAGS"
3113 >       LIBS="$ac_save_LIBS"
3114 >     fi
3115 >  fi
3116 >  if test "x$no_esd" = x ; then
3117 >     echo "$ac_t""yes" 1>&6
3118 >    
3119 >    cat >> confdefs.h <<\EOF
3120 > #define ENABLE_ESD 1
3121 > EOF
3122  
3123 < int main() {
3123 >    CFLAGS="$CFLAGS $ESD_CFLAGS"
3124 >    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
3125 >    LIBS="$LIBS $ESD_LIBS"
3126 >      
3127 >  else
3128 >     echo "$ac_t""no" 1>&6
3129 >     if test "$ESD_CONFIG" = "no" ; then
3130 >       echo "*** The esd-config script installed by ESD could not be found"
3131 >       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
3132 >       echo "*** your path, or set the ESD_CONFIG environment variable to the"
3133 >       echo "*** full path to esd-config."
3134 >     else
3135 >       if test -f conf.esdtest ; then
3136 >        :
3137 >       else
3138 >          echo "*** Could not run ESD test program, checking why..."
3139 >          CFLAGS="$CFLAGS $ESD_CFLAGS"
3140 >          LIBS="$LIBS $ESD_LIBS"
3141 >          cat > conftest.$ac_ext <<EOF
3142 > #line 3143 "configure"
3143 > #include "confdefs.h"
3144  
3145 < /* The GNU C library defines this for functions which it implements
3146 <    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
3145 > #include <stdio.h>
3146 > #include <esd.h>
3147  
3148 + int main() {
3149 + return 0;
3150   ; return 0; }
3151   EOF
3152 < if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3152 > if { (eval echo configure:3153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3153    rm -rf conftest*
3154 <  eval "ac_cv_func_$ac_func=yes"
3154 >   echo "*** The test program compiled, but did not run. This usually means"
3155 >          echo "*** that the run-time linker is not finding ESD or finding the wrong"
3156 >          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
3157 >          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
3158 >          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
3159 >          echo "*** is required on your system"
3160 >          echo "***"
3161 >          echo "*** If you have an old version installed, it is best to remove it, although"
3162 >          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
3163   else
3164    echo "configure: failed program was:" >&5
3165    cat conftest.$ac_ext >&5
3166    rm -rf conftest*
3167 <  eval "ac_cv_func_$ac_func=no"
3167 >   echo "*** The test program failed to compile or link. See the file config.log for the"
3168 >          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
3169 >          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
3170 >          echo "*** may want to edit the esd-config script: $ESD_CONFIG"
3171   fi
3172   rm -f conftest*
3173 < fi
3174 <
3175 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
3176 <  echo "$ac_t""yes" 1>&6
3177 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3178 <  cat >> confdefs.h <<EOF
3179 < #define $ac_tr_func 1
3180 < EOF
3181 <
3182 < else
2558 <  echo "$ac_t""no" 1>&6
2559 < fi
2560 < done
2561 <
2562 <    if [ "x$ac_cv_func_semget" = "xno" ]; then
2563 <      { echo "configure: error: You need POSIX.4 semaphores to run Basilisk II." 1>&2; exit 1; }
2564 <    else
2565 <      SEMSRCS="posix_sem.cpp"
2566 <    fi
2567 <  else
2568 <    LIBS="$LIBS -lposix4"
3173 >          CFLAGS="$ac_save_CFLAGS"
3174 >          LIBS="$ac_save_LIBS"
3175 >       fi
3176 >     fi
3177 >     ESD_CFLAGS=""
3178 >     ESD_LIBS=""
3179 >    
3180 >    echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
3181 >    WANT_ESD=no
3182 >  
3183    fi
3184 +  
3185 +  
3186 +  rm -f conf.esdtest
3187 +
3188   fi
3189  
3190   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
3191 < echo "configure:2574: checking for ANSI C header files" >&5
3191 > echo "configure:3192: checking for ANSI C header files" >&5
3192   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
3193    echo $ac_n "(cached) $ac_c" 1>&6
3194   else
3195    cat > conftest.$ac_ext <<EOF
3196 < #line 2579 "configure"
3196 > #line 3197 "configure"
3197   #include "confdefs.h"
3198   #include <stdlib.h>
3199   #include <stdarg.h>
# Line 2583 | Line 3201 | else
3201   #include <float.h>
3202   EOF
3203   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3204 < { (eval echo configure:2587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3204 > { (eval echo configure:3205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3205   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3206   if test -z "$ac_err"; then
3207    rm -rf conftest*
# Line 2600 | Line 3218 | rm -f conftest*
3218   if test $ac_cv_header_stdc = yes; then
3219    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3220   cat > conftest.$ac_ext <<EOF
3221 < #line 2604 "configure"
3221 > #line 3222 "configure"
3222   #include "confdefs.h"
3223   #include <string.h>
3224   EOF
# Line 2618 | Line 3236 | fi
3236   if test $ac_cv_header_stdc = yes; then
3237    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3238   cat > conftest.$ac_ext <<EOF
3239 < #line 2622 "configure"
3239 > #line 3240 "configure"
3240   #include "confdefs.h"
3241   #include <stdlib.h>
3242   EOF
# Line 2639 | Line 3257 | if test "$cross_compiling" = yes; then
3257    :
3258   else
3259    cat > conftest.$ac_ext <<EOF
3260 < #line 2643 "configure"
3260 > #line 3261 "configure"
3261   #include "confdefs.h"
3262   #include <ctype.h>
3263   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2650 | Line 3268 | if (XOR (islower (i), ISLOWER (i)) || to
3268   exit (0); }
3269  
3270   EOF
3271 < if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3271 > if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3272   then
3273    :
3274   else
# Line 2677 | Line 3295 | for ac_hdr in unistd.h fcntl.h sys/time.
3295   do
3296   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3297   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3298 < echo "configure:2681: checking for $ac_hdr" >&5
3298 > echo "configure:3299: checking for $ac_hdr" >&5
3299   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3300    echo $ac_n "(cached) $ac_c" 1>&6
3301   else
3302    cat > conftest.$ac_ext <<EOF
3303 < #line 2686 "configure"
3303 > #line 3304 "configure"
3304   #include "confdefs.h"
3305   #include <$ac_hdr>
3306   EOF
3307   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3308 < { (eval echo configure:2691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3308 > { (eval echo configure:3309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3309   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3310   if test -z "$ac_err"; then
3311    rm -rf conftest*
# Line 2715 | Line 3333 | done
3333  
3334  
3335   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
3336 < echo "configure:2719: checking whether byte ordering is bigendian" >&5
3336 > echo "configure:3337: checking whether byte ordering is bigendian" >&5
3337   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
3338    echo $ac_n "(cached) $ac_c" 1>&6
3339   else
3340    ac_cv_c_bigendian=unknown
3341   # See if sys/param.h defines the BYTE_ORDER macro.
3342   cat > conftest.$ac_ext <<EOF
3343 < #line 2726 "configure"
3343 > #line 3344 "configure"
3344   #include "confdefs.h"
3345   #include <sys/types.h>
3346   #include <sys/param.h>
# Line 2733 | Line 3351 | int main() {
3351   #endif
3352   ; return 0; }
3353   EOF
3354 < if { (eval echo configure:2737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3354 > if { (eval echo configure:3355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3355    rm -rf conftest*
3356    # It does; now see whether it defined to BIG_ENDIAN or not.
3357   cat > conftest.$ac_ext <<EOF
3358 < #line 2741 "configure"
3358 > #line 3359 "configure"
3359   #include "confdefs.h"
3360   #include <sys/types.h>
3361   #include <sys/param.h>
# Line 2748 | Line 3366 | int main() {
3366   #endif
3367   ; return 0; }
3368   EOF
3369 < if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3369 > if { (eval echo configure:3370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3370    rm -rf conftest*
3371    ac_cv_c_bigendian=yes
3372   else
# Line 2768 | Line 3386 | if test "$cross_compiling" = yes; then
3386      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3387   else
3388    cat > conftest.$ac_ext <<EOF
3389 < #line 2772 "configure"
3389 > #line 3390 "configure"
3390   #include "confdefs.h"
3391   main () {
3392    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 2781 | Line 3399 | main () {
3399    exit (u.c[sizeof (long) - 1] == 1);
3400   }
3401   EOF
3402 < if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3402 > if { (eval echo configure:3403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3403   then
3404    ac_cv_c_bigendian=no
3405   else
# Line 2805 | Line 3423 | EOF
3423   fi
3424  
3425   echo $ac_n "checking for working const""... $ac_c" 1>&6
3426 < echo "configure:2809: checking for working const" >&5
3426 > echo "configure:3427: checking for working const" >&5
3427   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3428    echo $ac_n "(cached) $ac_c" 1>&6
3429   else
3430    cat > conftest.$ac_ext <<EOF
3431 < #line 2814 "configure"
3431 > #line 3432 "configure"
3432   #include "confdefs.h"
3433  
3434   int main() {
# Line 2859 | Line 3477 | ccp = (char const *const *) p;
3477  
3478   ; return 0; }
3479   EOF
3480 < if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3480 > if { (eval echo configure:3481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3481    rm -rf conftest*
3482    ac_cv_c_const=yes
3483   else
# Line 2880 | Line 3498 | EOF
3498   fi
3499  
3500   echo $ac_n "checking for inline""... $ac_c" 1>&6
3501 < echo "configure:2884: checking for inline" >&5
3501 > echo "configure:3502: checking for inline" >&5
3502   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3503    echo $ac_n "(cached) $ac_c" 1>&6
3504   else
3505    ac_cv_c_inline=no
3506   for ac_kw in inline __inline__ __inline; do
3507    cat > conftest.$ac_ext <<EOF
3508 < #line 2891 "configure"
3508 > #line 3509 "configure"
3509   #include "confdefs.h"
3510  
3511   int main() {
3512   } $ac_kw foo() {
3513   ; return 0; }
3514   EOF
3515 < if { (eval echo configure:2898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3515 > if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3516    rm -rf conftest*
3517    ac_cv_c_inline=$ac_kw; break
3518   else
# Line 2920 | Line 3538 | EOF
3538   esac
3539  
3540   echo $ac_n "checking size of short""... $ac_c" 1>&6
3541 < echo "configure:2924: checking size of short" >&5
3541 > echo "configure:3542: checking size of short" >&5
3542   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3543    echo $ac_n "(cached) $ac_c" 1>&6
3544   else
# Line 2928 | Line 3546 | else
3546    ac_cv_sizeof_short=2
3547   else
3548    cat > conftest.$ac_ext <<EOF
3549 < #line 2932 "configure"
3549 > #line 3550 "configure"
3550   #include "confdefs.h"
3551   #include <stdio.h>
3552   main()
# Line 2939 | Line 3557 | main()
3557    exit(0);
3558   }
3559   EOF
3560 < if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3560 > if { (eval echo configure:3561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3561   then
3562    ac_cv_sizeof_short=`cat conftestval`
3563   else
# Line 2959 | Line 3577 | EOF
3577  
3578  
3579   echo $ac_n "checking size of int""... $ac_c" 1>&6
3580 < echo "configure:2963: checking size of int" >&5
3580 > echo "configure:3581: checking size of int" >&5
3581   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3582    echo $ac_n "(cached) $ac_c" 1>&6
3583   else
# Line 2967 | Line 3585 | else
3585    ac_cv_sizeof_int=4
3586   else
3587    cat > conftest.$ac_ext <<EOF
3588 < #line 2971 "configure"
3588 > #line 3589 "configure"
3589   #include "confdefs.h"
3590   #include <stdio.h>
3591   main()
# Line 2978 | Line 3596 | main()
3596    exit(0);
3597   }
3598   EOF
3599 < if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3599 > if { (eval echo configure:3600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3600   then
3601    ac_cv_sizeof_int=`cat conftestval`
3602   else
# Line 2998 | Line 3616 | EOF
3616  
3617  
3618   echo $ac_n "checking size of long""... $ac_c" 1>&6
3619 < echo "configure:3002: checking size of long" >&5
3619 > echo "configure:3620: checking size of long" >&5
3620   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3621    echo $ac_n "(cached) $ac_c" 1>&6
3622   else
# Line 3006 | Line 3624 | else
3624    ac_cv_sizeof_long=4
3625   else
3626    cat > conftest.$ac_ext <<EOF
3627 < #line 3010 "configure"
3627 > #line 3628 "configure"
3628   #include "confdefs.h"
3629   #include <stdio.h>
3630   main()
# Line 3017 | Line 3635 | main()
3635    exit(0);
3636   }
3637   EOF
3638 < if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3638 > if { (eval echo configure:3639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3639   then
3640    ac_cv_sizeof_long=`cat conftestval`
3641   else
# Line 3037 | Line 3655 | EOF
3655  
3656  
3657   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3658 < echo "configure:3041: checking size of long long" >&5
3658 > echo "configure:3659: checking size of long long" >&5
3659   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3660    echo $ac_n "(cached) $ac_c" 1>&6
3661   else
# Line 3045 | Line 3663 | else
3663    ac_cv_sizeof_long_long=8
3664   else
3665    cat > conftest.$ac_ext <<EOF
3666 < #line 3049 "configure"
3666 > #line 3667 "configure"
3667   #include "confdefs.h"
3668   #include <stdio.h>
3669   main()
# Line 3056 | Line 3674 | main()
3674    exit(0);
3675   }
3676   EOF
3677 < if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3677 > if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3678   then
3679    ac_cv_sizeof_long_long=`cat conftestval`
3680   else
# Line 3076 | Line 3694 | EOF
3694  
3695  
3696   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3697 < echo "configure:3080: checking for off_t" >&5
3697 > echo "configure:3698: checking for off_t" >&5
3698   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3699    echo $ac_n "(cached) $ac_c" 1>&6
3700   else
3701    cat > conftest.$ac_ext <<EOF
3702 < #line 3085 "configure"
3702 > #line 3703 "configure"
3703   #include "confdefs.h"
3704   #include <sys/types.h>
3705   #if STDC_HEADERS
# Line 3109 | Line 3727 | EOF
3727   fi
3728  
3729   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3730 < echo "configure:3113: checking for loff_t" >&5
3730 > echo "configure:3731: checking for loff_t" >&5
3731   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3732    echo $ac_n "(cached) $ac_c" 1>&6
3733   else
3734    cat > conftest.$ac_ext <<EOF
3735 < #line 3118 "configure"
3735 > #line 3736 "configure"
3736   #include "confdefs.h"
3737   #include <sys/types.h>
3738   #if STDC_HEADERS
# Line 3142 | Line 3760 | EOF
3760   fi
3761  
3762   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3763 < echo "configure:3146: checking for size_t" >&5
3763 > echo "configure:3764: checking for size_t" >&5
3764   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3765    echo $ac_n "(cached) $ac_c" 1>&6
3766   else
3767    cat > conftest.$ac_ext <<EOF
3768 < #line 3151 "configure"
3768 > #line 3769 "configure"
3769   #include "confdefs.h"
3770   #include <sys/types.h>
3771   #if STDC_HEADERS
# Line 3175 | Line 3793 | EOF
3793   fi
3794  
3795   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3796 < echo "configure:3179: checking whether time.h and sys/time.h may both be included" >&5
3796 > echo "configure:3797: checking whether time.h and sys/time.h may both be included" >&5
3797   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3798    echo $ac_n "(cached) $ac_c" 1>&6
3799   else
3800    cat > conftest.$ac_ext <<EOF
3801 < #line 3184 "configure"
3801 > #line 3802 "configure"
3802   #include "confdefs.h"
3803   #include <sys/types.h>
3804   #include <sys/time.h>
# Line 3189 | Line 3807 | int main() {
3807   struct tm *tp;
3808   ; return 0; }
3809   EOF
3810 < if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3810 > if { (eval echo configure:3811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3811    rm -rf conftest*
3812    ac_cv_header_time=yes
3813   else
# Line 3210 | Line 3828 | EOF
3828   fi
3829  
3830   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3831 < echo "configure:3214: checking whether struct tm is in sys/time.h or time.h" >&5
3831 > echo "configure:3832: checking whether struct tm is in sys/time.h or time.h" >&5
3832   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3833    echo $ac_n "(cached) $ac_c" 1>&6
3834   else
3835    cat > conftest.$ac_ext <<EOF
3836 < #line 3219 "configure"
3836 > #line 3837 "configure"
3837   #include "confdefs.h"
3838   #include <sys/types.h>
3839   #include <time.h>
# Line 3223 | Line 3841 | int main() {
3841   struct tm *tp; tp->tm_sec;
3842   ; return 0; }
3843   EOF
3844 < if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3844 > if { (eval echo configure:3845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3845    rm -rf conftest*
3846    ac_cv_struct_tm=time.h
3847   else
# Line 3247 | Line 3865 | fi
3865   for ac_func in strdup cfmakeraw
3866   do
3867   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3868 < echo "configure:3251: checking for $ac_func" >&5
3868 > echo "configure:3869: checking for $ac_func" >&5
3869   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3870    echo $ac_n "(cached) $ac_c" 1>&6
3871   else
3872    cat > conftest.$ac_ext <<EOF
3873 < #line 3256 "configure"
3873 > #line 3874 "configure"
3874   #include "confdefs.h"
3875   /* System header to define __stub macros and hopefully few prototypes,
3876      which can conflict with char $ac_func(); below.  */
# Line 3275 | Line 3893 | $ac_func();
3893  
3894   ; return 0; }
3895   EOF
3896 < if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3896 > if { (eval echo configure:3897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3897    rm -rf conftest*
3898    eval "ac_cv_func_$ac_func=yes"
3899   else
# Line 3299 | Line 3917 | else
3917   fi
3918   done
3919  
3920 < for ac_func in nanosleep clock_gettime timer_create
3920 > for ac_func in clock_gettime timer_create
3921   do
3922   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3923 < echo "configure:3306: checking for $ac_func" >&5
3923 > echo "configure:3924: checking for $ac_func" >&5
3924   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3925    echo $ac_n "(cached) $ac_c" 1>&6
3926   else
3927    cat > conftest.$ac_ext <<EOF
3928 < #line 3311 "configure"
3928 > #line 3929 "configure"
3929   #include "confdefs.h"
3930   /* System header to define __stub macros and hopefully few prototypes,
3931      which can conflict with char $ac_func(); below.  */
# Line 3330 | Line 3948 | $ac_func();
3948  
3949   ; return 0; }
3950   EOF
3951 < if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3951 > if { (eval echo configure:3952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3952    rm -rf conftest*
3953    eval "ac_cv_func_$ac_func=yes"
3954   else
# Line 3355 | Line 3973 | fi
3973   done
3974  
3975  
3976 < SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp"
3977 < if MACHINE=`uname -a 2>/dev/null`; then
3976 > SERIALSRC=serial_unix.cpp
3977 > ETHERSRC=../dummy/ether_dummy.cpp
3978 > SCSISRC=../dummy/scsi_dummy.cpp
3979 > AUDIOSRC=../dummy/audio_dummy.cpp
3980 > EXTRASYSSRCS=
3981 > SUPPORTS_NATIVE_M68K=no
3982 > if MACHINE=`uname -s 2>/dev/null`; then
3983    case "$MACHINE" in
3984    Linux*)
3985 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp"
3985 >    ETHERSRC=Linux/ether_linux.cpp
3986 >    SCSISRC=Linux/scsi_linux.cpp
3987 >    AUDIOSRC=audio_oss_esd.cpp
3988      ;;
3989    FreeBSD*3.*)
3990 +    AUDIOSRC=audio_oss_esd.cpp
3991 +    DEFINES="$DEFINES -DBSD_COMP"
3992          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3993 < echo "configure:3367: checking for cam_open_btl in -lcam" >&5
3993 > echo "configure:3994: checking for cam_open_btl in -lcam" >&5
3994   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3995   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3996    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3371 | Line 3998 | else
3998    ac_save_LIBS="$LIBS"
3999   LIBS="-lcam  $LIBS"
4000   cat > conftest.$ac_ext <<EOF
4001 < #line 3375 "configure"
4001 > #line 4002 "configure"
4002   #include "confdefs.h"
4003   /* Override any gcc2 internal prototype to avoid an error.  */
4004   /* We use char because int might match the return type of a gcc2
# Line 3382 | Line 4009 | int main() {
4009   cam_open_btl()
4010   ; return 0; }
4011   EOF
4012 < if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4012 > if { (eval echo configure:4013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4013    rm -rf conftest*
4014    eval "ac_cv_lib_$ac_lib_var=yes"
4015   else
# Line 3404 | Line 4031 | HAVE_LIBCAM=no
4031   fi
4032  
4033      if [ "x$HAVE_LIBCAM" = "xno" ]; then
4034 <      { echo "configure: error: Cannot find libcam for SCSI management." 1>&2; exit 1; }
4034 >      echo "configure: warning: Cannot find libcam for SCSI management, disabling SCSI support." 1>&2
4035      else
4036              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
4037   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
4038 < echo "configure:3412: checking for /sys/cam/cam.h" >&5
4038 > echo "configure:4039: checking for /sys/cam/cam.h" >&5
4039   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4040    echo $ac_n "(cached) $ac_c" 1>&6
4041   else
4042    cat > conftest.$ac_ext <<EOF
4043 < #line 3417 "configure"
4043 > #line 4044 "configure"
4044   #include "confdefs.h"
4045   #include </sys/cam/cam.h>
4046   EOF
4047   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4048 < { (eval echo configure:3422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4048 > { (eval echo configure:4049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4049   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4050   if test -z "$ac_err"; then
4051    rm -rf conftest*
# Line 3440 | Line 4067 | else
4067   fi
4068  
4069        if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then
4070 <                        { echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; }
4070 >                        echo "configure: warning: Cannot find kernel includes for CAM library, disabling SCSI support." 1>&2
4071 >      else
4072 >        SCSISRC=FreeBSD/scsi_freebsd.cpp
4073 >        CXXFLAGS="$CXXFLAGS -I/sys"
4074 >        CFLAGS="$CFLAGS -I/sys"
4075 >        LIBS="$LIBS -lcam"
4076 >        DEFINES="$DEFINES -DCAM"
4077        fi
3445 –      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3446 –      CXXFLAGS="$CXXFLAGS -I/sys"
3447 –      CFLAGS="$CFLAGS -I/sys"
3448 –      LIBS="$LIBS -lcam"
3449 –      DEFINES="$DEFINES -DBSD_COMP -DCAM"
4078      fi
4079      ;;
4080    FreeBSD*)
4081 +    DEFINES="$DEFINES -DBSD_COMP"
4082          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
4083 < echo "configure:3455: checking for scsi_open in -lscsi" >&5
4083 > echo "configure:4084: checking for scsi_open in -lscsi" >&5
4084   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
4085   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4086    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3459 | Line 4088 | else
4088    ac_save_LIBS="$LIBS"
4089   LIBS="-lscsi  $LIBS"
4090   cat > conftest.$ac_ext <<EOF
4091 < #line 3463 "configure"
4091 > #line 4092 "configure"
4092   #include "confdefs.h"
4093   /* Override any gcc2 internal prototype to avoid an error.  */
4094   /* We use char because int might match the return type of a gcc2
# Line 3470 | Line 4099 | int main() {
4099   scsi_open()
4100   ; return 0; }
4101   EOF
4102 < if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4102 > if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4103    rm -rf conftest*
4104    eval "ac_cv_lib_$ac_lib_var=yes"
4105   else
# Line 3492 | Line 4121 | HAVE_LIBSCSI=no
4121   fi
4122  
4123      if [ "x$HAVE_LIBSCSI" = "xno" ]; then
4124 <      { echo "configure: error: Cannot find libscsi for SCSI management." 1>&2; exit 1; }
4124 >      echo "configure: warning: Cannot find libscsi for SCSI management, disabling SCSI support." 1>&2
4125      else
4126              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
4127   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
4128 < echo "configure:3500: checking for scsi.h sys/scsiio.h" >&5
4128 > echo "configure:4129: checking for scsi.h sys/scsiio.h" >&5
4129   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4130    echo $ac_n "(cached) $ac_c" 1>&6
4131   else
4132    cat > conftest.$ac_ext <<EOF
4133 < #line 3505 "configure"
4133 > #line 4134 "configure"
4134   #include "confdefs.h"
4135   #include <scsi.h sys/scsiio.h>
4136   EOF
4137   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4138 < { (eval echo configure:3510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4138 > { (eval echo configure:4139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4139   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4140   if test -z "$ac_err"; then
4141    rm -rf conftest*
# Line 3528 | Line 4157 | else
4157   fi
4158  
4159        if [ "x$ac_cv_header_scsi_h" = "xno" ]; then
4160 <        { echo "configure: error: Cannot find includes for the SCSI library." 1>&2; exit 1; }
4160 >        echo "configure: warning: Cannot find includes for the SCSI library, disabling SCSI support." 1>&2
4161 >      else
4162 >        SCSISRC=FreeBSD/scsi_freebsd.cpp
4163 >        LIBS="$LIBS -lscsi"
4164        fi
3533 –      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3534 –      LIBS="$LIBS -lscsi"
3535 –      DEFINES="$DEFINES -DBSD_COMP"
4165      fi
4166      ;;
4167 +  NetBSD*)
4168 +    SUPPORTS_NATIVE_M68K=yes
4169 +    ;;
4170    SunOS*)
4171 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp Solaris/audio_solaris.cpp"
4171 >    AUDIOSRC=Solaris/audio_solaris.cpp
4172      DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
4173      ;;
4174    IRIX*)
4175 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp Irix/unaligned.c"
4175 >    EXTRASYSSRCS=Irix/unaligned.c
4176      DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
4177      LIBS="$LIBS -lm"
4178      ;;
4179    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
4180   fi
4181 < if [ "x$SEMSRCS" != "x" ]; then
4182 <  SYSSRCS="$SYSSRCS $SEMSRCS"
4183 < fi
4184 <
4185 < 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"
3560 <
3561 < HAVE_I386=no
3562 < echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
3563 < echo "configure:3564: checking for x86 target CPU" >&5
3564 < cat > conftest.$ac_ext <<EOF
3565 < #line 3566 "configure"
3566 < #include "confdefs.h"
3567 <
3568 < #ifdef __i386__
3569 <  yes
3570 < #endif
3571 <
3572 < EOF
3573 < if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3574 <  egrep "yes" >/dev/null 2>&1; then
3575 <  rm -rf conftest*
3576 <  echo "$ac_t""yes" 1>&6; HAVE_I386=yes
3577 < else
3578 <  rm -rf conftest*
3579 <  echo "$ac_t""no" 1>&6
4181 > if [ "x$HAVE_PTHREADS" = "xno" ]; then
4182 >    echo "configure: warning: You don't have pthreads, disabling serial, ethernet and audio support." 1>&2
4183 >  SERIALSRC=../dummy/serial_dummy.cpp
4184 >  ETHERSRC=../dummy/ether_dummy.cpp
4185 >  AUDIOSRC=../dummy/audio_dummy.cpp
4186   fi
4187 < rm -f conftest*
3582 <
4187 > SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
4188  
4189   HAVE_GAS=no
4190   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
4191 < echo "configure:3587: checking for GAS .p2align feature" >&5
4191 > echo "configure:4192: checking for GAS .p2align feature" >&5
4192   cat >conftest.S << EOF
4193          .text
4194          .p2align 5
# Line 3593 | Line 4198 | echo "$ac_t""$HAVE_GAS" 1>&6
4198  
4199   HAVE_GCC27=no
4200   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
4201 < echo "configure:3597: checking for GCC 2.7 or higher" >&5
4201 > echo "configure:4202: checking for GCC 2.7 or higher" >&5
4202   cat > conftest.$ac_ext <<EOF
4203 < #line 3599 "configure"
4203 > #line 4204 "configure"
4204   #include "confdefs.h"
4205   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
4206    yes
# Line 3613 | Line 4218 | fi
4218   rm -f conftest*
4219  
4220  
4221 < if [ "x$HAVE_GCC27" = "xyes" ]; then
4221 > if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
4222    CFLAGS="$CFLAGS -fomit-frame-pointer"
4223    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
4224   fi
4225  
4226 + WANT_X86_ASSEMBLY=no
4227 + WANT_SPARC_V8_ASSEMBLY=no
4228 + WANT_SPARC_V9_ASSEMBLY=no
4229 + WANT_NATIVE_M68K=no
4230 + CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
4231   if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
4232 <  DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4232 >    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4233    if [ "x$HAVE_GAS" = "xyes" ]; then
4234 +    WANT_X86_ASSEMBLY=yes
4235      DEFINES="$DEFINES -DX86_ASSEMBLY"
4236 <    CPUSRCS="$CPUSRCS cpufast.s"
3626 <  else
3627 <    CPUSRCS="$CPUSRCS cpuemu.cpp"
4236 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4237    fi
4238 < else
4239 <  CPUSRCS="$CPUSRCS cpuemu.cpp"
4238 > elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
4239 >    case "$MACHINE" in
4240 >  SunOS*)
4241 >    echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
4242 > echo "configure:4243: checking SPARC CPU architecture" >&5
4243 >    SPARC_TYPE=`Solaris/which_sparc`
4244 >    echo "$ac_t""$SPARC_TYPE" 1>&6
4245 >    case "$SPARC_TYPE" in
4246 >    SPARC_V8)
4247 >      WANT_SPARC_V8_ASSEMBLY=yes
4248 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
4249 >      CFLAGS="$CFLAGS -Wa,-Av8"
4250 >      CXXFLAGS="$CXXFLAGS -Wa,-Av8"
4251 >      ;;
4252 >    SPARC_V9)
4253 >      WANT_SPARC_V9_ASSEMBLY=yes
4254 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
4255 >      CFLAGS="$CFLAGS -Wa,-Av9"
4256 >      CXXFLAGS="$CXXFLAGS -Wa,-Av9"
4257 >      ;;
4258 >    esac
4259 >    ;;
4260 >  esac
4261 > elif [ "x$HAVE_M68K" = "xyes" -a "x$SUPPORTS_NATIVE_M68K" = "xyes" ]; then
4262 >    CPUSRCS=""
4263 >  cat >> confdefs.h <<\EOF
4264 > #define ENABLE_NATIVE_M68K 1
4265 > EOF
4266 >
4267 >  WANT_NATIVE_M68K=yes
4268   fi
4269  
4270 + if [ "x$WANT_NATIVE_M68K" = "xno" ]; then
4271 +  CPUINCLUDES="-I../uae_cpu"
4272 +  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"
4273 + else
4274 +  CPUINCLUDES="-I../native_cpu"
4275 +  CPUSRCS="asm_support.s"
4276 + fi
4277  
4278  
4279  
# Line 3769 | Line 4413 | s%@oldincludedir@%$oldincludedir%g
4413   s%@infodir@%$infodir%g
4414   s%@mandir@%$mandir%g
4415   s%@CC@%$CC%g
3772 – s%@CXX@%$CXX%g
4416   s%@CPP@%$CPP%g
4417 + s%@CXX@%$CXX%g
4418   s%@SET_MAKE@%$SET_MAKE%g
4419   s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
4420   s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
# Line 3782 | Line 4426 | s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
4426   s%@GTK_CONFIG@%$GTK_CONFIG%g
4427   s%@GTK_CFLAGS@%$GTK_CFLAGS%g
4428   s%@GTK_LIBS@%$GTK_LIBS%g
4429 + s%@ESD_CONFIG@%$ESD_CONFIG%g
4430 + s%@ESD_CFLAGS@%$ESD_CFLAGS%g
4431 + s%@ESD_LIBS@%$ESD_LIBS%g
4432   s%@DEFINES@%$DEFINES%g
3786 – s%@STATICLIBS@%$STATICLIBS%g
4433   s%@SYSSRCS@%$SYSSRCS%g
4434   s%@CPUINCLUDES@%$CPUINCLUDES%g
4435   s%@CPUSRCS@%$CPUSRCS%g
# Line 4006 | Line 4652 | chmod +x $CONFIG_STATUS
4652   rm -fr confdefs* $ac_clean_files
4653   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
4654  
4655 < echo "Configuration done. Now type \"make\"."
4655 >
4656 > echo
4657 > echo Basilisk II configuration summary:
4658 > echo
4659 > echo XFree86 DGA support .............. : $WANT_XF86_DGA
4660 > echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
4661 > echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4662 > echo ESD sound support ................ : $WANT_ESD
4663 > echo GTK user interface ............... : $WANT_GTK
4664 > echo mon debugger support ............. : $WANT_MON
4665 > echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4666 > echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
4667 > echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
4668 > echo Running m68k code natively ....... : $WANT_NATIVE_M68K
4669 > echo
4670 > echo "Configuration done. Now type \"make\" (or \"gmake\")."

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines