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.15 by cebix, 1999-11-03T10:56:23Z

# Line 12 | Line 12 | ac_help=
12   ac_default_prefix=/usr/local
13   # Any additions from configure.in:
14   ac_help="$ac_help
15 <  --enable-dga            use the DGA extension (default)"
15 >  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]"
16   ac_help="$ac_help
17 <  --enable-ui             use GTK user interface (default)"
17 >  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]"
18 > ac_help="$ac_help
19 >  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]"
20 > ac_help="$ac_help
21 >  --with-gtk              use GTK user interface [default=yes]"
22 > ac_help="$ac_help
23 >  --with-mon              use mon as debugger [default=yes]"
24   ac_help="$ac_help
25    --with-x                use the X Window System"
26   ac_help="$ac_help
# Line 23 | Line 29 | ac_help="$ac_help
29    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
30   ac_help="$ac_help
31    --disable-gtktest       Do not try to compile and run a test GTK program"
32 + ac_help="$ac_help
33 +  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)"
34 + ac_help="$ac_help
35 +  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
36 + ac_help="$ac_help
37 +  --disable-esdtest       Do not try to compile and run a test ESD program"
38  
39   # Initialize some variables set by options.
40   # The variables have the same names as the options, with
# Line 536 | Line 548 | fi
548  
549  
550  
551 < WANT_DGA=yes
552 < WANT_UI=yes
553 < # Check whether --enable-dga or --disable-dga was given.
554 < if test "${enable_dga+set}" = set; then
555 <  enableval="$enable_dga"
556 <  WANT_DGA=$enableval
551 > # Check whether --enable-xf86-dga or --disable-xf86-dga was given.
552 > if test "${enable_xf86_dga+set}" = set; then
553 >  enableval="$enable_xf86_dga"
554 >  WANT_XF86_DGA=$enableval
555 > else
556 >  WANT_XF86_DGA=yes
557   fi
558  
559 < # Check whether --enable-ui or --disable-ui was given.
560 < if test "${enable_ui+set}" = set; then
561 <  enableval="$enable_ui"
562 <  WANT_UI=$enableval
559 > # Check whether --enable-fbdev-dga or --disable-fbdev-dga was given.
560 > if test "${enable_fbdev_dga+set}" = set; then
561 >  enableval="$enable_fbdev_dga"
562 >  WANT_FBDEV_DGA=$enableval
563 > else
564 >  WANT_FBDEV_DGA=yes
565 > fi
566 >
567 > # Check whether --with-esd or --without-esd was given.
568 > if test "${with_esd+set}" = set; then
569 >  withval="$with_esd"
570 >  WANT_ESD=$withval
571 > else
572 >  WANT_ESD=yes
573 > fi
574 >
575 > # Check whether --with-gtk or --without-gtk was given.
576 > if test "${with_gtk+set}" = set; then
577 >  withval="$with_gtk"
578 >  WANT_GTK=$withval
579 > else
580 >  WANT_GTK=yes
581 > fi
582 >
583 > # Check whether --with-mon or --without-mon was given.
584 > if test "${with_mon+set}" = set; then
585 >  withval="$with_mon"
586 >  WANT_MON=$withval
587 > else
588 >  WANT_MON=yes
589   fi
590  
591  
592   # Extract the first word of "gcc", so it can be a program name with args.
593   set dummy gcc; ac_word=$2
594   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
595 < echo "configure:558: checking for $ac_word" >&5
595 > echo "configure:596: checking for $ac_word" >&5
596   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
597    echo $ac_n "(cached) $ac_c" 1>&6
598   else
# Line 584 | Line 622 | if test -z "$CC"; then
622    # Extract the first word of "cc", so it can be a program name with args.
623   set dummy cc; ac_word=$2
624   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
625 < echo "configure:588: checking for $ac_word" >&5
625 > echo "configure:626: checking for $ac_word" >&5
626   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
627    echo $ac_n "(cached) $ac_c" 1>&6
628   else
# Line 635 | Line 673 | fi
673        # Extract the first word of "cl", so it can be a program name with args.
674   set dummy cl; ac_word=$2
675   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
676 < echo "configure:639: checking for $ac_word" >&5
676 > echo "configure:677: checking for $ac_word" >&5
677   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
678    echo $ac_n "(cached) $ac_c" 1>&6
679   else
# Line 667 | Line 705 | fi
705   fi
706  
707   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
708 < echo "configure:671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
708 > echo "configure:709: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
709  
710   ac_ext=c
711   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 678 | Line 716 | cross_compiling=$ac_cv_prog_cc_cross
716  
717   cat > conftest.$ac_ext << EOF
718  
719 < #line 682 "configure"
719 > #line 720 "configure"
720   #include "confdefs.h"
721  
722   main(){return(0);}
723   EOF
724 < if { (eval echo configure:687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
724 > if { (eval echo configure:725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
725    ac_cv_prog_cc_works=yes
726    # If we can't run a trivial program, we are probably using a cross compiler.
727    if (./conftest; exit) 2>/dev/null; then
# Line 709 | Line 747 | if test $ac_cv_prog_cc_works = no; then
747    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
748   fi
749   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
750 < echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
750 > echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
751   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
752   cross_compiling=$ac_cv_prog_cc_cross
753  
754   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
755 < echo "configure:718: checking whether we are using GNU C" >&5
755 > echo "configure:756: checking whether we are using GNU C" >&5
756   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
757    echo $ac_n "(cached) $ac_c" 1>&6
758   else
# Line 723 | Line 761 | else
761    yes;
762   #endif
763   EOF
764 < 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
764 > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
765    ac_cv_prog_gcc=yes
766   else
767    ac_cv_prog_gcc=no
# Line 742 | Line 780 | ac_test_CFLAGS="${CFLAGS+set}"
780   ac_save_CFLAGS="$CFLAGS"
781   CFLAGS=
782   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
783 < echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
783 > echo "configure:784: checking whether ${CC-cc} accepts -g" >&5
784   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
785    echo $ac_n "(cached) $ac_c" 1>&6
786   else
# Line 773 | Line 811 | else
811    fi
812   fi
813  
814 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
815 + echo "configure:816: checking how to run the C preprocessor" >&5
816 + # On Suns, sometimes $CPP names a directory.
817 + if test -n "$CPP" && test -d "$CPP"; then
818 +  CPP=
819 + fi
820 + if test -z "$CPP"; then
821 + if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
822 +  echo $ac_n "(cached) $ac_c" 1>&6
823 + else
824 +    # This must be in double quotes, not single quotes, because CPP may get
825 +  # substituted into the Makefile and "${CC-cc}" will confuse make.
826 +  CPP="${CC-cc} -E"
827 +  # On the NeXT, cc -E runs the code through the compiler's parser,
828 +  # not just through cpp.
829 +  cat > conftest.$ac_ext <<EOF
830 + #line 831 "configure"
831 + #include "confdefs.h"
832 + #include <assert.h>
833 + Syntax Error
834 + EOF
835 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
836 + { (eval echo configure:837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
837 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
838 + if test -z "$ac_err"; then
839 +  :
840 + else
841 +  echo "$ac_err" >&5
842 +  echo "configure: failed program was:" >&5
843 +  cat conftest.$ac_ext >&5
844 +  rm -rf conftest*
845 +  CPP="${CC-cc} -E -traditional-cpp"
846 +  cat > conftest.$ac_ext <<EOF
847 + #line 848 "configure"
848 + #include "confdefs.h"
849 + #include <assert.h>
850 + Syntax Error
851 + EOF
852 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
853 + { (eval echo configure:854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
854 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
855 + if test -z "$ac_err"; then
856 +  :
857 + else
858 +  echo "$ac_err" >&5
859 +  echo "configure: failed program was:" >&5
860 +  cat conftest.$ac_ext >&5
861 +  rm -rf conftest*
862 +  CPP="${CC-cc} -nologo -E"
863 +  cat > conftest.$ac_ext <<EOF
864 + #line 865 "configure"
865 + #include "confdefs.h"
866 + #include <assert.h>
867 + Syntax Error
868 + EOF
869 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
870 + { (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
871 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
872 + if test -z "$ac_err"; then
873 +  :
874 + else
875 +  echo "$ac_err" >&5
876 +  echo "configure: failed program was:" >&5
877 +  cat conftest.$ac_ext >&5
878 +  rm -rf conftest*
879 +  CPP=/lib/cpp
880 + fi
881 + rm -f conftest*
882 + fi
883 + rm -f conftest*
884 + fi
885 + rm -f conftest*
886 +  ac_cv_prog_CPP="$CPP"
887 + fi
888 +  CPP="$ac_cv_prog_CPP"
889 + else
890 +  ac_cv_prog_CPP="$CPP"
891 + fi
892 + echo "$ac_t""$CPP" 1>&6
893 +
894   for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
895   do
896   # Extract the first word of "$ac_prog", so it can be a program name with args.
897   set dummy $ac_prog; ac_word=$2
898   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
899 < echo "configure:782: checking for $ac_word" >&5
899 > echo "configure:900: checking for $ac_word" >&5
900   if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
901    echo $ac_n "(cached) $ac_c" 1>&6
902   else
# Line 810 | Line 928 | test -n "$CXX" || CXX="gcc"
928  
929  
930   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
931 < echo "configure:814: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
931 > echo "configure:932: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
932  
933   ac_ext=C
934   # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 821 | Line 939 | cross_compiling=$ac_cv_prog_cxx_cross
939  
940   cat > conftest.$ac_ext << EOF
941  
942 < #line 825 "configure"
942 > #line 943 "configure"
943   #include "confdefs.h"
944  
945   int main(){return(0);}
946   EOF
947 < if { (eval echo configure:830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
947 > if { (eval echo configure:948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
948    ac_cv_prog_cxx_works=yes
949    # If we can't run a trivial program, we are probably using a cross compiler.
950    if (./conftest; exit) 2>/dev/null; then
# Line 852 | Line 970 | if test $ac_cv_prog_cxx_works = no; then
970    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
971   fi
972   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
973 < echo "configure:856: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
973 > echo "configure:974: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
974   echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
975   cross_compiling=$ac_cv_prog_cxx_cross
976  
977   echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
978 < echo "configure:861: checking whether we are using GNU C++" >&5
978 > echo "configure:979: checking whether we are using GNU C++" >&5
979   if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
980    echo $ac_n "(cached) $ac_c" 1>&6
981   else
# Line 866 | Line 984 | else
984    yes;
985   #endif
986   EOF
987 < 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
987 > if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
988    ac_cv_prog_gxx=yes
989   else
990    ac_cv_prog_gxx=no
# Line 885 | Line 1003 | ac_test_CXXFLAGS="${CXXFLAGS+set}"
1003   ac_save_CXXFLAGS="$CXXFLAGS"
1004   CXXFLAGS=
1005   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
1006 < echo "configure:889: checking whether ${CXX-g++} accepts -g" >&5
1006 > echo "configure:1007: checking whether ${CXX-g++} accepts -g" >&5
1007   if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
1008    echo $ac_n "(cached) $ac_c" 1>&6
1009   else
# Line 916 | Line 1034 | else
1034    fi
1035   fi
1036  
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 –
1037   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
1038 < echo "configure:1001: checking whether ${MAKE-make} sets \${MAKE}" >&5
1038 > echo "configure:1039: checking whether ${MAKE-make} sets \${MAKE}" >&5
1039   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
1040   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
1041    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1054 | Line 1092 | ac_configure=$ac_aux_dir/configure # Thi
1092   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1093   # ./install, which can be erroneously created by make from ./install.sh.
1094   echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
1095 < echo "configure:1058: checking for a BSD compatible install" >&5
1095 > echo "configure:1096: checking for a BSD compatible install" >&5
1096   if test -z "$INSTALL"; then
1097   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
1098    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1107 | Line 1145 | test -z "$INSTALL_SCRIPT" && INSTALL_SCR
1145   test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1146  
1147  
1148 + MONSRCS=
1149 + echo $ac_n "checking for mon""... $ac_c" 1>&6
1150 + echo "configure:1151: checking for mon" >&5
1151 + if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1152 +  echo "$ac_t""yes" 1>&6
1153 +  WANT_MON=yes
1154 +  DEFINES="$DEFINES -DENABLE_MON=1"
1155 +  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"
1156 +  CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1157 +  echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
1158 + echo "configure:1159: checking for readline in -lreadline" >&5
1159 + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
1160 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1161 +  echo $ac_n "(cached) $ac_c" 1>&6
1162 + else
1163 +  ac_save_LIBS="$LIBS"
1164 + LIBS="-lreadline  $LIBS"
1165 + cat > conftest.$ac_ext <<EOF
1166 + #line 1167 "configure"
1167 + #include "confdefs.h"
1168 + /* Override any gcc2 internal prototype to avoid an error.  */
1169 + /* We use char because int might match the return type of a gcc2
1170 +    builtin and then its argument prototype would still apply.  */
1171 + char readline();
1172 +
1173 + int main() {
1174 + readline()
1175 + ; return 0; }
1176 + EOF
1177 + if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1178 +  rm -rf conftest*
1179 +  eval "ac_cv_lib_$ac_lib_var=yes"
1180 + else
1181 +  echo "configure: failed program was:" >&5
1182 +  cat conftest.$ac_ext >&5
1183 +  rm -rf conftest*
1184 +  eval "ac_cv_lib_$ac_lib_var=no"
1185 + fi
1186 + rm -f conftest*
1187 + LIBS="$ac_save_LIBS"
1188 +
1189 + fi
1190 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1191 +  echo "$ac_t""yes" 1>&6
1192 +    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1193 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1194 +  cat >> confdefs.h <<EOF
1195 + #define $ac_tr_lib 1
1196 + EOF
1197 +
1198 +  LIBS="-lreadline $LIBS"
1199 +
1200 + else
1201 +  echo "$ac_t""no" 1>&6
1202 + fi
1203 +
1204 +  for ac_hdr in readline/readline.h readline/history.h
1205 + do
1206 + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1207 + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1208 + echo "configure:1209: checking for $ac_hdr" >&5
1209 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1210 +  echo $ac_n "(cached) $ac_c" 1>&6
1211 + else
1212 +  cat > conftest.$ac_ext <<EOF
1213 + #line 1214 "configure"
1214 + #include "confdefs.h"
1215 + #include <$ac_hdr>
1216 + EOF
1217 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1218 + { (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1219 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1220 + if test -z "$ac_err"; then
1221 +  rm -rf conftest*
1222 +  eval "ac_cv_header_$ac_safe=yes"
1223 + else
1224 +  echo "$ac_err" >&5
1225 +  echo "configure: failed program was:" >&5
1226 +  cat conftest.$ac_ext >&5
1227 +  rm -rf conftest*
1228 +  eval "ac_cv_header_$ac_safe=no"
1229 + fi
1230 + rm -f conftest*
1231 + fi
1232 + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
1233 +  echo "$ac_t""yes" 1>&6
1234 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
1235 +  cat >> confdefs.h <<EOF
1236 + #define $ac_tr_hdr 1
1237 + EOF
1238 +
1239 + else
1240 +  echo "$ac_t""no" 1>&6
1241 + fi
1242 + done
1243 +
1244 + else
1245 +  echo "$ac_t""no" 1>&6
1246 +  WANT_MON=no
1247 +  DEFINES="$DEFINES -DENABLE_MON=0"
1248 + fi
1249 +
1250 + echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1251 + echo "configure:1252: checking for sem_init in -lposix4" >&5
1252 + ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1253 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1254 +  echo $ac_n "(cached) $ac_c" 1>&6
1255 + else
1256 +  ac_save_LIBS="$LIBS"
1257 + LIBS="-lposix4  $LIBS"
1258 + cat > conftest.$ac_ext <<EOF
1259 + #line 1260 "configure"
1260 + #include "confdefs.h"
1261 + /* Override any gcc2 internal prototype to avoid an error.  */
1262 + /* We use char because int might match the return type of a gcc2
1263 +    builtin and then its argument prototype would still apply.  */
1264 + char sem_init();
1265 +
1266 + int main() {
1267 + sem_init()
1268 + ; return 0; }
1269 + EOF
1270 + if { (eval echo configure:1271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1271 +  rm -rf conftest*
1272 +  eval "ac_cv_lib_$ac_lib_var=yes"
1273 + else
1274 +  echo "configure: failed program was:" >&5
1275 +  cat conftest.$ac_ext >&5
1276 +  rm -rf conftest*
1277 +  eval "ac_cv_lib_$ac_lib_var=no"
1278 + fi
1279 + rm -f conftest*
1280 + LIBS="$ac_save_LIBS"
1281 +
1282 + fi
1283 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1284 +  echo "$ac_t""yes" 1>&6
1285 +    ac_tr_lib=HAVE_LIB`echo posix4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1286 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1287 +  cat >> confdefs.h <<EOF
1288 + #define $ac_tr_lib 1
1289 + EOF
1290 +
1291 +  LIBS="-lposix4 $LIBS"
1292 +
1293 + else
1294 +  echo "$ac_t""no" 1>&6
1295 + fi
1296 +
1297 +
1298   # If we find X, set shell vars x_includes and x_libraries to the
1299   # paths, otherwise set no_x=yes.
1300   # Uses ac_ vars as temps to allow command line to override cache and checks.
1301   # --without-x overrides everything else, but does not touch the cache.
1302   echo $ac_n "checking for X""... $ac_c" 1>&6
1303 < echo "configure:1116: checking for X" >&5
1303 > echo "configure:1304: checking for X" >&5
1304  
1305   # Check whether --with-x or --without-x was given.
1306   if test "${with_x+set}" = set; then
# Line 1174 | Line 1362 | if test "$ac_x_includes" = NO; then
1362  
1363    # First, try using that file with no special directory specified.
1364   cat > conftest.$ac_ext <<EOF
1365 < #line 1178 "configure"
1365 > #line 1366 "configure"
1366   #include "confdefs.h"
1367   #include <$x_direct_test_include>
1368   EOF
1369   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1370 < { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1370 > { (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1371   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1372   if test -z "$ac_err"; then
1373    rm -rf conftest*
# Line 1248 | Line 1436 | if test "$ac_x_libraries" = NO; then
1436    ac_save_LIBS="$LIBS"
1437    LIBS="-l$x_direct_test_library $LIBS"
1438   cat > conftest.$ac_ext <<EOF
1439 < #line 1252 "configure"
1439 > #line 1440 "configure"
1440   #include "confdefs.h"
1441  
1442   int main() {
1443   ${x_direct_test_function}()
1444   ; return 0; }
1445   EOF
1446 < if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1446 > if { (eval echo configure:1447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1447    rm -rf conftest*
1448    LIBS="$ac_save_LIBS"
1449   # We can link X programs with no special library path.
# Line 1361 | Line 1549 | else
1549      case "`(uname -sr) 2>/dev/null`" in
1550      "SunOS 5"*)
1551        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1552 < echo "configure:1365: checking whether -R must be followed by a space" >&5
1552 > echo "configure:1553: checking whether -R must be followed by a space" >&5
1553        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1554        cat > conftest.$ac_ext <<EOF
1555 < #line 1368 "configure"
1555 > #line 1556 "configure"
1556   #include "confdefs.h"
1557  
1558   int main() {
1559  
1560   ; return 0; }
1561   EOF
1562 < if { (eval echo configure:1375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1562 > if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1563    rm -rf conftest*
1564    ac_R_nospace=yes
1565   else
# Line 1387 | Line 1575 | rm -f conftest*
1575        else
1576          LIBS="$ac_xsave_LIBS -R $x_libraries"
1577          cat > conftest.$ac_ext <<EOF
1578 < #line 1391 "configure"
1578 > #line 1579 "configure"
1579   #include "confdefs.h"
1580  
1581   int main() {
1582  
1583   ; return 0; }
1584   EOF
1585 < if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1585 > if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1586    rm -rf conftest*
1587    ac_R_space=yes
1588   else
# Line 1426 | Line 1614 | rm -f conftest*
1614      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1615      # the Alpha needs dnet_stub (dnet does not exist).
1616      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1617 < echo "configure:1430: checking for dnet_ntoa in -ldnet" >&5
1617 > echo "configure:1618: checking for dnet_ntoa in -ldnet" >&5
1618   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1619   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1620    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1434 | Line 1622 | else
1622    ac_save_LIBS="$LIBS"
1623   LIBS="-ldnet  $LIBS"
1624   cat > conftest.$ac_ext <<EOF
1625 < #line 1438 "configure"
1625 > #line 1626 "configure"
1626   #include "confdefs.h"
1627   /* Override any gcc2 internal prototype to avoid an error.  */
1628   /* We use char because int might match the return type of a gcc2
# Line 1445 | Line 1633 | int main() {
1633   dnet_ntoa()
1634   ; return 0; }
1635   EOF
1636 < if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1636 > if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1637    rm -rf conftest*
1638    eval "ac_cv_lib_$ac_lib_var=yes"
1639   else
# Line 1467 | Line 1655 | fi
1655  
1656      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1657        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1658 < echo "configure:1471: checking for dnet_ntoa in -ldnet_stub" >&5
1658 > echo "configure:1659: checking for dnet_ntoa in -ldnet_stub" >&5
1659   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1660   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1661    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1475 | Line 1663 | else
1663    ac_save_LIBS="$LIBS"
1664   LIBS="-ldnet_stub  $LIBS"
1665   cat > conftest.$ac_ext <<EOF
1666 < #line 1479 "configure"
1666 > #line 1667 "configure"
1667   #include "confdefs.h"
1668   /* Override any gcc2 internal prototype to avoid an error.  */
1669   /* We use char because int might match the return type of a gcc2
# Line 1486 | Line 1674 | int main() {
1674   dnet_ntoa()
1675   ; return 0; }
1676   EOF
1677 < if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1677 > if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1678    rm -rf conftest*
1679    eval "ac_cv_lib_$ac_lib_var=yes"
1680   else
# Line 1515 | Line 1703 | fi
1703      # The nsl library prevents programs from opening the X display
1704      # on Irix 5.2, according to dickey@clark.net.
1705      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1706 < echo "configure:1519: checking for gethostbyname" >&5
1706 > echo "configure:1707: checking for gethostbyname" >&5
1707   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1708    echo $ac_n "(cached) $ac_c" 1>&6
1709   else
1710    cat > conftest.$ac_ext <<EOF
1711 < #line 1524 "configure"
1711 > #line 1712 "configure"
1712   #include "confdefs.h"
1713   /* System header to define __stub macros and hopefully few prototypes,
1714      which can conflict with char gethostbyname(); below.  */
# Line 1543 | Line 1731 | gethostbyname();
1731  
1732   ; return 0; }
1733   EOF
1734 < if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1734 > if { (eval echo configure:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1735    rm -rf conftest*
1736    eval "ac_cv_func_gethostbyname=yes"
1737   else
# Line 1564 | Line 1752 | fi
1752  
1753      if test $ac_cv_func_gethostbyname = no; then
1754        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1755 < echo "configure:1568: checking for gethostbyname in -lnsl" >&5
1755 > echo "configure:1756: checking for gethostbyname in -lnsl" >&5
1756   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1757   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1758    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1572 | Line 1760 | else
1760    ac_save_LIBS="$LIBS"
1761   LIBS="-lnsl  $LIBS"
1762   cat > conftest.$ac_ext <<EOF
1763 < #line 1576 "configure"
1763 > #line 1764 "configure"
1764   #include "confdefs.h"
1765   /* Override any gcc2 internal prototype to avoid an error.  */
1766   /* We use char because int might match the return type of a gcc2
# Line 1583 | Line 1771 | int main() {
1771   gethostbyname()
1772   ; return 0; }
1773   EOF
1774 < if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1774 > if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1775    rm -rf conftest*
1776    eval "ac_cv_lib_$ac_lib_var=yes"
1777   else
# Line 1613 | Line 1801 | fi
1801      # -lsocket must be given before -lnsl if both are needed.
1802      # We assume that if connect needs -lnsl, so does gethostbyname.
1803      echo $ac_n "checking for connect""... $ac_c" 1>&6
1804 < echo "configure:1617: checking for connect" >&5
1804 > echo "configure:1805: checking for connect" >&5
1805   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1806    echo $ac_n "(cached) $ac_c" 1>&6
1807   else
1808    cat > conftest.$ac_ext <<EOF
1809 < #line 1622 "configure"
1809 > #line 1810 "configure"
1810   #include "confdefs.h"
1811   /* System header to define __stub macros and hopefully few prototypes,
1812      which can conflict with char connect(); below.  */
# Line 1641 | Line 1829 | connect();
1829  
1830   ; return 0; }
1831   EOF
1832 < if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1832 > if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1833    rm -rf conftest*
1834    eval "ac_cv_func_connect=yes"
1835   else
# Line 1662 | Line 1850 | fi
1850  
1851      if test $ac_cv_func_connect = no; then
1852        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1853 < echo "configure:1666: checking for connect in -lsocket" >&5
1853 > echo "configure:1854: checking for connect in -lsocket" >&5
1854   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1855   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1856    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1670 | Line 1858 | else
1858    ac_save_LIBS="$LIBS"
1859   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1860   cat > conftest.$ac_ext <<EOF
1861 < #line 1674 "configure"
1861 > #line 1862 "configure"
1862   #include "confdefs.h"
1863   /* Override any gcc2 internal prototype to avoid an error.  */
1864   /* We use char because int might match the return type of a gcc2
# Line 1681 | Line 1869 | int main() {
1869   connect()
1870   ; return 0; }
1871   EOF
1872 < if { (eval echo configure:1685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1872 > if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1873    rm -rf conftest*
1874    eval "ac_cv_lib_$ac_lib_var=yes"
1875   else
# Line 1705 | Line 1893 | fi
1893  
1894      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1895      echo $ac_n "checking for remove""... $ac_c" 1>&6
1896 < echo "configure:1709: checking for remove" >&5
1896 > echo "configure:1897: checking for remove" >&5
1897   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1898    echo $ac_n "(cached) $ac_c" 1>&6
1899   else
1900    cat > conftest.$ac_ext <<EOF
1901 < #line 1714 "configure"
1901 > #line 1902 "configure"
1902   #include "confdefs.h"
1903   /* System header to define __stub macros and hopefully few prototypes,
1904      which can conflict with char remove(); below.  */
# Line 1733 | Line 1921 | remove();
1921  
1922   ; return 0; }
1923   EOF
1924 < if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1924 > if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1925    rm -rf conftest*
1926    eval "ac_cv_func_remove=yes"
1927   else
# Line 1754 | Line 1942 | fi
1942  
1943      if test $ac_cv_func_remove = no; then
1944        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1945 < echo "configure:1758: checking for remove in -lposix" >&5
1945 > echo "configure:1946: checking for remove in -lposix" >&5
1946   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1947   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1948    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1762 | Line 1950 | else
1950    ac_save_LIBS="$LIBS"
1951   LIBS="-lposix  $LIBS"
1952   cat > conftest.$ac_ext <<EOF
1953 < #line 1766 "configure"
1953 > #line 1954 "configure"
1954   #include "confdefs.h"
1955   /* Override any gcc2 internal prototype to avoid an error.  */
1956   /* We use char because int might match the return type of a gcc2
# Line 1773 | Line 1961 | int main() {
1961   remove()
1962   ; return 0; }
1963   EOF
1964 < if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1964 > if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1965    rm -rf conftest*
1966    eval "ac_cv_lib_$ac_lib_var=yes"
1967   else
# Line 1797 | Line 1985 | fi
1985  
1986      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1987      echo $ac_n "checking for shmat""... $ac_c" 1>&6
1988 < echo "configure:1801: checking for shmat" >&5
1988 > echo "configure:1989: checking for shmat" >&5
1989   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
1990    echo $ac_n "(cached) $ac_c" 1>&6
1991   else
1992    cat > conftest.$ac_ext <<EOF
1993 < #line 1806 "configure"
1993 > #line 1994 "configure"
1994   #include "confdefs.h"
1995   /* System header to define __stub macros and hopefully few prototypes,
1996      which can conflict with char shmat(); below.  */
# Line 1825 | Line 2013 | shmat();
2013  
2014   ; return 0; }
2015   EOF
2016 < if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2016 > if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2017    rm -rf conftest*
2018    eval "ac_cv_func_shmat=yes"
2019   else
# Line 1846 | Line 2034 | fi
2034  
2035      if test $ac_cv_func_shmat = no; then
2036        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
2037 < echo "configure:1850: checking for shmat in -lipc" >&5
2037 > echo "configure:2038: checking for shmat in -lipc" >&5
2038   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
2039   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2040    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1854 | Line 2042 | else
2042    ac_save_LIBS="$LIBS"
2043   LIBS="-lipc  $LIBS"
2044   cat > conftest.$ac_ext <<EOF
2045 < #line 1858 "configure"
2045 > #line 2046 "configure"
2046   #include "confdefs.h"
2047   /* Override any gcc2 internal prototype to avoid an error.  */
2048   /* We use char because int might match the return type of a gcc2
# Line 1865 | Line 2053 | int main() {
2053   shmat()
2054   ; return 0; }
2055   EOF
2056 < if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2056 > if { (eval echo configure:2057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2057    rm -rf conftest*
2058    eval "ac_cv_lib_$ac_lib_var=yes"
2059   else
# Line 1898 | Line 2086 | fi
2086    # libraries we check for below, so use a different variable.
2087    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
2088    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
2089 < echo "configure:1902: checking for IceConnectionNumber in -lICE" >&5
2089 > echo "configure:2090: checking for IceConnectionNumber in -lICE" >&5
2090   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
2091   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2092    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1906 | Line 2094 | else
2094    ac_save_LIBS="$LIBS"
2095   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
2096   cat > conftest.$ac_ext <<EOF
2097 < #line 1910 "configure"
2097 > #line 2098 "configure"
2098   #include "confdefs.h"
2099   /* Override any gcc2 internal prototype to avoid an error.  */
2100   /* We use char because int might match the return type of a gcc2
# Line 1917 | Line 2105 | int main() {
2105   IceConnectionNumber()
2106   ; return 0; }
2107   EOF
2108 < if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2108 > if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2109    rm -rf conftest*
2110    eval "ac_cv_lib_$ac_lib_var=yes"
2111   else
# Line 1944 | Line 2132 | fi
2132   if [ "x$no_x" = "xyes" ]; then
2133    { echo "configure: error: You need X11 to run Basilisk II." 1>&2; exit 1; }
2134   fi
1947 –
2135   CFLAGS="$CFLAGS $X_CFLAGS"
2136   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2137   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
1951 – STATICLIBS=
2138  
2139   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2140 < echo "configure:1955: checking for pthread_create in -lpthread" >&5
2140 > echo "configure:2141: checking for pthread_create in -lpthread" >&5
2141   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2142   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2143    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1959 | Line 2145 | else
2145    ac_save_LIBS="$LIBS"
2146   LIBS="-lpthread  $LIBS"
2147   cat > conftest.$ac_ext <<EOF
2148 < #line 1963 "configure"
2148 > #line 2149 "configure"
2149   #include "confdefs.h"
2150   /* Override any gcc2 internal prototype to avoid an error.  */
2151   /* We use char because int might match the return type of a gcc2
# Line 1970 | Line 2156 | int main() {
2156   pthread_create()
2157   ; return 0; }
2158   EOF
2159 < if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2159 > if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2160    rm -rf conftest*
2161    eval "ac_cv_lib_$ac_lib_var=yes"
2162   else
# Line 1985 | Line 2171 | LIBS="$ac_save_LIBS"
2171   fi
2172   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2173    echo "$ac_t""yes" 1>&6
2174 <  HAVE_PTHREADS=yes
2174 >    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2175 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2176 >  cat >> confdefs.h <<EOF
2177 > #define $ac_tr_lib 1
2178 > EOF
2179 >
2180 >  LIBS="-lpthread $LIBS"
2181 >
2182   else
2183    echo "$ac_t""no" 1>&6
1991 – HAVE_PTHREADS=no
1992 – fi
2184  
2185 < if [ "x$HAVE_PTHREADS" = "xno" ]; then
2186 <    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
2185 >  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2186 > echo "configure:2187: checking for pthread_create in -lc_r" >&5
2187   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2188   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2189    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2001 | Line 2191 | else
2191    ac_save_LIBS="$LIBS"
2192   LIBS="-lc_r  $LIBS"
2193   cat > conftest.$ac_ext <<EOF
2194 < #line 2005 "configure"
2194 > #line 2195 "configure"
2195   #include "confdefs.h"
2196   /* Override any gcc2 internal prototype to avoid an error.  */
2197   /* We use char because int might match the return type of a gcc2
# Line 2012 | Line 2202 | int main() {
2202   pthread_create()
2203   ; return 0; }
2204   EOF
2205 < if { (eval echo configure:2016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2205 > if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2206    rm -rf conftest*
2207    eval "ac_cv_lib_$ac_lib_var=yes"
2208   else
# Line 2027 | Line 2217 | LIBS="$ac_save_LIBS"
2217   fi
2218   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2219    echo "$ac_t""yes" 1>&6
2220 <  HAVE_PTHREADS=yes
2220 >    ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2221 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2222 >  cat >> confdefs.h <<EOF
2223 > #define $ac_tr_lib 1
2224 > EOF
2225 >
2226 >  LIBS="-lc_r $LIBS"
2227 >
2228   else
2229    echo "$ac_t""no" 1>&6
2230 < HAVE_PTHREADS=no
2230 >
2231 >    echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2232 > echo "configure:2233: checking for pthread_create in -lPTL" >&5
2233 > ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2234 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2235 >  echo $ac_n "(cached) $ac_c" 1>&6
2236 > else
2237 >  ac_save_LIBS="$LIBS"
2238 > LIBS="-lPTL  $LIBS"
2239 > cat > conftest.$ac_ext <<EOF
2240 > #line 2241 "configure"
2241 > #include "confdefs.h"
2242 > /* Override any gcc2 internal prototype to avoid an error.  */
2243 > /* We use char because int might match the return type of a gcc2
2244 >    builtin and then its argument prototype would still apply.  */
2245 > char pthread_create();
2246 >
2247 > int main() {
2248 > pthread_create()
2249 > ; return 0; }
2250 > EOF
2251 > if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2252 >  rm -rf conftest*
2253 >  eval "ac_cv_lib_$ac_lib_var=yes"
2254 > else
2255 >  echo "configure: failed program was:" >&5
2256 >  cat conftest.$ac_ext >&5
2257 >  rm -rf conftest*
2258 >  eval "ac_cv_lib_$ac_lib_var=no"
2259   fi
2260 + rm -f conftest*
2261 + LIBS="$ac_save_LIBS"
2262 +
2263 + fi
2264 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2265 +  echo "$ac_t""yes" 1>&6
2266 +    ac_tr_lib=HAVE_LIB`echo PTL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2267 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2268 +  cat >> confdefs.h <<EOF
2269 + #define $ac_tr_lib 1
2270 + EOF
2271 +
2272 +  LIBS="-lPTL $LIBS"
2273  
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
2274   else
2275 <  LIBS="$LIBS -lpthread"
2275 >  echo "$ac_t""no" 1>&6
2276 >
2277 >      { echo "configure: error: You need pthreads to run Basilisk II." 1>&2; exit 1; }
2278 >    
2279   fi
2280 < for ac_func in pthread_cancel
2280 >
2281 >  
2282 > fi
2283 >
2284 >
2285 > fi
2286 >
2287 >
2288 > SEMSRCS=
2289 > for ac_func in sem_init
2290   do
2291   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2292 < echo "configure:2048: checking for $ac_func" >&5
2292 > echo "configure:2293: checking for $ac_func" >&5
2293   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2294    echo $ac_n "(cached) $ac_c" 1>&6
2295   else
2296    cat > conftest.$ac_ext <<EOF
2297 < #line 2053 "configure"
2297 > #line 2298 "configure"
2298   #include "confdefs.h"
2299   /* System header to define __stub macros and hopefully few prototypes,
2300      which can conflict with char $ac_func(); below.  */
# Line 2072 | Line 2317 | $ac_func();
2317  
2318   ; return 0; }
2319   EOF
2320 < if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2320 > if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2321    rm -rf conftest*
2322    eval "ac_cv_func_$ac_func=yes"
2323   else
# Line 2093 | Line 2338 | EOF
2338  
2339   else
2340    echo "$ac_t""no" 1>&6
2341 + SEMSRCS=posix_sem.cpp
2342 +
2343   fi
2344   done
2345  
2346  
2347 < if [ "x$WANT_DGA" = "xyes" ]; then
2347 > if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2348    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2349 < echo "configure:2103: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2349 > echo "configure:2350: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2350   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2351   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2352    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2107 | Line 2354 | else
2354    ac_save_LIBS="$LIBS"
2355   LIBS="-lXxf86dga  $LIBS"
2356   cat > conftest.$ac_ext <<EOF
2357 < #line 2111 "configure"
2357 > #line 2358 "configure"
2358   #include "confdefs.h"
2359   /* Override any gcc2 internal prototype to avoid an error.  */
2360   /* We use char because int might match the return type of a gcc2
# Line 2118 | Line 2365 | int main() {
2365   XF86DGAQueryExtension()
2366   ; return 0; }
2367   EOF
2368 < if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2368 > if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2369    rm -rf conftest*
2370    eval "ac_cv_lib_$ac_lib_var=yes"
2371   else
# Line 2133 | Line 2380 | LIBS="$ac_save_LIBS"
2380   fi
2381   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2382    echo "$ac_t""yes" 1>&6
2383 <  HAVE_DGA=yes
2383 >  
2384 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
2385 >    LIBS="$LIBS -lXxf86dga"
2386 >    if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2387 >      echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2
2388 >      WANT_FBDEV_DGA=no
2389 >    fi
2390 >  
2391   else
2392    echo "$ac_t""no" 1>&6
2393 < HAVE_DGA=no
2393 >
2394 >    echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2395 >    WANT_XF86_DGA=no
2396 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2397 >  
2398   fi
2399  
2400 <  if [ "x$HAVE_DGA" = "xno" ]; then
2401 <    echo "configure: warning: Could not find DGA extension, ignoring --enable-dga." 1>&2
2402 <  else
2403 <    DEFINES="$DEFINES -DENABLE_DGA=1"
2404 <    LIBS="$LIBS -lXxf86dga"
2405 <  fi
2400 > else
2401 >  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2402 > fi
2403 > if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2404 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
2405 > else
2406 >  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2407   fi
2408  
2409 < if [ "x$WANT_UI" = "xyes" ]; then
2409 > UISRCS=../dummy/prefs_editor_dummy.cpp
2410 > if [ "x$WANT_GTK" = "xyes" ]; then
2411    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2412   if test "${with_gtk_prefix+set}" = set; then
2413    withval="$with_gtk_prefix"
# Line 2189 | Line 2449 | fi
2449    # Extract the first word of "gtk-config", so it can be a program name with args.
2450   set dummy gtk-config; ac_word=$2
2451   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2452 < echo "configure:2193: checking for $ac_word" >&5
2452 > echo "configure:2453: checking for $ac_word" >&5
2453   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2454    echo $ac_n "(cached) $ac_c" 1>&6
2455   else
# Line 2224 | Line 2484 | fi
2484  
2485    min_gtk_version=1.2.0
2486    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2487 < echo "configure:2228: checking for GTK - version >= $min_gtk_version" >&5
2487 > echo "configure:2488: checking for GTK - version >= $min_gtk_version" >&5
2488    no_gtk=""
2489    if test "$GTK_CONFIG" = "no" ; then
2490      no_gtk=yes
# Line 2247 | Line 2507 | echo "configure:2228: checking for GTK -
2507    echo $ac_n "cross compiling; assumed OK... $ac_c"
2508   else
2509    cat > conftest.$ac_ext <<EOF
2510 < #line 2251 "configure"
2510 > #line 2511 "configure"
2511   #include "confdefs.h"
2512  
2513   #include <gtk/gtk.h>
# Line 2310 | Line 2570 | main ()
2570   }
2571  
2572   EOF
2573 < if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2573 > if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2574   then
2575    :
2576   else
# Line 2328 | Line 2588 | fi
2588    fi
2589    if test "x$no_gtk" = x ; then
2590       echo "$ac_t""yes" 1>&6
2591 <     :    
2591 >    
2592 >    DEFINES="$DEFINES -DENABLE_GTK=1"
2593 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
2594 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2595 >    LIBS="$LIBS $GTK_LIBS"
2596 >    UISRCS=prefs_editor_gtk.cpp
2597 >      
2598    else
2599       echo "$ac_t""no" 1>&6
2600       if test "$GTK_CONFIG" = "no" ; then
# Line 2344 | Line 2610 | fi
2610            CFLAGS="$CFLAGS $GTK_CFLAGS"
2611            LIBS="$LIBS $GTK_LIBS"
2612            cat > conftest.$ac_ext <<EOF
2613 < #line 2348 "configure"
2613 > #line 2614 "configure"
2614   #include "confdefs.h"
2615  
2616   #include <gtk/gtk.h>
# Line 2354 | Line 2620 | int main() {
2620   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2621   ; return 0; }
2622   EOF
2623 < if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2623 > if { (eval echo configure:2624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2624    rm -rf conftest*
2625     echo "*** The test program compiled, but did not run. This usually means"
2626            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2386 | Line 2652 | rm -f conftest*
2652       fi
2653       GTK_CFLAGS=""
2654       GTK_LIBS=""
2655 <     :
2655 >    
2656 >    echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2657 >    WANT_GTK=no
2658 >    DEFINES="$DEFINES -DENABLE_GTK=0"
2659 >  
2660    fi
2661    
2662    
2663    rm -f conf.gtktest
2664  
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"
2665   fi
2666  
2667 < SEMSRCS=
2668 < for ac_func in sem_init
2669 < do
2670 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2671 < 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
2667 > if [ "x$WANT_ESD" = "xyes" ]; then
2668 >  # Check whether --with-esd-prefix or --without-esd-prefix was given.
2669 > if test "${with_esd_prefix+set}" = set; then
2670 >  withval="$with_esd_prefix"
2671 >  esd_prefix="$withval"
2672   else
2673 <  cat > conftest.$ac_ext <<EOF
2674 < #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
2673 >  esd_prefix=""
2674 > fi
2675  
2676 < ; return 0; }
2677 < EOF
2678 < if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2679 <  rm -rf conftest*
2442 <  eval "ac_cv_func_$ac_func=yes"
2676 > # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
2677 > if test "${with_esd_exec_prefix+set}" = set; then
2678 >  withval="$with_esd_exec_prefix"
2679 >  esd_exec_prefix="$withval"
2680   else
2681 <  echo "configure: failed program was:" >&5
2445 <  cat conftest.$ac_ext >&5
2446 <  rm -rf conftest*
2447 <  eval "ac_cv_func_$ac_func=no"
2681 >  esd_exec_prefix=""
2682   fi
2683 < rm -f conftest*
2683 >
2684 > # Check whether --enable-esdtest or --disable-esdtest was given.
2685 > if test "${enable_esdtest+set}" = set; then
2686 >  enableval="$enable_esdtest"
2687 >  :
2688 > else
2689 >  enable_esdtest=yes
2690   fi
2691  
2692 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2693 <  echo "$ac_t""yes" 1>&6
2694 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2695 <  cat >> confdefs.h <<EOF
2696 < #define $ac_tr_func 1
2697 < EOF
2698 <
2692 >
2693 >  if test x$esd_exec_prefix != x ; then
2694 >     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
2695 >     if test x${ESD_CONFIG+set} != xset ; then
2696 >        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
2697 >     fi
2698 >  fi
2699 >  if test x$esd_prefix != x ; then
2700 >     esd_args="$esd_args --prefix=$esd_prefix"
2701 >     if test x${ESD_CONFIG+set} != xset ; then
2702 >        ESD_CONFIG=$esd_prefix/bin/esd-config
2703 >     fi
2704 >  fi
2705 >
2706 >  # Extract the first word of "esd-config", so it can be a program name with args.
2707 > set dummy esd-config; ac_word=$2
2708 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2709 > echo "configure:2710: checking for $ac_word" >&5
2710 > if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2711 >  echo $ac_n "(cached) $ac_c" 1>&6
2712 > else
2713 >  case "$ESD_CONFIG" in
2714 >  /*)
2715 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
2716 >  ;;
2717 >  ?:/*)                  
2718 >  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
2719 >  ;;
2720 >  *)
2721 >  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
2722 >  ac_dummy="$PATH"
2723 >  for ac_dir in $ac_dummy; do
2724 >    test -z "$ac_dir" && ac_dir=.
2725 >    if test -f $ac_dir/$ac_word; then
2726 >      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
2727 >      break
2728 >    fi
2729 >  done
2730 >  IFS="$ac_save_ifs"
2731 >  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
2732 >  ;;
2733 > esac
2734 > fi
2735 > ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
2736 > if test -n "$ESD_CONFIG"; then
2737 >  echo "$ac_t""$ESD_CONFIG" 1>&6
2738   else
2739    echo "$ac_t""no" 1>&6
2740   fi
2462 – done
2741  
2742 < if [ "x$ac_cv_func_sem_init" = "xno" ]; then
2743 <  echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
2744 < echo "configure:2467: checking for sem_init in -lposix4" >&5
2745 < ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
2746 < if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2747 <  echo $ac_n "(cached) $ac_c" 1>&6
2742 >  min_esd_version=0.2.8
2743 >  echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2744 > echo "configure:2745: checking for ESD - version >= $min_esd_version" >&5
2745 >  no_esd=""
2746 >  if test "$ESD_CONFIG" = "no" ; then
2747 >    no_esd=yes
2748 >  else
2749 >    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
2750 >    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
2751 >
2752 >    esd_major_version=`$ESD_CONFIG $esd_args --version | \
2753 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
2754 >    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
2755 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
2756 >    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
2757 >           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
2758 >    if test "x$enable_esdtest" = "xyes" ; then
2759 >      ac_save_CFLAGS="$CFLAGS"
2760 >      ac_save_LIBS="$LIBS"
2761 >      CFLAGS="$CFLAGS $ESD_CFLAGS"
2762 >      LIBS="$LIBS $ESD_LIBS"
2763 >      rm -f conf.esdtest
2764 >      if test "$cross_compiling" = yes; then
2765 >  echo $ac_n "cross compiling; assumed OK... $ac_c"
2766   else
2767 <  ac_save_LIBS="$LIBS"
2768 < LIBS="-lposix4  $LIBS"
2473 < cat > conftest.$ac_ext <<EOF
2474 < #line 2475 "configure"
2767 >  cat > conftest.$ac_ext <<EOF
2768 > #line 2769 "configure"
2769   #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();
2770  
2771 < int main() {
2772 < sem_init()
2773 < ; return 0; }
2771 > #include <stdio.h>
2772 > #include <stdlib.h>
2773 > #include <string.h>
2774 > #include <esd.h>
2775 >
2776 > char*
2777 > my_strdup (char *str)
2778 > {
2779 >  char *new_str;
2780 >  
2781 >  if (str)
2782 >    {
2783 >      new_str = malloc ((strlen (str) + 1) * sizeof(char));
2784 >      strcpy (new_str, str);
2785 >    }
2786 >  else
2787 >    new_str = NULL;
2788 >  
2789 >  return new_str;
2790 > }
2791 >
2792 > int main ()
2793 > {
2794 >  int major, minor, micro;
2795 >  char *tmp_version;
2796 >
2797 >  system ("touch conf.esdtest");
2798 >
2799 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
2800 >  tmp_version = my_strdup("$min_esd_version");
2801 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
2802 >     printf("%s, bad version string\n", "$min_esd_version");
2803 >     exit(1);
2804 >   }
2805 >
2806 >   if (($esd_major_version > major) ||
2807 >      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
2808 >      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
2809 >    {
2810 >      return 0;
2811 >    }
2812 >  else
2813 >    {
2814 >      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
2815 >      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
2816 >      printf("*** best to upgrade to the required version.\n");
2817 >      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
2818 >      printf("*** to point to the correct copy of esd-config, and remove the file\n");
2819 >      printf("*** config.cache before re-running configure\n");
2820 >      return 1;
2821 >    }
2822 > }
2823 >
2824 >
2825   EOF
2826 < if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2827 <  rm -rf conftest*
2828 <  eval "ac_cv_lib_$ac_lib_var=yes"
2826 > if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2827 > then
2828 >  :
2829   else
2830    echo "configure: failed program was:" >&5
2831    cat conftest.$ac_ext >&5
2832 <  rm -rf conftest*
2833 <  eval "ac_cv_lib_$ac_lib_var=no"
2493 < fi
2494 < rm -f conftest*
2495 < LIBS="$ac_save_LIBS"
2496 <
2832 >  rm -fr conftest*
2833 >  no_esd=yes
2834   fi
2835 < 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
2835 > rm -fr conftest*
2836   fi
2837  
2838 <  if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then
2839 <        for ac_func in semget
2840 < do
2841 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2842 < echo "configure:2511: checking for $ac_func" >&5
2843 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2844 <  echo $ac_n "(cached) $ac_c" 1>&6
2845 < else
2846 <  cat > conftest.$ac_ext <<EOF
2847 < #line 2516 "configure"
2838 >       CFLAGS="$ac_save_CFLAGS"
2839 >       LIBS="$ac_save_LIBS"
2840 >     fi
2841 >  fi
2842 >  if test "x$no_esd" = x ; then
2843 >     echo "$ac_t""yes" 1>&6
2844 >    
2845 >    DEFINES="$DEFINES -DENABLE_ESD=1"
2846 >    CFLAGS="$CFLAGS $ESD_CFLAGS"
2847 >    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
2848 >    LIBS="$LIBS $ESD_LIBS"
2849 >      
2850 >  else
2851 >     echo "$ac_t""no" 1>&6
2852 >     if test "$ESD_CONFIG" = "no" ; then
2853 >       echo "*** The esd-config script installed by ESD could not be found"
2854 >       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
2855 >       echo "*** your path, or set the ESD_CONFIG environment variable to the"
2856 >       echo "*** full path to esd-config."
2857 >     else
2858 >       if test -f conf.esdtest ; then
2859 >        :
2860 >       else
2861 >          echo "*** Could not run ESD test program, checking why..."
2862 >          CFLAGS="$CFLAGS $ESD_CFLAGS"
2863 >          LIBS="$LIBS $ESD_LIBS"
2864 >          cat > conftest.$ac_ext <<EOF
2865 > #line 2866 "configure"
2866   #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();
2867  
2868 < int main() {
2869 <
2527 < /* The GNU C library defines this for functions which it implements
2528 <    to always fail with ENOSYS.  Some functions are actually named
2529 <    something starting with __ and the normal name is an alias.  */
2530 < #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
2531 < choke me
2532 < #else
2533 < $ac_func();
2534 < #endif
2868 > #include <stdio.h>
2869 > #include <esd.h>
2870  
2871 + int main() {
2872 + return 0;
2873   ; return 0; }
2874   EOF
2875 < if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2875 > if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2876    rm -rf conftest*
2877 <  eval "ac_cv_func_$ac_func=yes"
2877 >   echo "*** The test program compiled, but did not run. This usually means"
2878 >          echo "*** that the run-time linker is not finding ESD or finding the wrong"
2879 >          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
2880 >          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2881 >          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
2882 >          echo "*** is required on your system"
2883 >          echo "***"
2884 >          echo "*** If you have an old version installed, it is best to remove it, although"
2885 >          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
2886   else
2887    echo "configure: failed program was:" >&5
2888    cat conftest.$ac_ext >&5
2889    rm -rf conftest*
2890 <  eval "ac_cv_func_$ac_func=no"
2890 >   echo "*** The test program failed to compile or link. See the file config.log for the"
2891 >          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
2892 >          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
2893 >          echo "*** may want to edit the esd-config script: $ESD_CONFIG"
2894   fi
2895   rm -f conftest*
2896 < fi
2897 <
2898 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2899 <  echo "$ac_t""yes" 1>&6
2900 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2901 <  cat >> confdefs.h <<EOF
2902 < #define $ac_tr_func 1
2903 < EOF
2904 <
2905 < else
2906 <  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"
2896 >          CFLAGS="$ac_save_CFLAGS"
2897 >          LIBS="$ac_save_LIBS"
2898 >       fi
2899 >     fi
2900 >     ESD_CFLAGS=""
2901 >     ESD_LIBS=""
2902 >    
2903 >    echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
2904 >    WANT_ESD=no
2905 >    DEFINES="$DEFINES -DENABLE_ESD=0"
2906 >  
2907    fi
2908 +  
2909 +  
2910 +  rm -f conf.esdtest
2911 +
2912   fi
2913  
2914   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2915 < echo "configure:2574: checking for ANSI C header files" >&5
2915 > echo "configure:2916: checking for ANSI C header files" >&5
2916   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2917    echo $ac_n "(cached) $ac_c" 1>&6
2918   else
2919    cat > conftest.$ac_ext <<EOF
2920 < #line 2579 "configure"
2920 > #line 2921 "configure"
2921   #include "confdefs.h"
2922   #include <stdlib.h>
2923   #include <stdarg.h>
# Line 2583 | Line 2925 | else
2925   #include <float.h>
2926   EOF
2927   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2928 < { (eval echo configure:2587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2928 > { (eval echo configure:2929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2929   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2930   if test -z "$ac_err"; then
2931    rm -rf conftest*
# Line 2600 | Line 2942 | rm -f conftest*
2942   if test $ac_cv_header_stdc = yes; then
2943    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2944   cat > conftest.$ac_ext <<EOF
2945 < #line 2604 "configure"
2945 > #line 2946 "configure"
2946   #include "confdefs.h"
2947   #include <string.h>
2948   EOF
# Line 2618 | Line 2960 | fi
2960   if test $ac_cv_header_stdc = yes; then
2961    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2962   cat > conftest.$ac_ext <<EOF
2963 < #line 2622 "configure"
2963 > #line 2964 "configure"
2964   #include "confdefs.h"
2965   #include <stdlib.h>
2966   EOF
# Line 2639 | Line 2981 | if test "$cross_compiling" = yes; then
2981    :
2982   else
2983    cat > conftest.$ac_ext <<EOF
2984 < #line 2643 "configure"
2984 > #line 2985 "configure"
2985   #include "confdefs.h"
2986   #include <ctype.h>
2987   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2650 | Line 2992 | if (XOR (islower (i), ISLOWER (i)) || to
2992   exit (0); }
2993  
2994   EOF
2995 < if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2995 > if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2996   then
2997    :
2998   else
# Line 2677 | Line 3019 | for ac_hdr in unistd.h fcntl.h sys/time.
3019   do
3020   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3021   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3022 < echo "configure:2681: checking for $ac_hdr" >&5
3022 > echo "configure:3023: checking for $ac_hdr" >&5
3023   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3024    echo $ac_n "(cached) $ac_c" 1>&6
3025   else
3026    cat > conftest.$ac_ext <<EOF
3027 < #line 2686 "configure"
3027 > #line 3028 "configure"
3028   #include "confdefs.h"
3029   #include <$ac_hdr>
3030   EOF
3031   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3032 < { (eval echo configure:2691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3032 > { (eval echo configure:3033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3033   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3034   if test -z "$ac_err"; then
3035    rm -rf conftest*
# Line 2715 | Line 3057 | done
3057  
3058  
3059   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
3060 < echo "configure:2719: checking whether byte ordering is bigendian" >&5
3060 > echo "configure:3061: checking whether byte ordering is bigendian" >&5
3061   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
3062    echo $ac_n "(cached) $ac_c" 1>&6
3063   else
3064    ac_cv_c_bigendian=unknown
3065   # See if sys/param.h defines the BYTE_ORDER macro.
3066   cat > conftest.$ac_ext <<EOF
3067 < #line 2726 "configure"
3067 > #line 3068 "configure"
3068   #include "confdefs.h"
3069   #include <sys/types.h>
3070   #include <sys/param.h>
# Line 2733 | Line 3075 | int main() {
3075   #endif
3076   ; return 0; }
3077   EOF
3078 < if { (eval echo configure:2737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3078 > if { (eval echo configure:3079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3079    rm -rf conftest*
3080    # It does; now see whether it defined to BIG_ENDIAN or not.
3081   cat > conftest.$ac_ext <<EOF
3082 < #line 2741 "configure"
3082 > #line 3083 "configure"
3083   #include "confdefs.h"
3084   #include <sys/types.h>
3085   #include <sys/param.h>
# Line 2748 | Line 3090 | int main() {
3090   #endif
3091   ; return 0; }
3092   EOF
3093 < if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3093 > if { (eval echo configure:3094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3094    rm -rf conftest*
3095    ac_cv_c_bigendian=yes
3096   else
# Line 2768 | Line 3110 | if test "$cross_compiling" = yes; then
3110      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3111   else
3112    cat > conftest.$ac_ext <<EOF
3113 < #line 2772 "configure"
3113 > #line 3114 "configure"
3114   #include "confdefs.h"
3115   main () {
3116    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 2781 | Line 3123 | main () {
3123    exit (u.c[sizeof (long) - 1] == 1);
3124   }
3125   EOF
3126 < if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3126 > if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3127   then
3128    ac_cv_c_bigendian=no
3129   else
# Line 2805 | Line 3147 | EOF
3147   fi
3148  
3149   echo $ac_n "checking for working const""... $ac_c" 1>&6
3150 < echo "configure:2809: checking for working const" >&5
3150 > echo "configure:3151: checking for working const" >&5
3151   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3152    echo $ac_n "(cached) $ac_c" 1>&6
3153   else
3154    cat > conftest.$ac_ext <<EOF
3155 < #line 2814 "configure"
3155 > #line 3156 "configure"
3156   #include "confdefs.h"
3157  
3158   int main() {
# Line 2859 | Line 3201 | ccp = (char const *const *) p;
3201  
3202   ; return 0; }
3203   EOF
3204 < if { (eval echo configure:2863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3204 > if { (eval echo configure:3205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3205    rm -rf conftest*
3206    ac_cv_c_const=yes
3207   else
# Line 2880 | Line 3222 | EOF
3222   fi
3223  
3224   echo $ac_n "checking for inline""... $ac_c" 1>&6
3225 < echo "configure:2884: checking for inline" >&5
3225 > echo "configure:3226: checking for inline" >&5
3226   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3227    echo $ac_n "(cached) $ac_c" 1>&6
3228   else
3229    ac_cv_c_inline=no
3230   for ac_kw in inline __inline__ __inline; do
3231    cat > conftest.$ac_ext <<EOF
3232 < #line 2891 "configure"
3232 > #line 3233 "configure"
3233   #include "confdefs.h"
3234  
3235   int main() {
3236   } $ac_kw foo() {
3237   ; return 0; }
3238   EOF
3239 < if { (eval echo configure:2898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3239 > if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3240    rm -rf conftest*
3241    ac_cv_c_inline=$ac_kw; break
3242   else
# Line 2920 | Line 3262 | EOF
3262   esac
3263  
3264   echo $ac_n "checking size of short""... $ac_c" 1>&6
3265 < echo "configure:2924: checking size of short" >&5
3265 > echo "configure:3266: checking size of short" >&5
3266   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3267    echo $ac_n "(cached) $ac_c" 1>&6
3268   else
# Line 2928 | Line 3270 | else
3270    ac_cv_sizeof_short=2
3271   else
3272    cat > conftest.$ac_ext <<EOF
3273 < #line 2932 "configure"
3273 > #line 3274 "configure"
3274   #include "confdefs.h"
3275   #include <stdio.h>
3276   main()
# Line 2939 | Line 3281 | main()
3281    exit(0);
3282   }
3283   EOF
3284 < if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3284 > if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3285   then
3286    ac_cv_sizeof_short=`cat conftestval`
3287   else
# Line 2959 | Line 3301 | EOF
3301  
3302  
3303   echo $ac_n "checking size of int""... $ac_c" 1>&6
3304 < echo "configure:2963: checking size of int" >&5
3304 > echo "configure:3305: checking size of int" >&5
3305   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3306    echo $ac_n "(cached) $ac_c" 1>&6
3307   else
# Line 2967 | Line 3309 | else
3309    ac_cv_sizeof_int=4
3310   else
3311    cat > conftest.$ac_ext <<EOF
3312 < #line 2971 "configure"
3312 > #line 3313 "configure"
3313   #include "confdefs.h"
3314   #include <stdio.h>
3315   main()
# Line 2978 | Line 3320 | main()
3320    exit(0);
3321   }
3322   EOF
3323 < if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3323 > if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3324   then
3325    ac_cv_sizeof_int=`cat conftestval`
3326   else
# Line 2998 | Line 3340 | EOF
3340  
3341  
3342   echo $ac_n "checking size of long""... $ac_c" 1>&6
3343 < echo "configure:3002: checking size of long" >&5
3343 > echo "configure:3344: checking size of long" >&5
3344   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3345    echo $ac_n "(cached) $ac_c" 1>&6
3346   else
# Line 3006 | Line 3348 | else
3348    ac_cv_sizeof_long=4
3349   else
3350    cat > conftest.$ac_ext <<EOF
3351 < #line 3010 "configure"
3351 > #line 3352 "configure"
3352   #include "confdefs.h"
3353   #include <stdio.h>
3354   main()
# Line 3017 | Line 3359 | main()
3359    exit(0);
3360   }
3361   EOF
3362 < if { (eval echo configure:3021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3362 > if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3363   then
3364    ac_cv_sizeof_long=`cat conftestval`
3365   else
# Line 3037 | Line 3379 | EOF
3379  
3380  
3381   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3382 < echo "configure:3041: checking size of long long" >&5
3382 > echo "configure:3383: checking size of long long" >&5
3383   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3384    echo $ac_n "(cached) $ac_c" 1>&6
3385   else
# Line 3045 | Line 3387 | else
3387    ac_cv_sizeof_long_long=8
3388   else
3389    cat > conftest.$ac_ext <<EOF
3390 < #line 3049 "configure"
3390 > #line 3391 "configure"
3391   #include "confdefs.h"
3392   #include <stdio.h>
3393   main()
# Line 3056 | Line 3398 | main()
3398    exit(0);
3399   }
3400   EOF
3401 < if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3401 > if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3402   then
3403    ac_cv_sizeof_long_long=`cat conftestval`
3404   else
# Line 3076 | Line 3418 | EOF
3418  
3419  
3420   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3421 < echo "configure:3080: checking for off_t" >&5
3421 > echo "configure:3422: checking for off_t" >&5
3422   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3423    echo $ac_n "(cached) $ac_c" 1>&6
3424   else
3425    cat > conftest.$ac_ext <<EOF
3426 < #line 3085 "configure"
3426 > #line 3427 "configure"
3427   #include "confdefs.h"
3428   #include <sys/types.h>
3429   #if STDC_HEADERS
# Line 3109 | Line 3451 | EOF
3451   fi
3452  
3453   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3454 < echo "configure:3113: checking for loff_t" >&5
3454 > echo "configure:3455: checking for loff_t" >&5
3455   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3456    echo $ac_n "(cached) $ac_c" 1>&6
3457   else
3458    cat > conftest.$ac_ext <<EOF
3459 < #line 3118 "configure"
3459 > #line 3460 "configure"
3460   #include "confdefs.h"
3461   #include <sys/types.h>
3462   #if STDC_HEADERS
# Line 3142 | Line 3484 | EOF
3484   fi
3485  
3486   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3487 < echo "configure:3146: checking for size_t" >&5
3487 > echo "configure:3488: checking for size_t" >&5
3488   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3489    echo $ac_n "(cached) $ac_c" 1>&6
3490   else
3491    cat > conftest.$ac_ext <<EOF
3492 < #line 3151 "configure"
3492 > #line 3493 "configure"
3493   #include "confdefs.h"
3494   #include <sys/types.h>
3495   #if STDC_HEADERS
# Line 3175 | Line 3517 | EOF
3517   fi
3518  
3519   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3520 < echo "configure:3179: checking whether time.h and sys/time.h may both be included" >&5
3520 > echo "configure:3521: checking whether time.h and sys/time.h may both be included" >&5
3521   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3522    echo $ac_n "(cached) $ac_c" 1>&6
3523   else
3524    cat > conftest.$ac_ext <<EOF
3525 < #line 3184 "configure"
3525 > #line 3526 "configure"
3526   #include "confdefs.h"
3527   #include <sys/types.h>
3528   #include <sys/time.h>
# Line 3189 | Line 3531 | int main() {
3531   struct tm *tp;
3532   ; return 0; }
3533   EOF
3534 < if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3534 > if { (eval echo configure:3535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3535    rm -rf conftest*
3536    ac_cv_header_time=yes
3537   else
# Line 3210 | Line 3552 | EOF
3552   fi
3553  
3554   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3555 < echo "configure:3214: checking whether struct tm is in sys/time.h or time.h" >&5
3555 > echo "configure:3556: checking whether struct tm is in sys/time.h or time.h" >&5
3556   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3557    echo $ac_n "(cached) $ac_c" 1>&6
3558   else
3559    cat > conftest.$ac_ext <<EOF
3560 < #line 3219 "configure"
3560 > #line 3561 "configure"
3561   #include "confdefs.h"
3562   #include <sys/types.h>
3563   #include <time.h>
# Line 3223 | Line 3565 | int main() {
3565   struct tm *tp; tp->tm_sec;
3566   ; return 0; }
3567   EOF
3568 < if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3568 > if { (eval echo configure:3569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3569    rm -rf conftest*
3570    ac_cv_struct_tm=time.h
3571   else
# Line 3247 | Line 3589 | fi
3589   for ac_func in strdup cfmakeraw
3590   do
3591   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3592 < echo "configure:3251: checking for $ac_func" >&5
3592 > echo "configure:3593: checking for $ac_func" >&5
3593   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3594    echo $ac_n "(cached) $ac_c" 1>&6
3595   else
3596    cat > conftest.$ac_ext <<EOF
3597 < #line 3256 "configure"
3597 > #line 3598 "configure"
3598   #include "confdefs.h"
3599   /* System header to define __stub macros and hopefully few prototypes,
3600      which can conflict with char $ac_func(); below.  */
# Line 3275 | Line 3617 | $ac_func();
3617  
3618   ; return 0; }
3619   EOF
3620 < if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3620 > if { (eval echo configure:3621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3621    rm -rf conftest*
3622    eval "ac_cv_func_$ac_func=yes"
3623   else
# Line 3302 | Line 3644 | done
3644   for ac_func in nanosleep clock_gettime timer_create
3645   do
3646   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3647 < echo "configure:3306: checking for $ac_func" >&5
3647 > echo "configure:3648: checking for $ac_func" >&5
3648 > if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3649 >  echo $ac_n "(cached) $ac_c" 1>&6
3650 > else
3651 >  cat > conftest.$ac_ext <<EOF
3652 > #line 3653 "configure"
3653 > #include "confdefs.h"
3654 > /* System header to define __stub macros and hopefully few prototypes,
3655 >    which can conflict with char $ac_func(); below.  */
3656 > #include <assert.h>
3657 > /* Override any gcc2 internal prototype to avoid an error.  */
3658 > /* We use char because int might match the return type of a gcc2
3659 >    builtin and then its argument prototype would still apply.  */
3660 > char $ac_func();
3661 >
3662 > int main() {
3663 >
3664 > /* The GNU C library defines this for functions which it implements
3665 >    to always fail with ENOSYS.  Some functions are actually named
3666 >    something starting with __ and the normal name is an alias.  */
3667 > #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
3668 > choke me
3669 > #else
3670 > $ac_func();
3671 > #endif
3672 >
3673 > ; return 0; }
3674 > EOF
3675 > if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3676 >  rm -rf conftest*
3677 >  eval "ac_cv_func_$ac_func=yes"
3678 > else
3679 >  echo "configure: failed program was:" >&5
3680 >  cat conftest.$ac_ext >&5
3681 >  rm -rf conftest*
3682 >  eval "ac_cv_func_$ac_func=no"
3683 > fi
3684 > rm -f conftest*
3685 > fi
3686 >
3687 > if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
3688 >  echo "$ac_t""yes" 1>&6
3689 >    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3690 >  cat >> confdefs.h <<EOF
3691 > #define $ac_tr_func 1
3692 > EOF
3693 >
3694 > else
3695 >  echo "$ac_t""no" 1>&6
3696 > fi
3697 > done
3698 >
3699 > for ac_func in pthread_cancel
3700 > do
3701 > echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3702 > echo "configure:3703: checking for $ac_func" >&5
3703   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3704    echo $ac_n "(cached) $ac_c" 1>&6
3705   else
3706    cat > conftest.$ac_ext <<EOF
3707 < #line 3311 "configure"
3707 > #line 3708 "configure"
3708   #include "confdefs.h"
3709   /* System header to define __stub macros and hopefully few prototypes,
3710      which can conflict with char $ac_func(); below.  */
# Line 3330 | Line 3727 | $ac_func();
3727  
3728   ; return 0; }
3729   EOF
3730 < if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3730 > if { (eval echo configure:3731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3731    rm -rf conftest*
3732    eval "ac_cv_func_$ac_func=yes"
3733   else
# Line 3359 | Line 3756 | SYSSRCS="../dummy/ether_dummy.cpp ../dum
3756   if MACHINE=`uname -a 2>/dev/null`; then
3757    case "$MACHINE" in
3758    Linux*)
3759 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp"
3759 >    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
3760      ;;
3761    FreeBSD*3.*)
3762          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3763 < echo "configure:3367: checking for cam_open_btl in -lcam" >&5
3763 > echo "configure:3764: checking for cam_open_btl in -lcam" >&5
3764   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3765   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3766    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3371 | Line 3768 | else
3768    ac_save_LIBS="$LIBS"
3769   LIBS="-lcam  $LIBS"
3770   cat > conftest.$ac_ext <<EOF
3771 < #line 3375 "configure"
3771 > #line 3772 "configure"
3772   #include "confdefs.h"
3773   /* Override any gcc2 internal prototype to avoid an error.  */
3774   /* We use char because int might match the return type of a gcc2
# Line 3382 | Line 3779 | int main() {
3779   cam_open_btl()
3780   ; return 0; }
3781   EOF
3782 < if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3782 > if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3783    rm -rf conftest*
3784    eval "ac_cv_lib_$ac_lib_var=yes"
3785   else
# Line 3408 | Line 3805 | fi
3805      else
3806              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3807   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3808 < echo "configure:3412: checking for /sys/cam/cam.h" >&5
3808 > echo "configure:3809: checking for /sys/cam/cam.h" >&5
3809   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3810    echo $ac_n "(cached) $ac_c" 1>&6
3811   else
3812    cat > conftest.$ac_ext <<EOF
3813 < #line 3417 "configure"
3813 > #line 3814 "configure"
3814   #include "confdefs.h"
3815   #include </sys/cam/cam.h>
3816   EOF
3817   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3818 < { (eval echo configure:3422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3818 > { (eval echo configure:3819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3819   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3820   if test -z "$ac_err"; then
3821    rm -rf conftest*
# Line 3442 | Line 3839 | fi
3839        if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then
3840                          { echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; }
3841        fi
3842 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3842 >      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
3843        CXXFLAGS="$CXXFLAGS -I/sys"
3844        CFLAGS="$CFLAGS -I/sys"
3845        LIBS="$LIBS -lcam"
# Line 3451 | Line 3848 | fi
3848      ;;
3849    FreeBSD*)
3850          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3851 < echo "configure:3455: checking for scsi_open in -lscsi" >&5
3851 > echo "configure:3852: checking for scsi_open in -lscsi" >&5
3852   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3853   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3854    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3459 | Line 3856 | else
3856    ac_save_LIBS="$LIBS"
3857   LIBS="-lscsi  $LIBS"
3858   cat > conftest.$ac_ext <<EOF
3859 < #line 3463 "configure"
3859 > #line 3860 "configure"
3860   #include "confdefs.h"
3861   /* Override any gcc2 internal prototype to avoid an error.  */
3862   /* We use char because int might match the return type of a gcc2
# Line 3470 | Line 3867 | int main() {
3867   scsi_open()
3868   ; return 0; }
3869   EOF
3870 < if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3870 > if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3871    rm -rf conftest*
3872    eval "ac_cv_lib_$ac_lib_var=yes"
3873   else
# Line 3496 | Line 3893 | fi
3893      else
3894              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3895   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3896 < echo "configure:3500: checking for scsi.h sys/scsiio.h" >&5
3896 > echo "configure:3897: checking for scsi.h sys/scsiio.h" >&5
3897   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3898    echo $ac_n "(cached) $ac_c" 1>&6
3899   else
3900    cat > conftest.$ac_ext <<EOF
3901 < #line 3505 "configure"
3901 > #line 3902 "configure"
3902   #include "confdefs.h"
3903   #include <scsi.h sys/scsiio.h>
3904   EOF
3905   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3906 < { (eval echo configure:3510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3906 > { (eval echo configure:3907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3907   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3908   if test -z "$ac_err"; then
3909    rm -rf conftest*
# Line 3545 | Line 3942 | fi
3942      LIBS="$LIBS -lm"
3943      ;;
3944    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
3945   fi
3946 < if [ "x$SEMSRCS" != "x" ]; then
3555 <  SYSSRCS="$SYSSRCS $SEMSRCS"
3556 < fi
3557 <
3558 < CPUINCLUDES="-I../uae_cpu"
3559 < CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp"
3946 > SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
3947  
3948   HAVE_I386=no
3949   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
3950 < echo "configure:3564: checking for x86 target CPU" >&5
3950 > echo "configure:3951: checking for x86 target CPU" >&5
3951   cat > conftest.$ac_ext <<EOF
3952 < #line 3566 "configure"
3952 > #line 3953 "configure"
3953   #include "confdefs.h"
3954  
3955   #ifdef __i386__
# Line 3581 | Line 3968 | fi
3968   rm -f conftest*
3969  
3970  
3971 + HAVE_SPARC=no
3972 + echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
3973 + echo "configure:3974: checking for SPARC target CPU" >&5
3974 + cat > conftest.$ac_ext <<EOF
3975 + #line 3976 "configure"
3976 + #include "confdefs.h"
3977 +
3978 + #ifdef __sparc__
3979 +  yes
3980 + #endif
3981 +
3982 + EOF
3983 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3984 +  egrep "yes" >/dev/null 2>&1; then
3985 +  rm -rf conftest*
3986 +  echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes
3987 + else
3988 +  rm -rf conftest*
3989 +  echo "$ac_t""no" 1>&6
3990 + fi
3991 + rm -f conftest*
3992 +
3993 +
3994   HAVE_GAS=no
3995   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
3996 < echo "configure:3587: checking for GAS .p2align feature" >&5
3996 > echo "configure:3997: checking for GAS .p2align feature" >&5
3997   cat >conftest.S << EOF
3998          .text
3999          .p2align 5
# Line 3593 | Line 4003 | echo "$ac_t""$HAVE_GAS" 1>&6
4003  
4004   HAVE_GCC27=no
4005   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
4006 < echo "configure:3597: checking for GCC 2.7 or higher" >&5
4006 > echo "configure:4007: checking for GCC 2.7 or higher" >&5
4007   cat > conftest.$ac_ext <<EOF
4008 < #line 3599 "configure"
4008 > #line 4009 "configure"
4009   #include "confdefs.h"
4010   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
4011    yes
# Line 3618 | Line 4028 | if [ "x$HAVE_GCC27" = "xyes" ]; then
4028    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
4029   fi
4030  
4031 + WANT_X86_ASSEMBLY=no
4032 + WANT_SPARC_V8_ASSEMBLY=no
4033 + WANT_SPARC_V9_ASSEMBLY=no
4034 + CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
4035   if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
4036 <  DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4036 >    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4037    if [ "x$HAVE_GAS" = "xyes" ]; then
4038 +    WANT_X86_ASSEMBLY=yes
4039      DEFINES="$DEFINES -DX86_ASSEMBLY"
4040 <    CPUSRCS="$CPUSRCS cpufast.s"
3626 <  else
3627 <    CPUSRCS="$CPUSRCS cpuemu.cpp"
4040 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4041    fi
4042 < else
4043 <  CPUSRCS="$CPUSRCS cpuemu.cpp"
4042 > elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
4043 >    case "$MACHINE" in
4044 >  SunOS*)
4045 >    echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
4046 > echo "configure:4047: checking SPARC CPU architecture" >&5
4047 >    SPARC_TYPE=`Solaris/which_sparc`
4048 >    echo "$ac_t""$SPARC_TYPE" 1>&6
4049 >    case "$SPARC_TYPE" in
4050 >    SPARC_V8)
4051 >      WANT_SPARC_V8_ASSEMBLY=yes
4052 >      DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
4053 >      CFLAGS="$CFLAGS -Wa,-Av8"
4054 >      CXXFLAGS="$CXXFLAGS -Wa,-Av8"
4055 >      ;;
4056 >    SPARC_V9)
4057 >      WANT_SPARC_V9_ASSEMBLY=yes
4058 >      DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
4059 >      CFLAGS="$CFLAGS -Wa,-Av9"
4060 >      CXXFLAGS="$CXXFLAGS -Wa,-Av9"
4061 >      ;;
4062 >    esac
4063 >    ;;
4064 >  esac
4065   fi
4066  
4067 + CPUINCLUDES="-I../uae_cpu"
4068 + 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"
4069  
4070  
4071  
# Line 3769 | Line 4205 | s%@oldincludedir@%$oldincludedir%g
4205   s%@infodir@%$infodir%g
4206   s%@mandir@%$mandir%g
4207   s%@CC@%$CC%g
3772 – s%@CXX@%$CXX%g
4208   s%@CPP@%$CPP%g
4209 + s%@CXX@%$CXX%g
4210   s%@SET_MAKE@%$SET_MAKE%g
4211   s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
4212   s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
# Line 3782 | Line 4218 | s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
4218   s%@GTK_CONFIG@%$GTK_CONFIG%g
4219   s%@GTK_CFLAGS@%$GTK_CFLAGS%g
4220   s%@GTK_LIBS@%$GTK_LIBS%g
4221 + s%@ESD_CONFIG@%$ESD_CONFIG%g
4222 + s%@ESD_CFLAGS@%$ESD_CFLAGS%g
4223 + s%@ESD_LIBS@%$ESD_LIBS%g
4224   s%@DEFINES@%$DEFINES%g
3786 – s%@STATICLIBS@%$STATICLIBS%g
4225   s%@SYSSRCS@%$SYSSRCS%g
4226   s%@CPUINCLUDES@%$CPUINCLUDES%g
4227   s%@CPUSRCS@%$CPUSRCS%g
# Line 4006 | Line 4444 | chmod +x $CONFIG_STATUS
4444   rm -fr confdefs* $ac_clean_files
4445   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
4446  
4447 +
4448 + echo
4449 + echo Basilisk II configuration summary:
4450 + echo
4451 + echo XFree86 DGA support .............. : $WANT_XF86_DGA
4452 + echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4453 + echo ESD sound support ................ : $WANT_ESD
4454 + echo GTK user interface ............... : $WANT_GTK
4455 + echo mon debugger support ............. : $WANT_MON
4456 + echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4457 + echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
4458 + echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
4459 + echo
4460   echo "Configuration done. Now type \"make\"."

Diff Legend

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