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.11 by cebix, 1999-10-25T19:01:35Z vs.
Revision 1.19 by cebix, 2000-07-13T16:12:29Z

# Line 14 | Line 14 | ac_default_prefix=/usr/local
14   ac_help="$ac_help
15    --enable-xf86-dga       use the XFree86 DGA extension [default=yes]"
16   ac_help="$ac_help
17 +  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]"
18 + ac_help="$ac_help
19    --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]"
20   ac_help="$ac_help
21 <  --enable-esd            Enlightened Sound Daemon support [default=yes]"
21 >  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]"
22 > ac_help="$ac_help
23 >  --with-gtk              use GTK user interface [default=yes]"
24   ac_help="$ac_help
25 <  --enable-ui             use GTK user interface [default=yes]"
25 >  --with-mon              use mon as debugger [default=yes]"
26   ac_help="$ac_help
27    --with-x                use the X Window System"
28   ac_help="$ac_help
# Line 554 | Line 558 | else
558    WANT_XF86_DGA=yes
559   fi
560  
561 + # Check whether --enable-xf86-vidmode or --disable-xf86-vidmode was given.
562 + if test "${enable_xf86_vidmode+set}" = set; then
563 +  enableval="$enable_xf86_vidmode"
564 +  WANT_XF86_VIDMODE=$enableval
565 + else
566 +  WANT_XF86_VIDMODE=yes
567 + fi
568 +
569   # Check whether --enable-fbdev-dga or --disable-fbdev-dga was given.
570   if test "${enable_fbdev_dga+set}" = set; then
571    enableval="$enable_fbdev_dga"
# Line 562 | Line 574 | else
574    WANT_FBDEV_DGA=yes
575   fi
576  
577 < # Check whether --enable-esd or --disable-esd was given.
578 < if test "${enable_esd+set}" = set; then
579 <  enableval="$enable_esd"
580 <  WANT_ESD=$enableval
577 > # Check whether --with-esd or --without-esd was given.
578 > if test "${with_esd+set}" = set; then
579 >  withval="$with_esd"
580 >  WANT_ESD=$withval
581   else
582    WANT_ESD=yes
583   fi
584  
585 < # Check whether --enable-ui or --disable-ui was given.
586 < if test "${enable_ui+set}" = set; then
587 <  enableval="$enable_ui"
588 <  WANT_UI=$enableval
585 > # Check whether --with-gtk or --without-gtk was given.
586 > if test "${with_gtk+set}" = set; then
587 >  withval="$with_gtk"
588 >  WANT_GTK=$withval
589 > else
590 >  WANT_GTK=yes
591 > fi
592 >
593 > # Check whether --with-mon or --without-mon was given.
594 > if test "${with_mon+set}" = set; then
595 >  withval="$with_mon"
596 >  WANT_MON=$withval
597   else
598 <  WANT_UI=yes
598 >  WANT_MON=yes
599   fi
600  
601  
602   # Extract the first word of "gcc", so it can be a program name with args.
603   set dummy gcc; ac_word=$2
604   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
605 < echo "configure:586: checking for $ac_word" >&5
605 > echo "configure:606: checking for $ac_word" >&5
606   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
607    echo $ac_n "(cached) $ac_c" 1>&6
608   else
# Line 612 | Line 632 | if test -z "$CC"; then
632    # Extract the first word of "cc", so it can be a program name with args.
633   set dummy cc; ac_word=$2
634   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
635 < echo "configure:616: checking for $ac_word" >&5
635 > echo "configure:636: checking for $ac_word" >&5
636   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
637    echo $ac_n "(cached) $ac_c" 1>&6
638   else
# Line 663 | Line 683 | fi
683        # Extract the first word of "cl", so it can be a program name with args.
684   set dummy cl; ac_word=$2
685   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
686 < echo "configure:667: checking for $ac_word" >&5
686 > echo "configure:687: checking for $ac_word" >&5
687   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
688    echo $ac_n "(cached) $ac_c" 1>&6
689   else
# Line 695 | Line 715 | fi
715   fi
716  
717   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
718 < echo "configure:699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
718 > echo "configure:719: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
719  
720   ac_ext=c
721   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 706 | Line 726 | cross_compiling=$ac_cv_prog_cc_cross
726  
727   cat > conftest.$ac_ext << EOF
728  
729 < #line 710 "configure"
729 > #line 730 "configure"
730   #include "confdefs.h"
731  
732   main(){return(0);}
733   EOF
734 < if { (eval echo configure:715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
734 > if { (eval echo configure:735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
735    ac_cv_prog_cc_works=yes
736    # If we can't run a trivial program, we are probably using a cross compiler.
737    if (./conftest; exit) 2>/dev/null; then
# Line 737 | Line 757 | if test $ac_cv_prog_cc_works = no; then
757    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
758   fi
759   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
760 < echo "configure:741: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
760 > echo "configure:761: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
761   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
762   cross_compiling=$ac_cv_prog_cc_cross
763  
764   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
765 < echo "configure:746: checking whether we are using GNU C" >&5
765 > echo "configure:766: checking whether we are using GNU C" >&5
766   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
767    echo $ac_n "(cached) $ac_c" 1>&6
768   else
# Line 751 | Line 771 | else
771    yes;
772   #endif
773   EOF
774 < if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
774 > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
775    ac_cv_prog_gcc=yes
776   else
777    ac_cv_prog_gcc=no
# Line 770 | Line 790 | ac_test_CFLAGS="${CFLAGS+set}"
790   ac_save_CFLAGS="$CFLAGS"
791   CFLAGS=
792   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
793 < echo "configure:774: checking whether ${CC-cc} accepts -g" >&5
793 > echo "configure:794: checking whether ${CC-cc} accepts -g" >&5
794   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
795    echo $ac_n "(cached) $ac_c" 1>&6
796   else
# Line 802 | Line 822 | else
822   fi
823  
824   echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
825 < echo "configure:806: checking how to run the C preprocessor" >&5
825 > echo "configure:826: checking how to run the C preprocessor" >&5
826   # On Suns, sometimes $CPP names a directory.
827   if test -n "$CPP" && test -d "$CPP"; then
828    CPP=
# Line 817 | Line 837 | else
837    # On the NeXT, cc -E runs the code through the compiler's parser,
838    # not just through cpp.
839    cat > conftest.$ac_ext <<EOF
840 < #line 821 "configure"
840 > #line 841 "configure"
841   #include "confdefs.h"
842   #include <assert.h>
843   Syntax Error
844   EOF
845   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
846 < { (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
846 > { (eval echo configure:847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
847   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
848   if test -z "$ac_err"; then
849    :
# Line 834 | Line 854 | else
854    rm -rf conftest*
855    CPP="${CC-cc} -E -traditional-cpp"
856    cat > conftest.$ac_ext <<EOF
857 < #line 838 "configure"
857 > #line 858 "configure"
858   #include "confdefs.h"
859   #include <assert.h>
860   Syntax Error
861   EOF
862   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
863 < { (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
863 > { (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
864   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
865   if test -z "$ac_err"; then
866    :
# Line 851 | Line 871 | else
871    rm -rf conftest*
872    CPP="${CC-cc} -nologo -E"
873    cat > conftest.$ac_ext <<EOF
874 < #line 855 "configure"
874 > #line 875 "configure"
875   #include "confdefs.h"
876   #include <assert.h>
877   Syntax Error
878   EOF
879   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
880 < { (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
880 > { (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
881   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
882   if test -z "$ac_err"; then
883    :
# Line 886 | Line 906 | do
906   # Extract the first word of "$ac_prog", so it can be a program name with args.
907   set dummy $ac_prog; ac_word=$2
908   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
909 < echo "configure:890: checking for $ac_word" >&5
909 > echo "configure:910: checking for $ac_word" >&5
910   if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
911    echo $ac_n "(cached) $ac_c" 1>&6
912   else
# Line 918 | Line 938 | test -n "$CXX" || CXX="gcc"
938  
939  
940   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
941 < echo "configure:922: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
941 > echo "configure:942: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
942  
943   ac_ext=C
944   # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 929 | Line 949 | cross_compiling=$ac_cv_prog_cxx_cross
949  
950   cat > conftest.$ac_ext << EOF
951  
952 < #line 933 "configure"
952 > #line 953 "configure"
953   #include "confdefs.h"
954  
955   int main(){return(0);}
956   EOF
957 < if { (eval echo configure:938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
957 > if { (eval echo configure:958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
958    ac_cv_prog_cxx_works=yes
959    # If we can't run a trivial program, we are probably using a cross compiler.
960    if (./conftest; exit) 2>/dev/null; then
# Line 960 | Line 980 | if test $ac_cv_prog_cxx_works = no; then
980    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
981   fi
982   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
983 < echo "configure:964: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
983 > echo "configure:984: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
984   echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
985   cross_compiling=$ac_cv_prog_cxx_cross
986  
987   echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
988 < echo "configure:969: checking whether we are using GNU C++" >&5
988 > echo "configure:989: checking whether we are using GNU C++" >&5
989   if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
990    echo $ac_n "(cached) $ac_c" 1>&6
991   else
# Line 974 | Line 994 | else
994    yes;
995   #endif
996   EOF
997 < if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
997 > if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
998    ac_cv_prog_gxx=yes
999   else
1000    ac_cv_prog_gxx=no
# Line 993 | Line 1013 | ac_test_CXXFLAGS="${CXXFLAGS+set}"
1013   ac_save_CXXFLAGS="$CXXFLAGS"
1014   CXXFLAGS=
1015   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
1016 < echo "configure:997: checking whether ${CXX-g++} accepts -g" >&5
1016 > echo "configure:1017: checking whether ${CXX-g++} accepts -g" >&5
1017   if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
1018    echo $ac_n "(cached) $ac_c" 1>&6
1019   else
# Line 1025 | Line 1045 | else
1045   fi
1046  
1047   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
1048 < echo "configure:1029: checking whether ${MAKE-make} sets \${MAKE}" >&5
1048 > echo "configure:1049: checking whether ${MAKE-make} sets \${MAKE}" >&5
1049   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
1050   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
1051    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1082 | Line 1102 | ac_configure=$ac_aux_dir/configure # Thi
1102   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1103   # ./install, which can be erroneously created by make from ./install.sh.
1104   echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
1105 < echo "configure:1086: checking for a BSD compatible install" >&5
1105 > echo "configure:1106: checking for a BSD compatible install" >&5
1106   if test -z "$INSTALL"; then
1107   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
1108    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1135 | Line 1155 | test -z "$INSTALL_SCRIPT" && INSTALL_SCR
1155   test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1156  
1157  
1158 + HAVE_I386=no
1159 + echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
1160 + echo "configure:1161: checking for x86 target CPU" >&5
1161 + cat > conftest.$ac_ext <<EOF
1162 + #line 1163 "configure"
1163 + #include "confdefs.h"
1164 +
1165 + #ifdef __i386__
1166 +  yes
1167 + #endif
1168 +
1169 + EOF
1170 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1171 +  egrep "yes" >/dev/null 2>&1; then
1172 +  rm -rf conftest*
1173 +  echo "$ac_t""yes" 1>&6; HAVE_I386=yes
1174 + else
1175 +  rm -rf conftest*
1176 +  echo "$ac_t""no" 1>&6
1177 + fi
1178 + rm -f conftest*
1179 +
1180 +
1181 + HAVE_SPARC=no
1182 + echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
1183 + echo "configure:1184: checking for SPARC target CPU" >&5
1184 + cat > conftest.$ac_ext <<EOF
1185 + #line 1186 "configure"
1186 + #include "confdefs.h"
1187 +
1188 + #ifdef __sparc__
1189 +  yes
1190 + #endif
1191 +
1192 + EOF
1193 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1194 +  egrep "yes" >/dev/null 2>&1; then
1195 +  rm -rf conftest*
1196 +  echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes
1197 + else
1198 +  rm -rf conftest*
1199 +  echo "$ac_t""no" 1>&6
1200 + fi
1201 + rm -f conftest*
1202 +
1203 +
1204 + HAVE_M68K=no
1205 + echo $ac_n "checking for m68k target CPU""... $ac_c" 1>&6
1206 + echo "configure:1207: checking for m68k target CPU" >&5
1207 + cat > conftest.$ac_ext <<EOF
1208 + #line 1209 "configure"
1209 + #include "confdefs.h"
1210 +
1211 + #ifdef __m68k__
1212 +  yes
1213 + #endif
1214 +
1215 + EOF
1216 + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1217 +  egrep "yes" >/dev/null 2>&1; then
1218 +  rm -rf conftest*
1219 +  echo "$ac_t""yes" 1>&6; HAVE_M68K=yes
1220 + else
1221 +  rm -rf conftest*
1222 +  echo "$ac_t""no" 1>&6
1223 + fi
1224 + rm -f conftest*
1225 +
1226 +
1227   MONSRCS=
1228 < echo $ac_n "checking for mon""... $ac_c" 1>&6
1229 < echo "configure:1141: checking for mon" >&5
1230 < if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1228 > if [ "x$WANT_MON" = "xyes" ]; then
1229 >  echo $ac_n "checking for mon""... $ac_c" 1>&6
1230 > echo "configure:1231: checking for mon" >&5
1231 >  if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1232 >    echo "$ac_t""yes" 1>&6
1233 >    cat >> confdefs.h <<\EOF
1234 > #define ENABLE_MON 1
1235 > EOF
1236 >
1237 >    MONSRCS="../../../mon/src/mon.cpp ../../../mon/src/mon_6502.cpp ../../../mon/src/mon_68k.cpp ../../../mon/src/mon_8080.cpp ../../../mon/src/mon_cmd.cpp ../../../mon/src/mon_ppc.cpp ../../../mon/src/mon_x86.cpp"
1238 >    CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1239 >    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
1240 > echo "configure:1241: checking for readline in -lreadline" >&5
1241 > ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
1242 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1243 >  echo $ac_n "(cached) $ac_c" 1>&6
1244 > else
1245 >  ac_save_LIBS="$LIBS"
1246 > LIBS="-lreadline  $LIBS"
1247 > cat > conftest.$ac_ext <<EOF
1248 > #line 1249 "configure"
1249 > #include "confdefs.h"
1250 > /* Override any gcc2 internal prototype to avoid an error.  */
1251 > /* We use char because int might match the return type of a gcc2
1252 >    builtin and then its argument prototype would still apply.  */
1253 > char readline();
1254 >
1255 > int main() {
1256 > readline()
1257 > ; return 0; }
1258 > EOF
1259 > if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1260 >  rm -rf conftest*
1261 >  eval "ac_cv_lib_$ac_lib_var=yes"
1262 > else
1263 >  echo "configure: failed program was:" >&5
1264 >  cat conftest.$ac_ext >&5
1265 >  rm -rf conftest*
1266 >  eval "ac_cv_lib_$ac_lib_var=no"
1267 > fi
1268 > rm -f conftest*
1269 > LIBS="$ac_save_LIBS"
1270 >
1271 > fi
1272 > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1273    echo "$ac_t""yes" 1>&6
1274 <  WANT_MON=yes
1275 <  DEFINES="$DEFINES -DENABLE_MON=1"
1276 <  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"
1277 <  CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1274 >    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1275 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1276 >  cat >> confdefs.h <<EOF
1277 > #define $ac_tr_lib 1
1278 > EOF
1279 >
1280 >  LIBS="-lreadline $LIBS"
1281 >
1282 > else
1283 >  echo "$ac_t""no" 1>&6
1284 > fi
1285 >
1286 >    echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6
1287 > echo "configure:1288: checking for tputs in -ltermcap" >&5
1288 > ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-%__p_%'`
1289 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1290 >  echo $ac_n "(cached) $ac_c" 1>&6
1291 > else
1292 >  ac_save_LIBS="$LIBS"
1293 > LIBS="-ltermcap  $LIBS"
1294 > cat > conftest.$ac_ext <<EOF
1295 > #line 1296 "configure"
1296 > #include "confdefs.h"
1297 > /* Override any gcc2 internal prototype to avoid an error.  */
1298 > /* We use char because int might match the return type of a gcc2
1299 >    builtin and then its argument prototype would still apply.  */
1300 > char tputs();
1301 >
1302 > int main() {
1303 > tputs()
1304 > ; return 0; }
1305 > EOF
1306 > if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1307 >  rm -rf conftest*
1308 >  eval "ac_cv_lib_$ac_lib_var=yes"
1309 > else
1310 >  echo "configure: failed program was:" >&5
1311 >  cat conftest.$ac_ext >&5
1312 >  rm -rf conftest*
1313 >  eval "ac_cv_lib_$ac_lib_var=no"
1314 > fi
1315 > rm -f conftest*
1316 > LIBS="$ac_save_LIBS"
1317 >
1318 > fi
1319 > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1320 >  echo "$ac_t""yes" 1>&6
1321 >    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1322 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1323 >  cat >> confdefs.h <<EOF
1324 > #define $ac_tr_lib 1
1325 > EOF
1326 >
1327 >  LIBS="-ltermcap $LIBS"
1328 >
1329 > else
1330 >  echo "$ac_t""no" 1>&6
1331 > fi
1332 >
1333 >    for ac_hdr in readline.h history.h readline/readline.h readline/history.h
1334 > do
1335 > ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1336 > echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1337 > echo "configure:1338: checking for $ac_hdr" >&5
1338 > if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1339 >  echo $ac_n "(cached) $ac_c" 1>&6
1340 > else
1341 >  cat > conftest.$ac_ext <<EOF
1342 > #line 1343 "configure"
1343 > #include "confdefs.h"
1344 > #include <$ac_hdr>
1345 > EOF
1346 > ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1347 > { (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1348 > ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1349 > if test -z "$ac_err"; then
1350 >  rm -rf conftest*
1351 >  eval "ac_cv_header_$ac_safe=yes"
1352 > else
1353 >  echo "$ac_err" >&5
1354 >  echo "configure: failed program was:" >&5
1355 >  cat conftest.$ac_ext >&5
1356 >  rm -rf conftest*
1357 >  eval "ac_cv_header_$ac_safe=no"
1358 > fi
1359 > rm -f conftest*
1360 > fi
1361 > if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
1362 >  echo "$ac_t""yes" 1>&6
1363 >    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
1364 >  cat >> confdefs.h <<EOF
1365 > #define $ac_tr_hdr 1
1366 > EOF
1367 >
1368   else
1369    echo "$ac_t""no" 1>&6
1370 <  WANT_MON=no
1371 <  DEFINES="$DEFINES -DENABLE_MON=0"
1370 > fi
1371 > done
1372 >
1373 >  else
1374 >    echo "$ac_t""no" 1>&6
1375 >    echo "configure: warning: Could not find mon, ignoring --with-mon." 1>&2
1376 >    WANT_MON=no
1377 >  fi
1378   fi
1379  
1380   echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1381 < echo "configure:1155: checking for sem_init in -lposix4" >&5
1381 > echo "configure:1382: checking for sem_init in -lposix4" >&5
1382   ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1383   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1384    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1159 | Line 1386 | else
1386    ac_save_LIBS="$LIBS"
1387   LIBS="-lposix4  $LIBS"
1388   cat > conftest.$ac_ext <<EOF
1389 < #line 1163 "configure"
1389 > #line 1390 "configure"
1390   #include "confdefs.h"
1391   /* Override any gcc2 internal prototype to avoid an error.  */
1392   /* We use char because int might match the return type of a gcc2
# Line 1170 | Line 1397 | int main() {
1397   sem_init()
1398   ; return 0; }
1399   EOF
1400 < if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1400 > if { (eval echo configure:1401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1401    rm -rf conftest*
1402    eval "ac_cv_lib_$ac_lib_var=yes"
1403   else
# Line 1203 | Line 1430 | fi
1430   # Uses ac_ vars as temps to allow command line to override cache and checks.
1431   # --without-x overrides everything else, but does not touch the cache.
1432   echo $ac_n "checking for X""... $ac_c" 1>&6
1433 < echo "configure:1207: checking for X" >&5
1433 > echo "configure:1434: checking for X" >&5
1434  
1435   # Check whether --with-x or --without-x was given.
1436   if test "${with_x+set}" = set; then
# Line 1265 | Line 1492 | if test "$ac_x_includes" = NO; then
1492  
1493    # First, try using that file with no special directory specified.
1494   cat > conftest.$ac_ext <<EOF
1495 < #line 1269 "configure"
1495 > #line 1496 "configure"
1496   #include "confdefs.h"
1497   #include <$x_direct_test_include>
1498   EOF
1499   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1500 < { (eval echo configure:1274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1500 > { (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1501   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1502   if test -z "$ac_err"; then
1503    rm -rf conftest*
# Line 1339 | Line 1566 | if test "$ac_x_libraries" = NO; then
1566    ac_save_LIBS="$LIBS"
1567    LIBS="-l$x_direct_test_library $LIBS"
1568   cat > conftest.$ac_ext <<EOF
1569 < #line 1343 "configure"
1569 > #line 1570 "configure"
1570   #include "confdefs.h"
1571  
1572   int main() {
1573   ${x_direct_test_function}()
1574   ; return 0; }
1575   EOF
1576 < if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1576 > if { (eval echo configure:1577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1577    rm -rf conftest*
1578    LIBS="$ac_save_LIBS"
1579   # We can link X programs with no special library path.
# Line 1452 | Line 1679 | else
1679      case "`(uname -sr) 2>/dev/null`" in
1680      "SunOS 5"*)
1681        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1682 < echo "configure:1456: checking whether -R must be followed by a space" >&5
1682 > echo "configure:1683: checking whether -R must be followed by a space" >&5
1683        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1684        cat > conftest.$ac_ext <<EOF
1685 < #line 1459 "configure"
1685 > #line 1686 "configure"
1686   #include "confdefs.h"
1687  
1688   int main() {
1689  
1690   ; return 0; }
1691   EOF
1692 < if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1692 > if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1693    rm -rf conftest*
1694    ac_R_nospace=yes
1695   else
# Line 1478 | Line 1705 | rm -f conftest*
1705        else
1706          LIBS="$ac_xsave_LIBS -R $x_libraries"
1707          cat > conftest.$ac_ext <<EOF
1708 < #line 1482 "configure"
1708 > #line 1709 "configure"
1709   #include "confdefs.h"
1710  
1711   int main() {
1712  
1713   ; return 0; }
1714   EOF
1715 < if { (eval echo configure:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1715 > if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1716    rm -rf conftest*
1717    ac_R_space=yes
1718   else
# Line 1517 | Line 1744 | rm -f conftest*
1744      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1745      # the Alpha needs dnet_stub (dnet does not exist).
1746      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1747 < echo "configure:1521: checking for dnet_ntoa in -ldnet" >&5
1747 > echo "configure:1748: checking for dnet_ntoa in -ldnet" >&5
1748   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1749   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1750    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1525 | Line 1752 | else
1752    ac_save_LIBS="$LIBS"
1753   LIBS="-ldnet  $LIBS"
1754   cat > conftest.$ac_ext <<EOF
1755 < #line 1529 "configure"
1755 > #line 1756 "configure"
1756   #include "confdefs.h"
1757   /* Override any gcc2 internal prototype to avoid an error.  */
1758   /* We use char because int might match the return type of a gcc2
# Line 1536 | Line 1763 | int main() {
1763   dnet_ntoa()
1764   ; return 0; }
1765   EOF
1766 < if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1766 > if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1767    rm -rf conftest*
1768    eval "ac_cv_lib_$ac_lib_var=yes"
1769   else
# Line 1558 | Line 1785 | fi
1785  
1786      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1787        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1788 < echo "configure:1562: checking for dnet_ntoa in -ldnet_stub" >&5
1788 > echo "configure:1789: checking for dnet_ntoa in -ldnet_stub" >&5
1789   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1790   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1791    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1566 | Line 1793 | else
1793    ac_save_LIBS="$LIBS"
1794   LIBS="-ldnet_stub  $LIBS"
1795   cat > conftest.$ac_ext <<EOF
1796 < #line 1570 "configure"
1796 > #line 1797 "configure"
1797   #include "confdefs.h"
1798   /* Override any gcc2 internal prototype to avoid an error.  */
1799   /* We use char because int might match the return type of a gcc2
# Line 1577 | Line 1804 | int main() {
1804   dnet_ntoa()
1805   ; return 0; }
1806   EOF
1807 < if { (eval echo configure:1581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1807 > if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1808    rm -rf conftest*
1809    eval "ac_cv_lib_$ac_lib_var=yes"
1810   else
# Line 1606 | Line 1833 | fi
1833      # The nsl library prevents programs from opening the X display
1834      # on Irix 5.2, according to dickey@clark.net.
1835      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1836 < echo "configure:1610: checking for gethostbyname" >&5
1836 > echo "configure:1837: checking for gethostbyname" >&5
1837   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1838    echo $ac_n "(cached) $ac_c" 1>&6
1839   else
1840    cat > conftest.$ac_ext <<EOF
1841 < #line 1615 "configure"
1841 > #line 1842 "configure"
1842   #include "confdefs.h"
1843   /* System header to define __stub macros and hopefully few prototypes,
1844      which can conflict with char gethostbyname(); below.  */
# Line 1634 | Line 1861 | gethostbyname();
1861  
1862   ; return 0; }
1863   EOF
1864 < if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1864 > if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1865    rm -rf conftest*
1866    eval "ac_cv_func_gethostbyname=yes"
1867   else
# Line 1655 | Line 1882 | fi
1882  
1883      if test $ac_cv_func_gethostbyname = no; then
1884        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1885 < echo "configure:1659: checking for gethostbyname in -lnsl" >&5
1885 > echo "configure:1886: checking for gethostbyname in -lnsl" >&5
1886   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1887   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1888    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1663 | Line 1890 | else
1890    ac_save_LIBS="$LIBS"
1891   LIBS="-lnsl  $LIBS"
1892   cat > conftest.$ac_ext <<EOF
1893 < #line 1667 "configure"
1893 > #line 1894 "configure"
1894   #include "confdefs.h"
1895   /* Override any gcc2 internal prototype to avoid an error.  */
1896   /* We use char because int might match the return type of a gcc2
# Line 1674 | Line 1901 | int main() {
1901   gethostbyname()
1902   ; return 0; }
1903   EOF
1904 < if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1904 > if { (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1905    rm -rf conftest*
1906    eval "ac_cv_lib_$ac_lib_var=yes"
1907   else
# Line 1704 | Line 1931 | fi
1931      # -lsocket must be given before -lnsl if both are needed.
1932      # We assume that if connect needs -lnsl, so does gethostbyname.
1933      echo $ac_n "checking for connect""... $ac_c" 1>&6
1934 < echo "configure:1708: checking for connect" >&5
1934 > echo "configure:1935: checking for connect" >&5
1935   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1936    echo $ac_n "(cached) $ac_c" 1>&6
1937   else
1938    cat > conftest.$ac_ext <<EOF
1939 < #line 1713 "configure"
1939 > #line 1940 "configure"
1940   #include "confdefs.h"
1941   /* System header to define __stub macros and hopefully few prototypes,
1942      which can conflict with char connect(); below.  */
# Line 1732 | Line 1959 | connect();
1959  
1960   ; return 0; }
1961   EOF
1962 < if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1962 > if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1963    rm -rf conftest*
1964    eval "ac_cv_func_connect=yes"
1965   else
# Line 1753 | Line 1980 | fi
1980  
1981      if test $ac_cv_func_connect = no; then
1982        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1983 < echo "configure:1757: checking for connect in -lsocket" >&5
1983 > echo "configure:1984: checking for connect in -lsocket" >&5
1984   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1985   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1986    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1761 | Line 1988 | else
1988    ac_save_LIBS="$LIBS"
1989   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1990   cat > conftest.$ac_ext <<EOF
1991 < #line 1765 "configure"
1991 > #line 1992 "configure"
1992   #include "confdefs.h"
1993   /* Override any gcc2 internal prototype to avoid an error.  */
1994   /* We use char because int might match the return type of a gcc2
# Line 1772 | Line 1999 | int main() {
1999   connect()
2000   ; return 0; }
2001   EOF
2002 < if { (eval echo configure:1776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2002 > if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2003    rm -rf conftest*
2004    eval "ac_cv_lib_$ac_lib_var=yes"
2005   else
# Line 1796 | Line 2023 | fi
2023  
2024      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
2025      echo $ac_n "checking for remove""... $ac_c" 1>&6
2026 < echo "configure:1800: checking for remove" >&5
2026 > echo "configure:2027: checking for remove" >&5
2027   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
2028    echo $ac_n "(cached) $ac_c" 1>&6
2029   else
2030    cat > conftest.$ac_ext <<EOF
2031 < #line 1805 "configure"
2031 > #line 2032 "configure"
2032   #include "confdefs.h"
2033   /* System header to define __stub macros and hopefully few prototypes,
2034      which can conflict with char remove(); below.  */
# Line 1824 | Line 2051 | remove();
2051  
2052   ; return 0; }
2053   EOF
2054 < if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2054 > if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2055    rm -rf conftest*
2056    eval "ac_cv_func_remove=yes"
2057   else
# Line 1845 | Line 2072 | fi
2072  
2073      if test $ac_cv_func_remove = no; then
2074        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
2075 < echo "configure:1849: checking for remove in -lposix" >&5
2075 > echo "configure:2076: checking for remove in -lposix" >&5
2076   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
2077   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2078    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1853 | Line 2080 | else
2080    ac_save_LIBS="$LIBS"
2081   LIBS="-lposix  $LIBS"
2082   cat > conftest.$ac_ext <<EOF
2083 < #line 1857 "configure"
2083 > #line 2084 "configure"
2084   #include "confdefs.h"
2085   /* Override any gcc2 internal prototype to avoid an error.  */
2086   /* We use char because int might match the return type of a gcc2
# Line 1864 | Line 2091 | int main() {
2091   remove()
2092   ; return 0; }
2093   EOF
2094 < if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2094 > if { (eval echo configure:2095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2095    rm -rf conftest*
2096    eval "ac_cv_lib_$ac_lib_var=yes"
2097   else
# Line 1888 | Line 2115 | fi
2115  
2116      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
2117      echo $ac_n "checking for shmat""... $ac_c" 1>&6
2118 < echo "configure:1892: checking for shmat" >&5
2118 > echo "configure:2119: checking for shmat" >&5
2119   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
2120    echo $ac_n "(cached) $ac_c" 1>&6
2121   else
2122    cat > conftest.$ac_ext <<EOF
2123 < #line 1897 "configure"
2123 > #line 2124 "configure"
2124   #include "confdefs.h"
2125   /* System header to define __stub macros and hopefully few prototypes,
2126      which can conflict with char shmat(); below.  */
# Line 1916 | Line 2143 | shmat();
2143  
2144   ; return 0; }
2145   EOF
2146 < if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2146 > if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2147    rm -rf conftest*
2148    eval "ac_cv_func_shmat=yes"
2149   else
# Line 1937 | Line 2164 | fi
2164  
2165      if test $ac_cv_func_shmat = no; then
2166        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
2167 < echo "configure:1941: checking for shmat in -lipc" >&5
2167 > echo "configure:2168: checking for shmat in -lipc" >&5
2168   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
2169   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2170    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1945 | Line 2172 | else
2172    ac_save_LIBS="$LIBS"
2173   LIBS="-lipc  $LIBS"
2174   cat > conftest.$ac_ext <<EOF
2175 < #line 1949 "configure"
2175 > #line 2176 "configure"
2176   #include "confdefs.h"
2177   /* Override any gcc2 internal prototype to avoid an error.  */
2178   /* We use char because int might match the return type of a gcc2
# Line 1956 | Line 2183 | int main() {
2183   shmat()
2184   ; return 0; }
2185   EOF
2186 < if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2186 > if { (eval echo configure:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2187    rm -rf conftest*
2188    eval "ac_cv_lib_$ac_lib_var=yes"
2189   else
# Line 1989 | Line 2216 | fi
2216    # libraries we check for below, so use a different variable.
2217    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
2218    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
2219 < echo "configure:1993: checking for IceConnectionNumber in -lICE" >&5
2219 > echo "configure:2220: checking for IceConnectionNumber in -lICE" >&5
2220   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
2221   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2222    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1997 | Line 2224 | else
2224    ac_save_LIBS="$LIBS"
2225   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
2226   cat > conftest.$ac_ext <<EOF
2227 < #line 2001 "configure"
2227 > #line 2228 "configure"
2228   #include "confdefs.h"
2229   /* Override any gcc2 internal prototype to avoid an error.  */
2230   /* We use char because int might match the return type of a gcc2
# Line 2008 | Line 2235 | int main() {
2235   IceConnectionNumber()
2236   ; return 0; }
2237   EOF
2238 < if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2238 > if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2239    rm -rf conftest*
2240    eval "ac_cv_lib_$ac_lib_var=yes"
2241   else
# Line 2039 | Line 2266 | CFLAGS="$CFLAGS $X_CFLAGS"
2266   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2267   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
2268  
2269 + HAVE_PTHREADS=yes
2270   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2271 < echo "configure:2044: checking for pthread_create in -lpthread" >&5
2271 > echo "configure:2272: checking for pthread_create in -lpthread" >&5
2272   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2273   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2274    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2048 | Line 2276 | else
2276    ac_save_LIBS="$LIBS"
2277   LIBS="-lpthread  $LIBS"
2278   cat > conftest.$ac_ext <<EOF
2279 < #line 2052 "configure"
2279 > #line 2280 "configure"
2280   #include "confdefs.h"
2281   /* Override any gcc2 internal prototype to avoid an error.  */
2282   /* We use char because int might match the return type of a gcc2
# Line 2059 | Line 2287 | int main() {
2287   pthread_create()
2288   ; return 0; }
2289   EOF
2290 < if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2290 > if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2291    rm -rf conftest*
2292    eval "ac_cv_lib_$ac_lib_var=yes"
2293   else
# Line 2086 | Line 2314 | else
2314    echo "$ac_t""no" 1>&6
2315  
2316    echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2317 < echo "configure:2090: checking for pthread_create in -lc_r" >&5
2317 > echo "configure:2318: checking for pthread_create in -lc_r" >&5
2318   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2319   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2320    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2094 | Line 2322 | else
2322    ac_save_LIBS="$LIBS"
2323   LIBS="-lc_r  $LIBS"
2324   cat > conftest.$ac_ext <<EOF
2325 < #line 2098 "configure"
2325 > #line 2326 "configure"
2326   #include "confdefs.h"
2327   /* Override any gcc2 internal prototype to avoid an error.  */
2328   /* We use char because int might match the return type of a gcc2
# Line 2105 | Line 2333 | int main() {
2333   pthread_create()
2334   ; return 0; }
2335   EOF
2336 < if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2336 > if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2337    rm -rf conftest*
2338    eval "ac_cv_lib_$ac_lib_var=yes"
2339   else
# Line 2132 | Line 2360 | else
2360    echo "$ac_t""no" 1>&6
2361  
2362      echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2363 < echo "configure:2136: checking for pthread_create in -lPTL" >&5
2363 > echo "configure:2364: checking for pthread_create in -lPTL" >&5
2364   ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2365   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2366    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2140 | Line 2368 | else
2368    ac_save_LIBS="$LIBS"
2369   LIBS="-lPTL  $LIBS"
2370   cat > conftest.$ac_ext <<EOF
2371 < #line 2144 "configure"
2371 > #line 2372 "configure"
2372   #include "confdefs.h"
2373   /* Override any gcc2 internal prototype to avoid an error.  */
2374   /* We use char because int might match the return type of a gcc2
# Line 2151 | Line 2379 | int main() {
2379   pthread_create()
2380   ; return 0; }
2381   EOF
2382 < if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2382 > if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2383    rm -rf conftest*
2384    eval "ac_cv_lib_$ac_lib_var=yes"
2385   else
# Line 2177 | Line 2405 | EOF
2405   else
2406    echo "$ac_t""no" 1>&6
2407  
2408 <      { echo "configure: error: You need pthreads to run Basilisk II." 1>&2; exit 1; }
2408 >      HAVE_PTHREADS=no
2409      
2410   fi
2411  
# Line 2187 | Line 2415 | fi
2415  
2416   fi
2417  
2418 + if [ "x$HAVE_PTHREADS" = "xyes" ]; then
2419 +  cat >> confdefs.h <<\EOF
2420 + #define HAVE_PTHREADS 1
2421 + EOF
2422 +
2423 + fi
2424 + for ac_func in pthread_cancel
2425 + do
2426 + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2427 + echo "configure:2428: checking for $ac_func" >&5
2428 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2429 +  echo $ac_n "(cached) $ac_c" 1>&6
2430 + else
2431 +  cat > conftest.$ac_ext <<EOF
2432 + #line 2433 "configure"
2433 + #include "confdefs.h"
2434 + /* System header to define __stub macros and hopefully few prototypes,
2435 +    which can conflict with char $ac_func(); below.  */
2436 + #include <assert.h>
2437 + /* Override any gcc2 internal prototype to avoid an error.  */
2438 + /* We use char because int might match the return type of a gcc2
2439 +    builtin and then its argument prototype would still apply.  */
2440 + char $ac_func();
2441 +
2442 + int main() {
2443 +
2444 + /* The GNU C library defines this for functions which it implements
2445 +    to always fail with ENOSYS.  Some functions are actually named
2446 +    something starting with __ and the normal name is an alias.  */
2447 + #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
2448 + choke me
2449 + #else
2450 + $ac_func();
2451 + #endif
2452 +
2453 + ; return 0; }
2454 + EOF
2455 + if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2456 +  rm -rf conftest*
2457 +  eval "ac_cv_func_$ac_func=yes"
2458 + else
2459 +  echo "configure: failed program was:" >&5
2460 +  cat conftest.$ac_ext >&5
2461 +  rm -rf conftest*
2462 +  eval "ac_cv_func_$ac_func=no"
2463 + fi
2464 + rm -f conftest*
2465 + fi
2466 +
2467 + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2468 +  echo "$ac_t""yes" 1>&6
2469 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2470 +  cat >> confdefs.h <<EOF
2471 + #define $ac_tr_func 1
2472 + EOF
2473 +
2474 + else
2475 +  echo "$ac_t""no" 1>&6
2476 + fi
2477 + done
2478 +
2479  
2480 < SEMSRCS=
2480 > SEMSRC=
2481   for ac_func in sem_init
2482   do
2483   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2484 < echo "configure:2196: checking for $ac_func" >&5
2484 > echo "configure:2485: checking for $ac_func" >&5
2485   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2486    echo $ac_n "(cached) $ac_c" 1>&6
2487   else
2488    cat > conftest.$ac_ext <<EOF
2489 < #line 2201 "configure"
2489 > #line 2490 "configure"
2490   #include "confdefs.h"
2491   /* System header to define __stub macros and hopefully few prototypes,
2492      which can conflict with char $ac_func(); below.  */
# Line 2220 | Line 2509 | $ac_func();
2509  
2510   ; return 0; }
2511   EOF
2512 < if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2512 > if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2513    rm -rf conftest*
2514    eval "ac_cv_func_$ac_func=yes"
2515   else
# Line 2241 | Line 2530 | EOF
2530  
2531   else
2532    echo "$ac_t""no" 1>&6
2533 < SEMSRCS=posix_sem.cpp
2533 > if  "x$HAVE_PTHREADS" = "xyes" ; then
2534 >    SEMSRC=posix_sem.cpp
2535 >  fi
2536  
2537   fi
2538   done
# Line 2249 | Line 2540 | done
2540  
2541   if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2542    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2543 < echo "configure:2253: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2543 > echo "configure:2544: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2544   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2545   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2546    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2257 | Line 2548 | else
2548    ac_save_LIBS="$LIBS"
2549   LIBS="-lXxf86dga  $LIBS"
2550   cat > conftest.$ac_ext <<EOF
2551 < #line 2261 "configure"
2551 > #line 2552 "configure"
2552   #include "confdefs.h"
2553   /* Override any gcc2 internal prototype to avoid an error.  */
2554   /* We use char because int might match the return type of a gcc2
# Line 2268 | Line 2559 | int main() {
2559   XF86DGAQueryExtension()
2560   ; return 0; }
2561   EOF
2562 < if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2562 > if { (eval echo configure:2563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2563    rm -rf conftest*
2564    eval "ac_cv_lib_$ac_lib_var=yes"
2565   else
# Line 2284 | Line 2575 | fi
2575   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2576    echo "$ac_t""yes" 1>&6
2577    
2578 <    DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
2578 >    cat >> confdefs.h <<\EOF
2579 > #define ENABLE_XF86_DGA 1
2580 > EOF
2581 >
2582      LIBS="$LIBS -lXxf86dga"
2583      if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2584        echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2
# Line 2295 | Line 2589 | else
2589    echo "$ac_t""no" 1>&6
2590  
2591      echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2592 <    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2592 >    WANT_XF86_DGA=no
2593    
2594   fi
2595  
2302 – else
2303 –  DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2596   fi
2597   if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2598 <  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=1"
2598 >  cat >> confdefs.h <<\EOF
2599 > #define ENABLE_FBDEV_DGA 1
2600 > EOF
2601 >
2602 > fi
2603 >
2604 > if [ "x$WANT_XF86_VIDMODE" = "xyes" ]; then
2605 >  echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
2606 > echo "configure:2607: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
2607 > ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'`
2608 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2609 >  echo $ac_n "(cached) $ac_c" 1>&6
2610   else
2611 <  DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2611 >  ac_save_LIBS="$LIBS"
2612 > LIBS="-lXxf86vm  $LIBS"
2613 > cat > conftest.$ac_ext <<EOF
2614 > #line 2615 "configure"
2615 > #include "confdefs.h"
2616 > /* Override any gcc2 internal prototype to avoid an error.  */
2617 > /* We use char because int might match the return type of a gcc2
2618 >    builtin and then its argument prototype would still apply.  */
2619 > char XF86VidModeQueryExtension();
2620 >
2621 > int main() {
2622 > XF86VidModeQueryExtension()
2623 > ; return 0; }
2624 > EOF
2625 > if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2626 >  rm -rf conftest*
2627 >  eval "ac_cv_lib_$ac_lib_var=yes"
2628 > else
2629 >  echo "configure: failed program was:" >&5
2630 >  cat conftest.$ac_ext >&5
2631 >  rm -rf conftest*
2632 >  eval "ac_cv_lib_$ac_lib_var=no"
2633 > fi
2634 > rm -f conftest*
2635 > LIBS="$ac_save_LIBS"
2636 >
2637 > fi
2638 > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2639 >  echo "$ac_t""yes" 1>&6
2640 >  
2641 >    cat >> confdefs.h <<\EOF
2642 > #define ENABLE_XF86_VIDMODE 1
2643 > EOF
2644 >
2645 >    LIBS="$LIBS -lXxf86vm"
2646 >  
2647 > else
2648 >  echo "$ac_t""no" 1>&6
2649 >
2650 >    echo "configure: warning: Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode." 1>&2
2651 >    WANT_XF86_VIDMODE=no
2652 >  
2653 > fi
2654 >
2655   fi
2656  
2657   UISRCS=../dummy/prefs_editor_dummy.cpp
2658 < if [ "x$WANT_UI" = "xyes" ]; then
2658 > if [ "x$WANT_GTK" = "xyes" ]; then
2659    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2660   if test "${with_gtk_prefix+set}" = set; then
2661    withval="$with_gtk_prefix"
# Line 2351 | Line 2697 | fi
2697    # Extract the first word of "gtk-config", so it can be a program name with args.
2698   set dummy gtk-config; ac_word=$2
2699   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2700 < echo "configure:2355: checking for $ac_word" >&5
2700 > echo "configure:2701: checking for $ac_word" >&5
2701   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2702    echo $ac_n "(cached) $ac_c" 1>&6
2703   else
# Line 2386 | Line 2732 | fi
2732  
2733    min_gtk_version=1.2.0
2734    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2735 < echo "configure:2390: checking for GTK - version >= $min_gtk_version" >&5
2735 > echo "configure:2736: checking for GTK - version >= $min_gtk_version" >&5
2736    no_gtk=""
2737    if test "$GTK_CONFIG" = "no" ; then
2738      no_gtk=yes
# Line 2409 | Line 2755 | echo "configure:2390: checking for GTK -
2755    echo $ac_n "cross compiling; assumed OK... $ac_c"
2756   else
2757    cat > conftest.$ac_ext <<EOF
2758 < #line 2413 "configure"
2758 > #line 2759 "configure"
2759   #include "confdefs.h"
2760  
2761   #include <gtk/gtk.h>
# Line 2472 | Line 2818 | main ()
2818   }
2819  
2820   EOF
2821 < if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2821 > if { (eval echo configure:2822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2822   then
2823    :
2824   else
# Line 2491 | Line 2837 | fi
2837    if test "x$no_gtk" = x ; then
2838       echo "$ac_t""yes" 1>&6
2839      
2840 <    DEFINES="$DEFINES -DENABLE_GTK=1"
2840 >    cat >> confdefs.h <<\EOF
2841 > #define ENABLE_GTK 1
2842 > EOF
2843 >
2844      CFLAGS="$CFLAGS $GTK_CFLAGS"
2845      CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2846      LIBS="$LIBS $GTK_LIBS"
# Line 2512 | Line 2861 | fi
2861            CFLAGS="$CFLAGS $GTK_CFLAGS"
2862            LIBS="$LIBS $GTK_LIBS"
2863            cat > conftest.$ac_ext <<EOF
2864 < #line 2516 "configure"
2864 > #line 2865 "configure"
2865   #include "confdefs.h"
2866  
2867   #include <gtk/gtk.h>
# Line 2522 | Line 2871 | int main() {
2871   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2872   ; return 0; }
2873   EOF
2874 < if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2874 > if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2875    rm -rf conftest*
2876     echo "*** The test program compiled, but did not run. This usually means"
2877            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2556 | Line 2905 | rm -f conftest*
2905       GTK_LIBS=""
2906      
2907      echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2908 <    WANT_UI=no
2908 >    WANT_GTK=no
2909    
2910    fi
2911    
# Line 2607 | Line 2956 | fi
2956    # Extract the first word of "esd-config", so it can be a program name with args.
2957   set dummy esd-config; ac_word=$2
2958   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2959 < echo "configure:2611: checking for $ac_word" >&5
2959 > echo "configure:2960: checking for $ac_word" >&5
2960   if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2961    echo $ac_n "(cached) $ac_c" 1>&6
2962   else
# Line 2642 | Line 2991 | fi
2991  
2992    min_esd_version=0.2.8
2993    echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2994 < echo "configure:2646: checking for ESD - version >= $min_esd_version" >&5
2994 > echo "configure:2995: checking for ESD - version >= $min_esd_version" >&5
2995    no_esd=""
2996    if test "$ESD_CONFIG" = "no" ; then
2997      no_esd=yes
# Line 2666 | Line 3015 | echo "configure:2646: checking for ESD -
3015    echo $ac_n "cross compiling; assumed OK... $ac_c"
3016   else
3017    cat > conftest.$ac_ext <<EOF
3018 < #line 2670 "configure"
3018 > #line 3019 "configure"
3019   #include "confdefs.h"
3020  
3021   #include <stdio.h>
# Line 2724 | Line 3073 | int main ()
3073  
3074  
3075   EOF
3076 < if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3076 > if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3077   then
3078    :
3079   else
# Line 2743 | Line 3092 | fi
3092    if test "x$no_esd" = x ; then
3093       echo "$ac_t""yes" 1>&6
3094      
3095 <    DEFINES="$DEFINES -DENABLE_ESD=1"
3095 >    cat >> confdefs.h <<\EOF
3096 > #define ENABLE_ESD 1
3097 > EOF
3098 >
3099      CFLAGS="$CFLAGS $ESD_CFLAGS"
3100      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
3101      LIBS="$LIBS $ESD_LIBS"
# Line 2763 | Line 3115 | fi
3115            CFLAGS="$CFLAGS $ESD_CFLAGS"
3116            LIBS="$LIBS $ESD_LIBS"
3117            cat > conftest.$ac_ext <<EOF
3118 < #line 2767 "configure"
3118 > #line 3119 "configure"
3119   #include "confdefs.h"
3120  
3121   #include <stdio.h>
# Line 2773 | Line 3125 | int main() {
3125   return 0;
3126   ; return 0; }
3127   EOF
3128 < if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3128 > if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3129    rm -rf conftest*
3130     echo "*** The test program compiled, but did not run. This usually means"
3131            echo "*** that the run-time linker is not finding ESD or finding the wrong"
# Line 2812 | Line 3164 | rm -f conftest*
3164   fi
3165  
3166   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
3167 < echo "configure:2816: checking for ANSI C header files" >&5
3167 > echo "configure:3168: checking for ANSI C header files" >&5
3168   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
3169    echo $ac_n "(cached) $ac_c" 1>&6
3170   else
3171    cat > conftest.$ac_ext <<EOF
3172 < #line 2821 "configure"
3172 > #line 3173 "configure"
3173   #include "confdefs.h"
3174   #include <stdlib.h>
3175   #include <stdarg.h>
# Line 2825 | Line 3177 | else
3177   #include <float.h>
3178   EOF
3179   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3180 < { (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3180 > { (eval echo configure:3181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3181   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3182   if test -z "$ac_err"; then
3183    rm -rf conftest*
# Line 2842 | Line 3194 | rm -f conftest*
3194   if test $ac_cv_header_stdc = yes; then
3195    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3196   cat > conftest.$ac_ext <<EOF
3197 < #line 2846 "configure"
3197 > #line 3198 "configure"
3198   #include "confdefs.h"
3199   #include <string.h>
3200   EOF
# Line 2860 | Line 3212 | fi
3212   if test $ac_cv_header_stdc = yes; then
3213    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3214   cat > conftest.$ac_ext <<EOF
3215 < #line 2864 "configure"
3215 > #line 3216 "configure"
3216   #include "confdefs.h"
3217   #include <stdlib.h>
3218   EOF
# Line 2881 | Line 3233 | if test "$cross_compiling" = yes; then
3233    :
3234   else
3235    cat > conftest.$ac_ext <<EOF
3236 < #line 2885 "configure"
3236 > #line 3237 "configure"
3237   #include "confdefs.h"
3238   #include <ctype.h>
3239   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2892 | Line 3244 | if (XOR (islower (i), ISLOWER (i)) || to
3244   exit (0); }
3245  
3246   EOF
3247 < if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3247 > if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3248   then
3249    :
3250   else
# Line 2919 | Line 3271 | for ac_hdr in unistd.h fcntl.h sys/time.
3271   do
3272   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3273   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3274 < echo "configure:2923: checking for $ac_hdr" >&5
3274 > echo "configure:3275: checking for $ac_hdr" >&5
3275   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3276    echo $ac_n "(cached) $ac_c" 1>&6
3277   else
3278    cat > conftest.$ac_ext <<EOF
3279 < #line 2928 "configure"
3279 > #line 3280 "configure"
3280   #include "confdefs.h"
3281   #include <$ac_hdr>
3282   EOF
3283   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3284 < { (eval echo configure:2933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3284 > { (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3285   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3286   if test -z "$ac_err"; then
3287    rm -rf conftest*
# Line 2957 | Line 3309 | done
3309  
3310  
3311   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
3312 < echo "configure:2961: checking whether byte ordering is bigendian" >&5
3312 > echo "configure:3313: checking whether byte ordering is bigendian" >&5
3313   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
3314    echo $ac_n "(cached) $ac_c" 1>&6
3315   else
3316    ac_cv_c_bigendian=unknown
3317   # See if sys/param.h defines the BYTE_ORDER macro.
3318   cat > conftest.$ac_ext <<EOF
3319 < #line 2968 "configure"
3319 > #line 3320 "configure"
3320   #include "confdefs.h"
3321   #include <sys/types.h>
3322   #include <sys/param.h>
# Line 2975 | Line 3327 | int main() {
3327   #endif
3328   ; return 0; }
3329   EOF
3330 < if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3330 > if { (eval echo configure:3331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3331    rm -rf conftest*
3332    # It does; now see whether it defined to BIG_ENDIAN or not.
3333   cat > conftest.$ac_ext <<EOF
3334 < #line 2983 "configure"
3334 > #line 3335 "configure"
3335   #include "confdefs.h"
3336   #include <sys/types.h>
3337   #include <sys/param.h>
# Line 2990 | Line 3342 | int main() {
3342   #endif
3343   ; return 0; }
3344   EOF
3345 < if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3345 > if { (eval echo configure:3346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3346    rm -rf conftest*
3347    ac_cv_c_bigendian=yes
3348   else
# Line 3010 | Line 3362 | if test "$cross_compiling" = yes; then
3362      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3363   else
3364    cat > conftest.$ac_ext <<EOF
3365 < #line 3014 "configure"
3365 > #line 3366 "configure"
3366   #include "confdefs.h"
3367   main () {
3368    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 3023 | Line 3375 | main () {
3375    exit (u.c[sizeof (long) - 1] == 1);
3376   }
3377   EOF
3378 < if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3378 > if { (eval echo configure:3379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3379   then
3380    ac_cv_c_bigendian=no
3381   else
# Line 3047 | Line 3399 | EOF
3399   fi
3400  
3401   echo $ac_n "checking for working const""... $ac_c" 1>&6
3402 < echo "configure:3051: checking for working const" >&5
3402 > echo "configure:3403: checking for working const" >&5
3403   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3404    echo $ac_n "(cached) $ac_c" 1>&6
3405   else
3406    cat > conftest.$ac_ext <<EOF
3407 < #line 3056 "configure"
3407 > #line 3408 "configure"
3408   #include "confdefs.h"
3409  
3410   int main() {
# Line 3101 | Line 3453 | ccp = (char const *const *) p;
3453  
3454   ; return 0; }
3455   EOF
3456 < if { (eval echo configure:3105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3456 > if { (eval echo configure:3457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3457    rm -rf conftest*
3458    ac_cv_c_const=yes
3459   else
# Line 3122 | Line 3474 | EOF
3474   fi
3475  
3476   echo $ac_n "checking for inline""... $ac_c" 1>&6
3477 < echo "configure:3126: checking for inline" >&5
3477 > echo "configure:3478: checking for inline" >&5
3478   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3479    echo $ac_n "(cached) $ac_c" 1>&6
3480   else
3481    ac_cv_c_inline=no
3482   for ac_kw in inline __inline__ __inline; do
3483    cat > conftest.$ac_ext <<EOF
3484 < #line 3133 "configure"
3484 > #line 3485 "configure"
3485   #include "confdefs.h"
3486  
3487   int main() {
3488   } $ac_kw foo() {
3489   ; return 0; }
3490   EOF
3491 < if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3491 > if { (eval echo configure:3492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3492    rm -rf conftest*
3493    ac_cv_c_inline=$ac_kw; break
3494   else
# Line 3162 | Line 3514 | EOF
3514   esac
3515  
3516   echo $ac_n "checking size of short""... $ac_c" 1>&6
3517 < echo "configure:3166: checking size of short" >&5
3517 > echo "configure:3518: checking size of short" >&5
3518   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3519    echo $ac_n "(cached) $ac_c" 1>&6
3520   else
# Line 3170 | Line 3522 | else
3522    ac_cv_sizeof_short=2
3523   else
3524    cat > conftest.$ac_ext <<EOF
3525 < #line 3174 "configure"
3525 > #line 3526 "configure"
3526   #include "confdefs.h"
3527   #include <stdio.h>
3528   main()
# Line 3181 | Line 3533 | main()
3533    exit(0);
3534   }
3535   EOF
3536 < if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3536 > if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3537   then
3538    ac_cv_sizeof_short=`cat conftestval`
3539   else
# Line 3201 | Line 3553 | EOF
3553  
3554  
3555   echo $ac_n "checking size of int""... $ac_c" 1>&6
3556 < echo "configure:3205: checking size of int" >&5
3556 > echo "configure:3557: checking size of int" >&5
3557   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3558    echo $ac_n "(cached) $ac_c" 1>&6
3559   else
# Line 3209 | Line 3561 | else
3561    ac_cv_sizeof_int=4
3562   else
3563    cat > conftest.$ac_ext <<EOF
3564 < #line 3213 "configure"
3564 > #line 3565 "configure"
3565   #include "confdefs.h"
3566   #include <stdio.h>
3567   main()
# Line 3220 | Line 3572 | main()
3572    exit(0);
3573   }
3574   EOF
3575 < if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3575 > if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3576   then
3577    ac_cv_sizeof_int=`cat conftestval`
3578   else
# Line 3240 | Line 3592 | EOF
3592  
3593  
3594   echo $ac_n "checking size of long""... $ac_c" 1>&6
3595 < echo "configure:3244: checking size of long" >&5
3595 > echo "configure:3596: checking size of long" >&5
3596   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3597    echo $ac_n "(cached) $ac_c" 1>&6
3598   else
# Line 3248 | Line 3600 | else
3600    ac_cv_sizeof_long=4
3601   else
3602    cat > conftest.$ac_ext <<EOF
3603 < #line 3252 "configure"
3603 > #line 3604 "configure"
3604   #include "confdefs.h"
3605   #include <stdio.h>
3606   main()
# Line 3259 | Line 3611 | main()
3611    exit(0);
3612   }
3613   EOF
3614 < if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3614 > if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3615   then
3616    ac_cv_sizeof_long=`cat conftestval`
3617   else
# Line 3279 | Line 3631 | EOF
3631  
3632  
3633   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3634 < echo "configure:3283: checking size of long long" >&5
3634 > echo "configure:3635: checking size of long long" >&5
3635   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3636    echo $ac_n "(cached) $ac_c" 1>&6
3637   else
# Line 3287 | Line 3639 | else
3639    ac_cv_sizeof_long_long=8
3640   else
3641    cat > conftest.$ac_ext <<EOF
3642 < #line 3291 "configure"
3642 > #line 3643 "configure"
3643   #include "confdefs.h"
3644   #include <stdio.h>
3645   main()
# Line 3298 | Line 3650 | main()
3650    exit(0);
3651   }
3652   EOF
3653 < if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3653 > if { (eval echo configure:3654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3654   then
3655    ac_cv_sizeof_long_long=`cat conftestval`
3656   else
# Line 3318 | Line 3670 | EOF
3670  
3671  
3672   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3673 < echo "configure:3322: checking for off_t" >&5
3673 > echo "configure:3674: checking for off_t" >&5
3674   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3675    echo $ac_n "(cached) $ac_c" 1>&6
3676   else
3677    cat > conftest.$ac_ext <<EOF
3678 < #line 3327 "configure"
3678 > #line 3679 "configure"
3679   #include "confdefs.h"
3680   #include <sys/types.h>
3681   #if STDC_HEADERS
# Line 3351 | Line 3703 | EOF
3703   fi
3704  
3705   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3706 < echo "configure:3355: checking for loff_t" >&5
3706 > echo "configure:3707: checking for loff_t" >&5
3707   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3708    echo $ac_n "(cached) $ac_c" 1>&6
3709   else
3710    cat > conftest.$ac_ext <<EOF
3711 < #line 3360 "configure"
3711 > #line 3712 "configure"
3712   #include "confdefs.h"
3713   #include <sys/types.h>
3714   #if STDC_HEADERS
# Line 3384 | Line 3736 | EOF
3736   fi
3737  
3738   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3739 < echo "configure:3388: checking for size_t" >&5
3739 > echo "configure:3740: checking for size_t" >&5
3740   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3741    echo $ac_n "(cached) $ac_c" 1>&6
3742   else
3743    cat > conftest.$ac_ext <<EOF
3744 < #line 3393 "configure"
3744 > #line 3745 "configure"
3745   #include "confdefs.h"
3746   #include <sys/types.h>
3747   #if STDC_HEADERS
# Line 3417 | Line 3769 | EOF
3769   fi
3770  
3771   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3772 < echo "configure:3421: checking whether time.h and sys/time.h may both be included" >&5
3772 > echo "configure:3773: checking whether time.h and sys/time.h may both be included" >&5
3773   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3774    echo $ac_n "(cached) $ac_c" 1>&6
3775   else
3776    cat > conftest.$ac_ext <<EOF
3777 < #line 3426 "configure"
3777 > #line 3778 "configure"
3778   #include "confdefs.h"
3779   #include <sys/types.h>
3780   #include <sys/time.h>
# Line 3431 | Line 3783 | int main() {
3783   struct tm *tp;
3784   ; return 0; }
3785   EOF
3786 < if { (eval echo configure:3435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3786 > if { (eval echo configure:3787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3787    rm -rf conftest*
3788    ac_cv_header_time=yes
3789   else
# Line 3452 | Line 3804 | EOF
3804   fi
3805  
3806   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3807 < echo "configure:3456: checking whether struct tm is in sys/time.h or time.h" >&5
3807 > echo "configure:3808: checking whether struct tm is in sys/time.h or time.h" >&5
3808   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3809    echo $ac_n "(cached) $ac_c" 1>&6
3810   else
3811    cat > conftest.$ac_ext <<EOF
3812 < #line 3461 "configure"
3812 > #line 3813 "configure"
3813   #include "confdefs.h"
3814   #include <sys/types.h>
3815   #include <time.h>
# Line 3465 | Line 3817 | int main() {
3817   struct tm *tp; tp->tm_sec;
3818   ; return 0; }
3819   EOF
3820 < if { (eval echo configure:3469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3820 > if { (eval echo configure:3821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3821    rm -rf conftest*
3822    ac_cv_struct_tm=time.h
3823   else
# Line 3489 | Line 3841 | fi
3841   for ac_func in strdup cfmakeraw
3842   do
3843   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3844 < echo "configure:3493: checking for $ac_func" >&5
3844 > echo "configure:3845: checking for $ac_func" >&5
3845   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3846    echo $ac_n "(cached) $ac_c" 1>&6
3847   else
3848    cat > conftest.$ac_ext <<EOF
3849 < #line 3498 "configure"
3849 > #line 3850 "configure"
3850   #include "confdefs.h"
3851   /* System header to define __stub macros and hopefully few prototypes,
3852      which can conflict with char $ac_func(); below.  */
# Line 3517 | Line 3869 | $ac_func();
3869  
3870   ; return 0; }
3871   EOF
3872 < if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3872 > if { (eval echo configure:3873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3873    rm -rf conftest*
3874    eval "ac_cv_func_$ac_func=yes"
3875   else
# Line 3544 | Line 3896 | done
3896   for ac_func in nanosleep clock_gettime timer_create
3897   do
3898   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3899 < echo "configure:3548: checking for $ac_func" >&5
3548 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3549 <  echo $ac_n "(cached) $ac_c" 1>&6
3550 < else
3551 <  cat > conftest.$ac_ext <<EOF
3552 < #line 3553 "configure"
3553 < #include "confdefs.h"
3554 < /* System header to define __stub macros and hopefully few prototypes,
3555 <    which can conflict with char $ac_func(); below.  */
3556 < #include <assert.h>
3557 < /* Override any gcc2 internal prototype to avoid an error.  */
3558 < /* We use char because int might match the return type of a gcc2
3559 <    builtin and then its argument prototype would still apply.  */
3560 < char $ac_func();
3561 <
3562 < int main() {
3563 <
3564 < /* The GNU C library defines this for functions which it implements
3565 <    to always fail with ENOSYS.  Some functions are actually named
3566 <    something starting with __ and the normal name is an alias.  */
3567 < #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
3568 < choke me
3569 < #else
3570 < $ac_func();
3571 < #endif
3572 <
3573 < ; return 0; }
3574 < EOF
3575 < if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3576 <  rm -rf conftest*
3577 <  eval "ac_cv_func_$ac_func=yes"
3578 < else
3579 <  echo "configure: failed program was:" >&5
3580 <  cat conftest.$ac_ext >&5
3581 <  rm -rf conftest*
3582 <  eval "ac_cv_func_$ac_func=no"
3583 < fi
3584 < rm -f conftest*
3585 < fi
3586 <
3587 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
3588 <  echo "$ac_t""yes" 1>&6
3589 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3590 <  cat >> confdefs.h <<EOF
3591 < #define $ac_tr_func 1
3592 < EOF
3593 <
3594 < else
3595 <  echo "$ac_t""no" 1>&6
3596 < fi
3597 < done
3598 <
3599 < for ac_func in pthread_cancel
3600 < do
3601 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3602 < echo "configure:3603: checking for $ac_func" >&5
3899 > echo "configure:3900: checking for $ac_func" >&5
3900   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3901    echo $ac_n "(cached) $ac_c" 1>&6
3902   else
3903    cat > conftest.$ac_ext <<EOF
3904 < #line 3608 "configure"
3904 > #line 3905 "configure"
3905   #include "confdefs.h"
3906   /* System header to define __stub macros and hopefully few prototypes,
3907      which can conflict with char $ac_func(); below.  */
# Line 3627 | Line 3924 | $ac_func();
3924  
3925   ; return 0; }
3926   EOF
3927 < if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3927 > if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3928    rm -rf conftest*
3929    eval "ac_cv_func_$ac_func=yes"
3930   else
# Line 3652 | Line 3949 | fi
3949   done
3950  
3951  
3952 < SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp"
3953 < if MACHINE=`uname -a 2>/dev/null`; then
3952 > SERIALSRC=serial_unix.cpp
3953 > ETHERSRC=../dummy/ether_dummy.cpp
3954 > SCSISRC=../dummy/scsi_dummy.cpp
3955 > AUDIOSRC=../dummy/audio_dummy.cpp
3956 > EXTRASYSSRCS=
3957 > SUPPORTS_NATIVE_M68K=no
3958 > if MACHINE=`uname -s 2>/dev/null`; then
3959    case "$MACHINE" in
3960    Linux*)
3961 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
3961 >    ETHERSRC=Linux/ether_linux.cpp
3962 >    SCSISRC=Linux/scsi_linux.cpp
3963 >    AUDIOSRC=audio_oss_esd.cpp
3964      ;;
3965    FreeBSD*3.*)
3966 +    AUDIOSRC=audio_oss_esd.cpp
3967 +    DEFINES="$DEFINES -DBSD_COMP"
3968          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3969 < echo "configure:3664: checking for cam_open_btl in -lcam" >&5
3969 > echo "configure:3970: checking for cam_open_btl in -lcam" >&5
3970   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3971   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3972    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3668 | Line 3974 | else
3974    ac_save_LIBS="$LIBS"
3975   LIBS="-lcam  $LIBS"
3976   cat > conftest.$ac_ext <<EOF
3977 < #line 3672 "configure"
3977 > #line 3978 "configure"
3978   #include "confdefs.h"
3979   /* Override any gcc2 internal prototype to avoid an error.  */
3980   /* We use char because int might match the return type of a gcc2
# Line 3679 | Line 3985 | int main() {
3985   cam_open_btl()
3986   ; return 0; }
3987   EOF
3988 < if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3988 > if { (eval echo configure:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3989    rm -rf conftest*
3990    eval "ac_cv_lib_$ac_lib_var=yes"
3991   else
# Line 3701 | Line 4007 | HAVE_LIBCAM=no
4007   fi
4008  
4009      if [ "x$HAVE_LIBCAM" = "xno" ]; then
4010 <      { echo "configure: error: Cannot find libcam for SCSI management." 1>&2; exit 1; }
4010 >      echo "configure: warning: Cannot find libcam for SCSI management, disabling SCSI support." 1>&2
4011      else
4012              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
4013   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
4014 < echo "configure:3709: checking for /sys/cam/cam.h" >&5
4014 > echo "configure:4015: checking for /sys/cam/cam.h" >&5
4015   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4016    echo $ac_n "(cached) $ac_c" 1>&6
4017   else
4018    cat > conftest.$ac_ext <<EOF
4019 < #line 3714 "configure"
4019 > #line 4020 "configure"
4020   #include "confdefs.h"
4021   #include </sys/cam/cam.h>
4022   EOF
4023   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4024 < { (eval echo configure:3719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4024 > { (eval echo configure:4025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4025   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4026   if test -z "$ac_err"; then
4027    rm -rf conftest*
# Line 3737 | Line 4043 | else
4043   fi
4044  
4045        if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then
4046 <                        { echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; }
4046 >                        echo "configure: warning: Cannot find kernel includes for CAM library, disabling SCSI support." 1>&2
4047 >      else
4048 >        SCSISRC=FreeBSD/scsi_freebsd.cpp
4049 >        CXXFLAGS="$CXXFLAGS -I/sys"
4050 >        CFLAGS="$CFLAGS -I/sys"
4051 >        LIBS="$LIBS -lcam"
4052 >        DEFINES="$DEFINES -DCAM"
4053        fi
3742 –      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
3743 –      CXXFLAGS="$CXXFLAGS -I/sys"
3744 –      CFLAGS="$CFLAGS -I/sys"
3745 –      LIBS="$LIBS -lcam"
3746 –      DEFINES="$DEFINES -DBSD_COMP -DCAM"
4054      fi
4055      ;;
4056    FreeBSD*)
4057 +    DEFINES="$DEFINES -DBSD_COMP"
4058          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
4059 < echo "configure:3752: checking for scsi_open in -lscsi" >&5
4059 > echo "configure:4060: checking for scsi_open in -lscsi" >&5
4060   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
4061   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4062    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3756 | Line 4064 | else
4064    ac_save_LIBS="$LIBS"
4065   LIBS="-lscsi  $LIBS"
4066   cat > conftest.$ac_ext <<EOF
4067 < #line 3760 "configure"
4067 > #line 4068 "configure"
4068   #include "confdefs.h"
4069   /* Override any gcc2 internal prototype to avoid an error.  */
4070   /* We use char because int might match the return type of a gcc2
# Line 3767 | Line 4075 | int main() {
4075   scsi_open()
4076   ; return 0; }
4077   EOF
4078 < if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4078 > if { (eval echo configure:4079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4079    rm -rf conftest*
4080    eval "ac_cv_lib_$ac_lib_var=yes"
4081   else
# Line 3789 | Line 4097 | HAVE_LIBSCSI=no
4097   fi
4098  
4099      if [ "x$HAVE_LIBSCSI" = "xno" ]; then
4100 <      { echo "configure: error: Cannot find libscsi for SCSI management." 1>&2; exit 1; }
4100 >      echo "configure: warning: Cannot find libscsi for SCSI management, disabling SCSI support." 1>&2
4101      else
4102              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
4103   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
4104 < echo "configure:3797: checking for scsi.h sys/scsiio.h" >&5
4104 > echo "configure:4105: checking for scsi.h sys/scsiio.h" >&5
4105   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4106    echo $ac_n "(cached) $ac_c" 1>&6
4107   else
4108    cat > conftest.$ac_ext <<EOF
4109 < #line 3802 "configure"
4109 > #line 4110 "configure"
4110   #include "confdefs.h"
4111   #include <scsi.h sys/scsiio.h>
4112   EOF
4113   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4114 < { (eval echo configure:3807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4114 > { (eval echo configure:4115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4115   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4116   if test -z "$ac_err"; then
4117    rm -rf conftest*
# Line 3825 | Line 4133 | else
4133   fi
4134  
4135        if [ "x$ac_cv_header_scsi_h" = "xno" ]; then
4136 <        { echo "configure: error: Cannot find includes for the SCSI library." 1>&2; exit 1; }
4136 >        echo "configure: warning: Cannot find includes for the SCSI library, disabling SCSI support." 1>&2
4137 >      else
4138 >        SCSISRC=FreeBSD/scsi_freebsd.cpp
4139 >        LIBS="$LIBS -lscsi"
4140        fi
3830 –      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3831 –      LIBS="$LIBS -lscsi"
3832 –      DEFINES="$DEFINES -DBSD_COMP"
4141      fi
4142      ;;
4143 +  NetBSD*)
4144 +    SUPPORTS_NATIVE_M68K=yes
4145 +    ;;
4146    SunOS*)
4147 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp Solaris/audio_solaris.cpp"
4147 >    AUDIOSRC=Solaris/audio_solaris.cpp
4148      DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
4149      ;;
4150    IRIX*)
4151 <    SYSSRCS="../dummy/ether_dummy.cpp ../dummy/scsi_dummy.cpp ../dummy/audio_dummy.cpp Irix/unaligned.c"
4151 >    EXTRASYSSRCS=Irix/unaligned.c
4152      DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200"
4153      LIBS="$LIBS -lm"
4154      ;;
4155    esac
4156   fi
4157 < SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
4158 <
4159 < HAVE_I386=no
4160 < echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
4161 < echo "configure:3851: checking for x86 target CPU" >&5
3851 < cat > conftest.$ac_ext <<EOF
3852 < #line 3853 "configure"
3853 < #include "confdefs.h"
3854 <
3855 < #ifdef __i386__
3856 <  yes
3857 < #endif
3858 <
3859 < EOF
3860 < if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3861 <  egrep "yes" >/dev/null 2>&1; then
3862 <  rm -rf conftest*
3863 <  echo "$ac_t""yes" 1>&6; HAVE_I386=yes
3864 < else
3865 <  rm -rf conftest*
3866 <  echo "$ac_t""no" 1>&6
4157 > if [ "x$HAVE_PTHREADS" = "xno" ]; then
4158 >    echo "configure: warning: You don't have pthreads, disabling serial, ethernet and audio support." 1>&2
4159 >  SERIALSRC=../dummy/serial_dummy.cpp
4160 >  ETHERSRC=../dummy/ether_dummy.cpp
4161 >  AUDIOSRC=../dummy/audio_dummy.cpp
4162   fi
4163 < rm -f conftest*
3869 <
3870 <
3871 < HAVE_SPARC=no
3872 < echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
3873 < echo "configure:3874: checking for SPARC target CPU" >&5
3874 < cat > conftest.$ac_ext <<EOF
3875 < #line 3876 "configure"
3876 < #include "confdefs.h"
3877 <
3878 < #ifdef __sparc__
3879 <  yes
3880 < #endif
3881 <
3882 < EOF
3883 < if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
3884 <  egrep "yes" >/dev/null 2>&1; then
3885 <  rm -rf conftest*
3886 <  echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes
3887 < else
3888 <  rm -rf conftest*
3889 <  echo "$ac_t""no" 1>&6
3890 < fi
3891 < rm -f conftest*
3892 <
4163 > SYSSRCS="$SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
4164  
4165   HAVE_GAS=no
4166   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
4167 < echo "configure:3897: checking for GAS .p2align feature" >&5
4167 > echo "configure:4168: checking for GAS .p2align feature" >&5
4168   cat >conftest.S << EOF
4169          .text
4170          .p2align 5
# Line 3903 | Line 4174 | echo "$ac_t""$HAVE_GAS" 1>&6
4174  
4175   HAVE_GCC27=no
4176   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
4177 < echo "configure:3907: checking for GCC 2.7 or higher" >&5
4177 > echo "configure:4178: checking for GCC 2.7 or higher" >&5
4178   cat > conftest.$ac_ext <<EOF
4179 < #line 3909 "configure"
4179 > #line 4180 "configure"
4180   #include "confdefs.h"
4181   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
4182    yes
# Line 3923 | Line 4194 | fi
4194   rm -f conftest*
4195  
4196  
4197 < if [ "x$HAVE_GCC27" = "xyes" ]; then
4197 > if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
4198    CFLAGS="$CFLAGS -fomit-frame-pointer"
4199    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
4200   fi
# Line 3931 | Line 4202 | fi
4202   WANT_X86_ASSEMBLY=no
4203   WANT_SPARC_V8_ASSEMBLY=no
4204   WANT_SPARC_V9_ASSEMBLY=no
4205 + WANT_NATIVE_M68K=no
4206   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
4207   if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
4208      DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4209    if [ "x$HAVE_GAS" = "xyes" ]; then
4210      WANT_X86_ASSEMBLY=yes
4211      DEFINES="$DEFINES -DX86_ASSEMBLY"
4212 <    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4212 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4213    fi
4214   elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
4215      case "$MACHINE" in
4216    SunOS*)
4217      echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
4218 < echo "configure:3947: checking SPARC CPU architecture" >&5
4218 > echo "configure:4219: checking SPARC CPU architecture" >&5
4219      SPARC_TYPE=`Solaris/which_sparc`
4220      echo "$ac_t""$SPARC_TYPE" 1>&6
4221      case "$SPARC_TYPE" in
# Line 3962 | Line 4234 | echo "configure:3947: checking SPARC CPU
4234      esac
4235      ;;
4236    esac
4237 + elif [ "x$HAVE_M68K" = "xyes" -a "x$SUPPORTS_NATIVE_M68K" = "xyes" ]; then
4238 +    CPUSRCS=""
4239 +  cat >> confdefs.h <<\EOF
4240 + #define ENABLE_NATIVE_M68K 1
4241 + EOF
4242 +
4243 +  WANT_NATIVE_M68K=yes
4244   fi
4245  
4246 < CPUINCLUDES="-I../uae_cpu"
4247 < 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"
4246 > if [ "x$WANT_NATIVE_M68K" = "xno" ]; then
4247 >  CPUINCLUDES="-I../uae_cpu"
4248 >  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"
4249 > else
4250 >  CPUINCLUDES="-I../native_cpu"
4251 >  CPUSRCS="asm_support.s"
4252 > fi
4253  
4254  
4255  
# Line 4349 | Line 4633 | echo
4633   echo Basilisk II configuration summary:
4634   echo
4635   echo XFree86 DGA support .............. : $WANT_XF86_DGA
4636 + echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
4637   echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4638   echo ESD sound support ................ : $WANT_ESD
4639 < echo GTK user interface ............... : $WANT_UI
4639 > echo GTK user interface ............... : $WANT_GTK
4640   echo mon debugger support ............. : $WANT_MON
4641   echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4642   echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
4643   echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
4644 + echo Running m68k code natively ....... : $WANT_NATIVE_M68K
4645   echo
4646 < echo "Configuration done. Now type \"make\"."
4646 > echo "Configuration done. Now type \"make\" (or \"gmake\")."

Diff Legend

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