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

# 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 1137 | Line 1157 | test -z "$INSTALL_DATA" && INSTALL_DATA=
1157  
1158   MONSRCS=
1159   echo $ac_n "checking for mon""... $ac_c" 1>&6
1160 < echo "configure:1141: checking for mon" >&5
1160 > echo "configure:1161: checking for mon" >&5
1161   if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1162    echo "$ac_t""yes" 1>&6
1163    WANT_MON=yes
1164    DEFINES="$DEFINES -DENABLE_MON=1"
1165    MONSRCS="../../../mon/src/mon.cpp ../../../mon/src/mon_6502.cpp ../../../mon/src/mon_68k.cpp ../../../mon/src/mon_8080.cpp ../../../mon/src/mon_cmd.cpp ../../../mon/src/mon_ppc.cpp ../../../mon/src/mon_x86.cpp"
1166    CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1167 +  echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
1168 + echo "configure:1169: checking for readline in -lreadline" >&5
1169 + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
1170 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1171 +  echo $ac_n "(cached) $ac_c" 1>&6
1172 + else
1173 +  ac_save_LIBS="$LIBS"
1174 + LIBS="-lreadline  $LIBS"
1175 + cat > conftest.$ac_ext <<EOF
1176 + #line 1177 "configure"
1177 + #include "confdefs.h"
1178 + /* Override any gcc2 internal prototype to avoid an error.  */
1179 + /* We use char because int might match the return type of a gcc2
1180 +    builtin and then its argument prototype would still apply.  */
1181 + char readline();
1182 +
1183 + int main() {
1184 + readline()
1185 + ; return 0; }
1186 + EOF
1187 + if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1188 +  rm -rf conftest*
1189 +  eval "ac_cv_lib_$ac_lib_var=yes"
1190 + else
1191 +  echo "configure: failed program was:" >&5
1192 +  cat conftest.$ac_ext >&5
1193 +  rm -rf conftest*
1194 +  eval "ac_cv_lib_$ac_lib_var=no"
1195 + fi
1196 + rm -f conftest*
1197 + LIBS="$ac_save_LIBS"
1198 +
1199 + fi
1200 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1201 +  echo "$ac_t""yes" 1>&6
1202 +    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1203 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1204 +  cat >> confdefs.h <<EOF
1205 + #define $ac_tr_lib 1
1206 + EOF
1207 +
1208 +  LIBS="-lreadline $LIBS"
1209 +
1210 + else
1211 +  echo "$ac_t""no" 1>&6
1212 + fi
1213 +
1214 +  for ac_hdr in readline/readline.h readline/history.h
1215 + do
1216 + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1217 + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1218 + echo "configure:1219: checking for $ac_hdr" >&5
1219 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1220 +  echo $ac_n "(cached) $ac_c" 1>&6
1221 + else
1222 +  cat > conftest.$ac_ext <<EOF
1223 + #line 1224 "configure"
1224 + #include "confdefs.h"
1225 + #include <$ac_hdr>
1226 + EOF
1227 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1228 + { (eval echo configure:1229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1229 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1230 + if test -z "$ac_err"; then
1231 +  rm -rf conftest*
1232 +  eval "ac_cv_header_$ac_safe=yes"
1233 + else
1234 +  echo "$ac_err" >&5
1235 +  echo "configure: failed program was:" >&5
1236 +  cat conftest.$ac_ext >&5
1237 +  rm -rf conftest*
1238 +  eval "ac_cv_header_$ac_safe=no"
1239 + fi
1240 + rm -f conftest*
1241 + fi
1242 + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
1243 +  echo "$ac_t""yes" 1>&6
1244 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
1245 +  cat >> confdefs.h <<EOF
1246 + #define $ac_tr_hdr 1
1247 + EOF
1248 +
1249 + else
1250 +  echo "$ac_t""no" 1>&6
1251 + fi
1252 + done
1253 +
1254   else
1255    echo "$ac_t""no" 1>&6
1256    WANT_MON=no
# Line 1151 | Line 1258 | else
1258   fi
1259  
1260   echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1261 < echo "configure:1155: checking for sem_init in -lposix4" >&5
1261 > echo "configure:1262: checking for sem_init in -lposix4" >&5
1262   ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1263   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1264    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1159 | Line 1266 | else
1266    ac_save_LIBS="$LIBS"
1267   LIBS="-lposix4  $LIBS"
1268   cat > conftest.$ac_ext <<EOF
1269 < #line 1163 "configure"
1269 > #line 1270 "configure"
1270   #include "confdefs.h"
1271   /* Override any gcc2 internal prototype to avoid an error.  */
1272   /* We use char because int might match the return type of a gcc2
# Line 1170 | Line 1277 | int main() {
1277   sem_init()
1278   ; return 0; }
1279   EOF
1280 < if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1280 > if { (eval echo configure:1281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1281    rm -rf conftest*
1282    eval "ac_cv_lib_$ac_lib_var=yes"
1283   else
# Line 1203 | Line 1310 | fi
1310   # Uses ac_ vars as temps to allow command line to override cache and checks.
1311   # --without-x overrides everything else, but does not touch the cache.
1312   echo $ac_n "checking for X""... $ac_c" 1>&6
1313 < echo "configure:1207: checking for X" >&5
1313 > echo "configure:1314: checking for X" >&5
1314  
1315   # Check whether --with-x or --without-x was given.
1316   if test "${with_x+set}" = set; then
# Line 1265 | Line 1372 | if test "$ac_x_includes" = NO; then
1372  
1373    # First, try using that file with no special directory specified.
1374   cat > conftest.$ac_ext <<EOF
1375 < #line 1269 "configure"
1375 > #line 1376 "configure"
1376   #include "confdefs.h"
1377   #include <$x_direct_test_include>
1378   EOF
1379   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1380 < { (eval echo configure:1274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1380 > { (eval echo configure:1381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1381   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1382   if test -z "$ac_err"; then
1383    rm -rf conftest*
# Line 1339 | Line 1446 | if test "$ac_x_libraries" = NO; then
1446    ac_save_LIBS="$LIBS"
1447    LIBS="-l$x_direct_test_library $LIBS"
1448   cat > conftest.$ac_ext <<EOF
1449 < #line 1343 "configure"
1449 > #line 1450 "configure"
1450   #include "confdefs.h"
1451  
1452   int main() {
1453   ${x_direct_test_function}()
1454   ; return 0; }
1455   EOF
1456 < if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1456 > if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1457    rm -rf conftest*
1458    LIBS="$ac_save_LIBS"
1459   # We can link X programs with no special library path.
# Line 1452 | Line 1559 | else
1559      case "`(uname -sr) 2>/dev/null`" in
1560      "SunOS 5"*)
1561        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1562 < echo "configure:1456: checking whether -R must be followed by a space" >&5
1562 > echo "configure:1563: checking whether -R must be followed by a space" >&5
1563        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1564        cat > conftest.$ac_ext <<EOF
1565 < #line 1459 "configure"
1565 > #line 1566 "configure"
1566   #include "confdefs.h"
1567  
1568   int main() {
1569  
1570   ; return 0; }
1571   EOF
1572 < if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1572 > if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1573    rm -rf conftest*
1574    ac_R_nospace=yes
1575   else
# Line 1478 | Line 1585 | rm -f conftest*
1585        else
1586          LIBS="$ac_xsave_LIBS -R $x_libraries"
1587          cat > conftest.$ac_ext <<EOF
1588 < #line 1482 "configure"
1588 > #line 1589 "configure"
1589   #include "confdefs.h"
1590  
1591   int main() {
1592  
1593   ; return 0; }
1594   EOF
1595 < if { (eval echo configure:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1595 > if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1596    rm -rf conftest*
1597    ac_R_space=yes
1598   else
# Line 1517 | Line 1624 | rm -f conftest*
1624      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1625      # the Alpha needs dnet_stub (dnet does not exist).
1626      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1627 < echo "configure:1521: checking for dnet_ntoa in -ldnet" >&5
1627 > echo "configure:1628: checking for dnet_ntoa in -ldnet" >&5
1628   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1629   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1630    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1525 | Line 1632 | else
1632    ac_save_LIBS="$LIBS"
1633   LIBS="-ldnet  $LIBS"
1634   cat > conftest.$ac_ext <<EOF
1635 < #line 1529 "configure"
1635 > #line 1636 "configure"
1636   #include "confdefs.h"
1637   /* Override any gcc2 internal prototype to avoid an error.  */
1638   /* We use char because int might match the return type of a gcc2
# Line 1536 | Line 1643 | int main() {
1643   dnet_ntoa()
1644   ; return 0; }
1645   EOF
1646 < if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1646 > if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1647    rm -rf conftest*
1648    eval "ac_cv_lib_$ac_lib_var=yes"
1649   else
# Line 1558 | Line 1665 | fi
1665  
1666      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1667        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1668 < echo "configure:1562: checking for dnet_ntoa in -ldnet_stub" >&5
1668 > echo "configure:1669: checking for dnet_ntoa in -ldnet_stub" >&5
1669   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1670   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1671    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1566 | Line 1673 | else
1673    ac_save_LIBS="$LIBS"
1674   LIBS="-ldnet_stub  $LIBS"
1675   cat > conftest.$ac_ext <<EOF
1676 < #line 1570 "configure"
1676 > #line 1677 "configure"
1677   #include "confdefs.h"
1678   /* Override any gcc2 internal prototype to avoid an error.  */
1679   /* We use char because int might match the return type of a gcc2
# Line 1577 | Line 1684 | int main() {
1684   dnet_ntoa()
1685   ; return 0; }
1686   EOF
1687 < if { (eval echo configure:1581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1687 > if { (eval echo configure:1688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1688    rm -rf conftest*
1689    eval "ac_cv_lib_$ac_lib_var=yes"
1690   else
# Line 1606 | Line 1713 | fi
1713      # The nsl library prevents programs from opening the X display
1714      # on Irix 5.2, according to dickey@clark.net.
1715      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1716 < echo "configure:1610: checking for gethostbyname" >&5
1716 > echo "configure:1717: checking for gethostbyname" >&5
1717   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1718    echo $ac_n "(cached) $ac_c" 1>&6
1719   else
1720    cat > conftest.$ac_ext <<EOF
1721 < #line 1615 "configure"
1721 > #line 1722 "configure"
1722   #include "confdefs.h"
1723   /* System header to define __stub macros and hopefully few prototypes,
1724      which can conflict with char gethostbyname(); below.  */
# Line 1634 | Line 1741 | gethostbyname();
1741  
1742   ; return 0; }
1743   EOF
1744 < if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1744 > if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1745    rm -rf conftest*
1746    eval "ac_cv_func_gethostbyname=yes"
1747   else
# Line 1655 | Line 1762 | fi
1762  
1763      if test $ac_cv_func_gethostbyname = no; then
1764        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1765 < echo "configure:1659: checking for gethostbyname in -lnsl" >&5
1765 > echo "configure:1766: checking for gethostbyname in -lnsl" >&5
1766   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1767   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1768    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1663 | Line 1770 | else
1770    ac_save_LIBS="$LIBS"
1771   LIBS="-lnsl  $LIBS"
1772   cat > conftest.$ac_ext <<EOF
1773 < #line 1667 "configure"
1773 > #line 1774 "configure"
1774   #include "confdefs.h"
1775   /* Override any gcc2 internal prototype to avoid an error.  */
1776   /* We use char because int might match the return type of a gcc2
# Line 1674 | Line 1781 | int main() {
1781   gethostbyname()
1782   ; return 0; }
1783   EOF
1784 < if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1784 > if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1785    rm -rf conftest*
1786    eval "ac_cv_lib_$ac_lib_var=yes"
1787   else
# Line 1704 | Line 1811 | fi
1811      # -lsocket must be given before -lnsl if both are needed.
1812      # We assume that if connect needs -lnsl, so does gethostbyname.
1813      echo $ac_n "checking for connect""... $ac_c" 1>&6
1814 < echo "configure:1708: checking for connect" >&5
1814 > echo "configure:1815: checking for connect" >&5
1815   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1816    echo $ac_n "(cached) $ac_c" 1>&6
1817   else
1818    cat > conftest.$ac_ext <<EOF
1819 < #line 1713 "configure"
1819 > #line 1820 "configure"
1820   #include "confdefs.h"
1821   /* System header to define __stub macros and hopefully few prototypes,
1822      which can conflict with char connect(); below.  */
# Line 1732 | Line 1839 | connect();
1839  
1840   ; return 0; }
1841   EOF
1842 < if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1842 > if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1843    rm -rf conftest*
1844    eval "ac_cv_func_connect=yes"
1845   else
# Line 1753 | Line 1860 | fi
1860  
1861      if test $ac_cv_func_connect = no; then
1862        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1863 < echo "configure:1757: checking for connect in -lsocket" >&5
1863 > echo "configure:1864: checking for connect in -lsocket" >&5
1864   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1865   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1866    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1761 | Line 1868 | else
1868    ac_save_LIBS="$LIBS"
1869   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1870   cat > conftest.$ac_ext <<EOF
1871 < #line 1765 "configure"
1871 > #line 1872 "configure"
1872   #include "confdefs.h"
1873   /* Override any gcc2 internal prototype to avoid an error.  */
1874   /* We use char because int might match the return type of a gcc2
# Line 1772 | Line 1879 | int main() {
1879   connect()
1880   ; return 0; }
1881   EOF
1882 < if { (eval echo configure:1776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1882 > if { (eval echo configure:1883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1883    rm -rf conftest*
1884    eval "ac_cv_lib_$ac_lib_var=yes"
1885   else
# Line 1796 | Line 1903 | fi
1903  
1904      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1905      echo $ac_n "checking for remove""... $ac_c" 1>&6
1906 < echo "configure:1800: checking for remove" >&5
1906 > echo "configure:1907: checking for remove" >&5
1907   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1908    echo $ac_n "(cached) $ac_c" 1>&6
1909   else
1910    cat > conftest.$ac_ext <<EOF
1911 < #line 1805 "configure"
1911 > #line 1912 "configure"
1912   #include "confdefs.h"
1913   /* System header to define __stub macros and hopefully few prototypes,
1914      which can conflict with char remove(); below.  */
# Line 1824 | Line 1931 | remove();
1931  
1932   ; return 0; }
1933   EOF
1934 < if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1934 > if { (eval echo configure:1935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1935    rm -rf conftest*
1936    eval "ac_cv_func_remove=yes"
1937   else
# Line 1845 | Line 1952 | fi
1952  
1953      if test $ac_cv_func_remove = no; then
1954        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1955 < echo "configure:1849: checking for remove in -lposix" >&5
1955 > echo "configure:1956: checking for remove in -lposix" >&5
1956   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1957   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1958    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1853 | Line 1960 | else
1960    ac_save_LIBS="$LIBS"
1961   LIBS="-lposix  $LIBS"
1962   cat > conftest.$ac_ext <<EOF
1963 < #line 1857 "configure"
1963 > #line 1964 "configure"
1964   #include "confdefs.h"
1965   /* Override any gcc2 internal prototype to avoid an error.  */
1966   /* We use char because int might match the return type of a gcc2
# Line 1864 | Line 1971 | int main() {
1971   remove()
1972   ; return 0; }
1973   EOF
1974 < if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1974 > if { (eval echo configure:1975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1975    rm -rf conftest*
1976    eval "ac_cv_lib_$ac_lib_var=yes"
1977   else
# Line 1888 | Line 1995 | fi
1995  
1996      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1997      echo $ac_n "checking for shmat""... $ac_c" 1>&6
1998 < echo "configure:1892: checking for shmat" >&5
1998 > echo "configure:1999: checking for shmat" >&5
1999   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
2000    echo $ac_n "(cached) $ac_c" 1>&6
2001   else
2002    cat > conftest.$ac_ext <<EOF
2003 < #line 1897 "configure"
2003 > #line 2004 "configure"
2004   #include "confdefs.h"
2005   /* System header to define __stub macros and hopefully few prototypes,
2006      which can conflict with char shmat(); below.  */
# Line 1916 | Line 2023 | shmat();
2023  
2024   ; return 0; }
2025   EOF
2026 < if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2026 > if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2027    rm -rf conftest*
2028    eval "ac_cv_func_shmat=yes"
2029   else
# Line 1937 | Line 2044 | fi
2044  
2045      if test $ac_cv_func_shmat = no; then
2046        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
2047 < echo "configure:1941: checking for shmat in -lipc" >&5
2047 > echo "configure:2048: checking for shmat in -lipc" >&5
2048   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
2049   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2050    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1945 | Line 2052 | else
2052    ac_save_LIBS="$LIBS"
2053   LIBS="-lipc  $LIBS"
2054   cat > conftest.$ac_ext <<EOF
2055 < #line 1949 "configure"
2055 > #line 2056 "configure"
2056   #include "confdefs.h"
2057   /* Override any gcc2 internal prototype to avoid an error.  */
2058   /* We use char because int might match the return type of a gcc2
# Line 1956 | Line 2063 | int main() {
2063   shmat()
2064   ; return 0; }
2065   EOF
2066 < if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2066 > if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2067    rm -rf conftest*
2068    eval "ac_cv_lib_$ac_lib_var=yes"
2069   else
# Line 1989 | Line 2096 | fi
2096    # libraries we check for below, so use a different variable.
2097    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
2098    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
2099 < echo "configure:1993: checking for IceConnectionNumber in -lICE" >&5
2099 > echo "configure:2100: checking for IceConnectionNumber in -lICE" >&5
2100   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
2101   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2102    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1997 | Line 2104 | else
2104    ac_save_LIBS="$LIBS"
2105   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
2106   cat > conftest.$ac_ext <<EOF
2107 < #line 2001 "configure"
2107 > #line 2108 "configure"
2108   #include "confdefs.h"
2109   /* Override any gcc2 internal prototype to avoid an error.  */
2110   /* We use char because int might match the return type of a gcc2
# Line 2008 | Line 2115 | int main() {
2115   IceConnectionNumber()
2116   ; return 0; }
2117   EOF
2118 < if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2118 > if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2119    rm -rf conftest*
2120    eval "ac_cv_lib_$ac_lib_var=yes"
2121   else
# Line 2040 | Line 2147 | CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2147   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
2148  
2149   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2150 < echo "configure:2044: checking for pthread_create in -lpthread" >&5
2150 > echo "configure:2151: checking for pthread_create in -lpthread" >&5
2151   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2152   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2153    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2048 | Line 2155 | else
2155    ac_save_LIBS="$LIBS"
2156   LIBS="-lpthread  $LIBS"
2157   cat > conftest.$ac_ext <<EOF
2158 < #line 2052 "configure"
2158 > #line 2159 "configure"
2159   #include "confdefs.h"
2160   /* Override any gcc2 internal prototype to avoid an error.  */
2161   /* We use char because int might match the return type of a gcc2
# Line 2059 | Line 2166 | int main() {
2166   pthread_create()
2167   ; return 0; }
2168   EOF
2169 < if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2169 > if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2170    rm -rf conftest*
2171    eval "ac_cv_lib_$ac_lib_var=yes"
2172   else
# Line 2086 | Line 2193 | else
2193    echo "$ac_t""no" 1>&6
2194  
2195    echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2196 < echo "configure:2090: checking for pthread_create in -lc_r" >&5
2196 > echo "configure:2197: checking for pthread_create in -lc_r" >&5
2197   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2198   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2199    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2094 | Line 2201 | else
2201    ac_save_LIBS="$LIBS"
2202   LIBS="-lc_r  $LIBS"
2203   cat > conftest.$ac_ext <<EOF
2204 < #line 2098 "configure"
2204 > #line 2205 "configure"
2205   #include "confdefs.h"
2206   /* Override any gcc2 internal prototype to avoid an error.  */
2207   /* We use char because int might match the return type of a gcc2
# Line 2105 | Line 2212 | int main() {
2212   pthread_create()
2213   ; return 0; }
2214   EOF
2215 < if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2215 > if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2216    rm -rf conftest*
2217    eval "ac_cv_lib_$ac_lib_var=yes"
2218   else
# Line 2132 | Line 2239 | else
2239    echo "$ac_t""no" 1>&6
2240  
2241      echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2242 < echo "configure:2136: checking for pthread_create in -lPTL" >&5
2242 > echo "configure:2243: checking for pthread_create in -lPTL" >&5
2243   ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2244   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2245    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2140 | Line 2247 | else
2247    ac_save_LIBS="$LIBS"
2248   LIBS="-lPTL  $LIBS"
2249   cat > conftest.$ac_ext <<EOF
2250 < #line 2144 "configure"
2250 > #line 2251 "configure"
2251   #include "confdefs.h"
2252   /* Override any gcc2 internal prototype to avoid an error.  */
2253   /* We use char because int might match the return type of a gcc2
# Line 2151 | Line 2258 | int main() {
2258   pthread_create()
2259   ; return 0; }
2260   EOF
2261 < if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2261 > if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2262    rm -rf conftest*
2263    eval "ac_cv_lib_$ac_lib_var=yes"
2264   else
# Line 2192 | Line 2299 | SEMSRCS=
2299   for ac_func in sem_init
2300   do
2301   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2302 < echo "configure:2196: checking for $ac_func" >&5
2302 > echo "configure:2303: checking for $ac_func" >&5
2303   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2304    echo $ac_n "(cached) $ac_c" 1>&6
2305   else
2306    cat > conftest.$ac_ext <<EOF
2307 < #line 2201 "configure"
2307 > #line 2308 "configure"
2308   #include "confdefs.h"
2309   /* System header to define __stub macros and hopefully few prototypes,
2310      which can conflict with char $ac_func(); below.  */
# Line 2220 | Line 2327 | $ac_func();
2327  
2328   ; return 0; }
2329   EOF
2330 < if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2330 > if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2331    rm -rf conftest*
2332    eval "ac_cv_func_$ac_func=yes"
2333   else
# Line 2249 | Line 2356 | done
2356  
2357   if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2358    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2359 < echo "configure:2253: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2359 > echo "configure:2360: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2360   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2361   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2362    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2257 | Line 2364 | else
2364    ac_save_LIBS="$LIBS"
2365   LIBS="-lXxf86dga  $LIBS"
2366   cat > conftest.$ac_ext <<EOF
2367 < #line 2261 "configure"
2367 > #line 2368 "configure"
2368   #include "confdefs.h"
2369   /* Override any gcc2 internal prototype to avoid an error.  */
2370   /* We use char because int might match the return type of a gcc2
# Line 2268 | Line 2375 | int main() {
2375   XF86DGAQueryExtension()
2376   ; return 0; }
2377   EOF
2378 < if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2378 > if { (eval echo configure:2379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2379    rm -rf conftest*
2380    eval "ac_cv_lib_$ac_lib_var=yes"
2381   else
# Line 2295 | Line 2402 | else
2402    echo "$ac_t""no" 1>&6
2403  
2404      echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2405 +    WANT_XF86_DGA=no
2406      DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2407    
2408   fi
# Line 2308 | Line 2416 | else
2416    DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2417   fi
2418  
2419 + if [ "x$WANT_XF86_VIDMODE" = "xyes" ]; then
2420 +  echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
2421 + echo "configure:2422: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
2422 + ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'`
2423 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2424 +  echo $ac_n "(cached) $ac_c" 1>&6
2425 + else
2426 +  ac_save_LIBS="$LIBS"
2427 + LIBS="-lXxf86vm  $LIBS"
2428 + cat > conftest.$ac_ext <<EOF
2429 + #line 2430 "configure"
2430 + #include "confdefs.h"
2431 + /* Override any gcc2 internal prototype to avoid an error.  */
2432 + /* We use char because int might match the return type of a gcc2
2433 +    builtin and then its argument prototype would still apply.  */
2434 + char XF86VidModeQueryExtension();
2435 +
2436 + int main() {
2437 + XF86VidModeQueryExtension()
2438 + ; return 0; }
2439 + EOF
2440 + if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2441 +  rm -rf conftest*
2442 +  eval "ac_cv_lib_$ac_lib_var=yes"
2443 + else
2444 +  echo "configure: failed program was:" >&5
2445 +  cat conftest.$ac_ext >&5
2446 +  rm -rf conftest*
2447 +  eval "ac_cv_lib_$ac_lib_var=no"
2448 + fi
2449 + rm -f conftest*
2450 + LIBS="$ac_save_LIBS"
2451 +
2452 + fi
2453 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2454 +  echo "$ac_t""yes" 1>&6
2455 +  
2456 +    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=1"
2457 +    LIBS="$LIBS -lXxf86vm"
2458 +  
2459 + else
2460 +  echo "$ac_t""no" 1>&6
2461 +
2462 +    echo "configure: warning: Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode." 1>&2
2463 +    WANT_XF86_VIDMODE=no
2464 +    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=0"
2465 +  
2466 + fi
2467 +
2468 + fi
2469 +
2470   UISRCS=../dummy/prefs_editor_dummy.cpp
2471 < if [ "x$WANT_UI" = "xyes" ]; then
2471 > if [ "x$WANT_GTK" = "xyes" ]; then
2472    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2473   if test "${with_gtk_prefix+set}" = set; then
2474    withval="$with_gtk_prefix"
# Line 2351 | Line 2510 | fi
2510    # Extract the first word of "gtk-config", so it can be a program name with args.
2511   set dummy gtk-config; ac_word=$2
2512   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2513 < echo "configure:2355: checking for $ac_word" >&5
2513 > echo "configure:2514: checking for $ac_word" >&5
2514   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2515    echo $ac_n "(cached) $ac_c" 1>&6
2516   else
# Line 2386 | Line 2545 | fi
2545  
2546    min_gtk_version=1.2.0
2547    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2548 < echo "configure:2390: checking for GTK - version >= $min_gtk_version" >&5
2548 > echo "configure:2549: checking for GTK - version >= $min_gtk_version" >&5
2549    no_gtk=""
2550    if test "$GTK_CONFIG" = "no" ; then
2551      no_gtk=yes
# Line 2409 | Line 2568 | echo "configure:2390: checking for GTK -
2568    echo $ac_n "cross compiling; assumed OK... $ac_c"
2569   else
2570    cat > conftest.$ac_ext <<EOF
2571 < #line 2413 "configure"
2571 > #line 2572 "configure"
2572   #include "confdefs.h"
2573  
2574   #include <gtk/gtk.h>
# Line 2472 | Line 2631 | main ()
2631   }
2632  
2633   EOF
2634 < if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2634 > if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2635   then
2636    :
2637   else
# Line 2512 | Line 2671 | fi
2671            CFLAGS="$CFLAGS $GTK_CFLAGS"
2672            LIBS="$LIBS $GTK_LIBS"
2673            cat > conftest.$ac_ext <<EOF
2674 < #line 2516 "configure"
2674 > #line 2675 "configure"
2675   #include "confdefs.h"
2676  
2677   #include <gtk/gtk.h>
# Line 2522 | Line 2681 | int main() {
2681   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2682   ; return 0; }
2683   EOF
2684 < if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2684 > if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2685    rm -rf conftest*
2686     echo "*** The test program compiled, but did not run. This usually means"
2687            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2556 | Line 2715 | rm -f conftest*
2715       GTK_LIBS=""
2716      
2717      echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2718 <    WANT_UI=no
2718 >    WANT_GTK=no
2719 >    DEFINES="$DEFINES -DENABLE_GTK=0"
2720    
2721    fi
2722    
# Line 2607 | Line 2767 | fi
2767    # Extract the first word of "esd-config", so it can be a program name with args.
2768   set dummy esd-config; ac_word=$2
2769   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2770 < echo "configure:2611: checking for $ac_word" >&5
2770 > echo "configure:2771: checking for $ac_word" >&5
2771   if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2772    echo $ac_n "(cached) $ac_c" 1>&6
2773   else
# Line 2642 | Line 2802 | fi
2802  
2803    min_esd_version=0.2.8
2804    echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2805 < echo "configure:2646: checking for ESD - version >= $min_esd_version" >&5
2805 > echo "configure:2806: checking for ESD - version >= $min_esd_version" >&5
2806    no_esd=""
2807    if test "$ESD_CONFIG" = "no" ; then
2808      no_esd=yes
# Line 2666 | Line 2826 | echo "configure:2646: checking for ESD -
2826    echo $ac_n "cross compiling; assumed OK... $ac_c"
2827   else
2828    cat > conftest.$ac_ext <<EOF
2829 < #line 2670 "configure"
2829 > #line 2830 "configure"
2830   #include "confdefs.h"
2831  
2832   #include <stdio.h>
# Line 2724 | Line 2884 | int main ()
2884  
2885  
2886   EOF
2887 < if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2887 > if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2888   then
2889    :
2890   else
# Line 2763 | Line 2923 | fi
2923            CFLAGS="$CFLAGS $ESD_CFLAGS"
2924            LIBS="$LIBS $ESD_LIBS"
2925            cat > conftest.$ac_ext <<EOF
2926 < #line 2767 "configure"
2926 > #line 2927 "configure"
2927   #include "confdefs.h"
2928  
2929   #include <stdio.h>
# Line 2773 | Line 2933 | int main() {
2933   return 0;
2934   ; return 0; }
2935   EOF
2936 < if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2936 > if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2937    rm -rf conftest*
2938     echo "*** The test program compiled, but did not run. This usually means"
2939            echo "*** that the run-time linker is not finding ESD or finding the wrong"
# Line 2803 | Line 2963 | rm -f conftest*
2963      
2964      echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
2965      WANT_ESD=no
2966 +    DEFINES="$DEFINES -DENABLE_ESD=0"
2967    
2968    fi
2969    
# Line 2812 | Line 2973 | rm -f conftest*
2973   fi
2974  
2975   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2976 < echo "configure:2816: checking for ANSI C header files" >&5
2976 > echo "configure:2977: checking for ANSI C header files" >&5
2977   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2978    echo $ac_n "(cached) $ac_c" 1>&6
2979   else
2980    cat > conftest.$ac_ext <<EOF
2981 < #line 2821 "configure"
2981 > #line 2982 "configure"
2982   #include "confdefs.h"
2983   #include <stdlib.h>
2984   #include <stdarg.h>
# Line 2825 | Line 2986 | else
2986   #include <float.h>
2987   EOF
2988   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2989 < { (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2989 > { (eval echo configure:2990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2990   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2991   if test -z "$ac_err"; then
2992    rm -rf conftest*
# Line 2842 | Line 3003 | rm -f conftest*
3003   if test $ac_cv_header_stdc = yes; then
3004    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3005   cat > conftest.$ac_ext <<EOF
3006 < #line 2846 "configure"
3006 > #line 3007 "configure"
3007   #include "confdefs.h"
3008   #include <string.h>
3009   EOF
# Line 2860 | Line 3021 | fi
3021   if test $ac_cv_header_stdc = yes; then
3022    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3023   cat > conftest.$ac_ext <<EOF
3024 < #line 2864 "configure"
3024 > #line 3025 "configure"
3025   #include "confdefs.h"
3026   #include <stdlib.h>
3027   EOF
# Line 2881 | Line 3042 | if test "$cross_compiling" = yes; then
3042    :
3043   else
3044    cat > conftest.$ac_ext <<EOF
3045 < #line 2885 "configure"
3045 > #line 3046 "configure"
3046   #include "confdefs.h"
3047   #include <ctype.h>
3048   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2892 | Line 3053 | if (XOR (islower (i), ISLOWER (i)) || to
3053   exit (0); }
3054  
3055   EOF
3056 < if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3056 > if { (eval echo configure:3057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3057   then
3058    :
3059   else
# Line 2919 | Line 3080 | for ac_hdr in unistd.h fcntl.h sys/time.
3080   do
3081   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3082   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3083 < echo "configure:2923: checking for $ac_hdr" >&5
3083 > echo "configure:3084: checking for $ac_hdr" >&5
3084   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3085    echo $ac_n "(cached) $ac_c" 1>&6
3086   else
3087    cat > conftest.$ac_ext <<EOF
3088 < #line 2928 "configure"
3088 > #line 3089 "configure"
3089   #include "confdefs.h"
3090   #include <$ac_hdr>
3091   EOF
3092   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3093 < { (eval echo configure:2933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3093 > { (eval echo configure:3094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3094   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3095   if test -z "$ac_err"; then
3096    rm -rf conftest*
# Line 2957 | Line 3118 | done
3118  
3119  
3120   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
3121 < echo "configure:2961: checking whether byte ordering is bigendian" >&5
3121 > echo "configure:3122: checking whether byte ordering is bigendian" >&5
3122   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
3123    echo $ac_n "(cached) $ac_c" 1>&6
3124   else
3125    ac_cv_c_bigendian=unknown
3126   # See if sys/param.h defines the BYTE_ORDER macro.
3127   cat > conftest.$ac_ext <<EOF
3128 < #line 2968 "configure"
3128 > #line 3129 "configure"
3129   #include "confdefs.h"
3130   #include <sys/types.h>
3131   #include <sys/param.h>
# Line 2975 | Line 3136 | int main() {
3136   #endif
3137   ; return 0; }
3138   EOF
3139 < if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3139 > if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3140    rm -rf conftest*
3141    # It does; now see whether it defined to BIG_ENDIAN or not.
3142   cat > conftest.$ac_ext <<EOF
3143 < #line 2983 "configure"
3143 > #line 3144 "configure"
3144   #include "confdefs.h"
3145   #include <sys/types.h>
3146   #include <sys/param.h>
# Line 2990 | Line 3151 | int main() {
3151   #endif
3152   ; return 0; }
3153   EOF
3154 < if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3154 > if { (eval echo configure:3155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3155    rm -rf conftest*
3156    ac_cv_c_bigendian=yes
3157   else
# Line 3010 | Line 3171 | if test "$cross_compiling" = yes; then
3171      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3172   else
3173    cat > conftest.$ac_ext <<EOF
3174 < #line 3014 "configure"
3174 > #line 3175 "configure"
3175   #include "confdefs.h"
3176   main () {
3177    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 3023 | Line 3184 | main () {
3184    exit (u.c[sizeof (long) - 1] == 1);
3185   }
3186   EOF
3187 < if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3187 > if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3188   then
3189    ac_cv_c_bigendian=no
3190   else
# Line 3047 | Line 3208 | EOF
3208   fi
3209  
3210   echo $ac_n "checking for working const""... $ac_c" 1>&6
3211 < echo "configure:3051: checking for working const" >&5
3211 > echo "configure:3212: checking for working const" >&5
3212   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3213    echo $ac_n "(cached) $ac_c" 1>&6
3214   else
3215    cat > conftest.$ac_ext <<EOF
3216 < #line 3056 "configure"
3216 > #line 3217 "configure"
3217   #include "confdefs.h"
3218  
3219   int main() {
# Line 3101 | Line 3262 | ccp = (char const *const *) p;
3262  
3263   ; return 0; }
3264   EOF
3265 < if { (eval echo configure:3105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3265 > if { (eval echo configure:3266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3266    rm -rf conftest*
3267    ac_cv_c_const=yes
3268   else
# Line 3122 | Line 3283 | EOF
3283   fi
3284  
3285   echo $ac_n "checking for inline""... $ac_c" 1>&6
3286 < echo "configure:3126: checking for inline" >&5
3286 > echo "configure:3287: checking for inline" >&5
3287   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3288    echo $ac_n "(cached) $ac_c" 1>&6
3289   else
3290    ac_cv_c_inline=no
3291   for ac_kw in inline __inline__ __inline; do
3292    cat > conftest.$ac_ext <<EOF
3293 < #line 3133 "configure"
3293 > #line 3294 "configure"
3294   #include "confdefs.h"
3295  
3296   int main() {
3297   } $ac_kw foo() {
3298   ; return 0; }
3299   EOF
3300 < if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3300 > if { (eval echo configure:3301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3301    rm -rf conftest*
3302    ac_cv_c_inline=$ac_kw; break
3303   else
# Line 3162 | Line 3323 | EOF
3323   esac
3324  
3325   echo $ac_n "checking size of short""... $ac_c" 1>&6
3326 < echo "configure:3166: checking size of short" >&5
3326 > echo "configure:3327: checking size of short" >&5
3327   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3328    echo $ac_n "(cached) $ac_c" 1>&6
3329   else
# Line 3170 | Line 3331 | else
3331    ac_cv_sizeof_short=2
3332   else
3333    cat > conftest.$ac_ext <<EOF
3334 < #line 3174 "configure"
3334 > #line 3335 "configure"
3335   #include "confdefs.h"
3336   #include <stdio.h>
3337   main()
# Line 3181 | Line 3342 | main()
3342    exit(0);
3343   }
3344   EOF
3345 < if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3345 > if { (eval echo configure:3346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3346   then
3347    ac_cv_sizeof_short=`cat conftestval`
3348   else
# Line 3201 | Line 3362 | EOF
3362  
3363  
3364   echo $ac_n "checking size of int""... $ac_c" 1>&6
3365 < echo "configure:3205: checking size of int" >&5
3365 > echo "configure:3366: checking size of int" >&5
3366   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3367    echo $ac_n "(cached) $ac_c" 1>&6
3368   else
# Line 3209 | Line 3370 | else
3370    ac_cv_sizeof_int=4
3371   else
3372    cat > conftest.$ac_ext <<EOF
3373 < #line 3213 "configure"
3373 > #line 3374 "configure"
3374   #include "confdefs.h"
3375   #include <stdio.h>
3376   main()
# Line 3220 | Line 3381 | main()
3381    exit(0);
3382   }
3383   EOF
3384 < if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3384 > if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3385   then
3386    ac_cv_sizeof_int=`cat conftestval`
3387   else
# Line 3240 | Line 3401 | EOF
3401  
3402  
3403   echo $ac_n "checking size of long""... $ac_c" 1>&6
3404 < echo "configure:3244: checking size of long" >&5
3404 > echo "configure:3405: checking size of long" >&5
3405   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3406    echo $ac_n "(cached) $ac_c" 1>&6
3407   else
# Line 3248 | Line 3409 | else
3409    ac_cv_sizeof_long=4
3410   else
3411    cat > conftest.$ac_ext <<EOF
3412 < #line 3252 "configure"
3412 > #line 3413 "configure"
3413   #include "confdefs.h"
3414   #include <stdio.h>
3415   main()
# Line 3259 | Line 3420 | main()
3420    exit(0);
3421   }
3422   EOF
3423 < if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3423 > if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3424   then
3425    ac_cv_sizeof_long=`cat conftestval`
3426   else
# Line 3279 | Line 3440 | EOF
3440  
3441  
3442   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3443 < echo "configure:3283: checking size of long long" >&5
3443 > echo "configure:3444: checking size of long long" >&5
3444   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3445    echo $ac_n "(cached) $ac_c" 1>&6
3446   else
# Line 3287 | Line 3448 | else
3448    ac_cv_sizeof_long_long=8
3449   else
3450    cat > conftest.$ac_ext <<EOF
3451 < #line 3291 "configure"
3451 > #line 3452 "configure"
3452   #include "confdefs.h"
3453   #include <stdio.h>
3454   main()
# Line 3298 | Line 3459 | main()
3459    exit(0);
3460   }
3461   EOF
3462 < if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3462 > if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3463   then
3464    ac_cv_sizeof_long_long=`cat conftestval`
3465   else
# Line 3318 | Line 3479 | EOF
3479  
3480  
3481   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3482 < echo "configure:3322: checking for off_t" >&5
3482 > echo "configure:3483: checking for off_t" >&5
3483   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3484    echo $ac_n "(cached) $ac_c" 1>&6
3485   else
3486    cat > conftest.$ac_ext <<EOF
3487 < #line 3327 "configure"
3487 > #line 3488 "configure"
3488   #include "confdefs.h"
3489   #include <sys/types.h>
3490   #if STDC_HEADERS
# Line 3351 | Line 3512 | EOF
3512   fi
3513  
3514   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3515 < echo "configure:3355: checking for loff_t" >&5
3515 > echo "configure:3516: checking for loff_t" >&5
3516   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3517    echo $ac_n "(cached) $ac_c" 1>&6
3518   else
3519    cat > conftest.$ac_ext <<EOF
3520 < #line 3360 "configure"
3520 > #line 3521 "configure"
3521   #include "confdefs.h"
3522   #include <sys/types.h>
3523   #if STDC_HEADERS
# Line 3384 | Line 3545 | EOF
3545   fi
3546  
3547   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3548 < echo "configure:3388: checking for size_t" >&5
3548 > echo "configure:3549: checking for size_t" >&5
3549   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3550    echo $ac_n "(cached) $ac_c" 1>&6
3551   else
3552    cat > conftest.$ac_ext <<EOF
3553 < #line 3393 "configure"
3553 > #line 3554 "configure"
3554   #include "confdefs.h"
3555   #include <sys/types.h>
3556   #if STDC_HEADERS
# Line 3417 | Line 3578 | EOF
3578   fi
3579  
3580   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3581 < echo "configure:3421: checking whether time.h and sys/time.h may both be included" >&5
3581 > echo "configure:3582: checking whether time.h and sys/time.h may both be included" >&5
3582   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3583    echo $ac_n "(cached) $ac_c" 1>&6
3584   else
3585    cat > conftest.$ac_ext <<EOF
3586 < #line 3426 "configure"
3586 > #line 3587 "configure"
3587   #include "confdefs.h"
3588   #include <sys/types.h>
3589   #include <sys/time.h>
# Line 3431 | Line 3592 | int main() {
3592   struct tm *tp;
3593   ; return 0; }
3594   EOF
3595 < if { (eval echo configure:3435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3595 > if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3596    rm -rf conftest*
3597    ac_cv_header_time=yes
3598   else
# Line 3452 | Line 3613 | EOF
3613   fi
3614  
3615   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3616 < echo "configure:3456: checking whether struct tm is in sys/time.h or time.h" >&5
3616 > echo "configure:3617: checking whether struct tm is in sys/time.h or time.h" >&5
3617   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3618    echo $ac_n "(cached) $ac_c" 1>&6
3619   else
3620    cat > conftest.$ac_ext <<EOF
3621 < #line 3461 "configure"
3621 > #line 3622 "configure"
3622   #include "confdefs.h"
3623   #include <sys/types.h>
3624   #include <time.h>
# Line 3465 | Line 3626 | int main() {
3626   struct tm *tp; tp->tm_sec;
3627   ; return 0; }
3628   EOF
3629 < if { (eval echo configure:3469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3629 > if { (eval echo configure:3630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3630    rm -rf conftest*
3631    ac_cv_struct_tm=time.h
3632   else
# Line 3489 | Line 3650 | fi
3650   for ac_func in strdup cfmakeraw
3651   do
3652   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3653 < echo "configure:3493: checking for $ac_func" >&5
3653 > echo "configure:3654: checking for $ac_func" >&5
3654   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3655    echo $ac_n "(cached) $ac_c" 1>&6
3656   else
3657    cat > conftest.$ac_ext <<EOF
3658 < #line 3498 "configure"
3658 > #line 3659 "configure"
3659   #include "confdefs.h"
3660   /* System header to define __stub macros and hopefully few prototypes,
3661      which can conflict with char $ac_func(); below.  */
# Line 3517 | Line 3678 | $ac_func();
3678  
3679   ; return 0; }
3680   EOF
3681 < if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3681 > if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3682    rm -rf conftest*
3683    eval "ac_cv_func_$ac_func=yes"
3684   else
# Line 3544 | Line 3705 | done
3705   for ac_func in nanosleep clock_gettime timer_create
3706   do
3707   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3708 < echo "configure:3548: checking for $ac_func" >&5
3708 > echo "configure:3709: checking for $ac_func" >&5
3709   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3710    echo $ac_n "(cached) $ac_c" 1>&6
3711   else
3712    cat > conftest.$ac_ext <<EOF
3713 < #line 3553 "configure"
3713 > #line 3714 "configure"
3714   #include "confdefs.h"
3715   /* System header to define __stub macros and hopefully few prototypes,
3716      which can conflict with char $ac_func(); below.  */
# Line 3572 | Line 3733 | $ac_func();
3733  
3734   ; return 0; }
3735   EOF
3736 < if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3736 > if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3737    rm -rf conftest*
3738    eval "ac_cv_func_$ac_func=yes"
3739   else
# Line 3599 | Line 3760 | done
3760   for ac_func in pthread_cancel
3761   do
3762   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3763 < echo "configure:3603: checking for $ac_func" >&5
3763 > echo "configure:3764: checking for $ac_func" >&5
3764   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3765    echo $ac_n "(cached) $ac_c" 1>&6
3766   else
3767    cat > conftest.$ac_ext <<EOF
3768 < #line 3608 "configure"
3768 > #line 3769 "configure"
3769   #include "confdefs.h"
3770   /* System header to define __stub macros and hopefully few prototypes,
3771      which can conflict with char $ac_func(); below.  */
# Line 3627 | Line 3788 | $ac_func();
3788  
3789   ; return 0; }
3790   EOF
3791 < if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3791 > if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3792    rm -rf conftest*
3793    eval "ac_cv_func_$ac_func=yes"
3794   else
# Line 3660 | Line 3821 | if MACHINE=`uname -a 2>/dev/null`; then
3821      ;;
3822    FreeBSD*3.*)
3823          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3824 < echo "configure:3664: checking for cam_open_btl in -lcam" >&5
3824 > echo "configure:3825: checking for cam_open_btl in -lcam" >&5
3825   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3826   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3827    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3668 | Line 3829 | else
3829    ac_save_LIBS="$LIBS"
3830   LIBS="-lcam  $LIBS"
3831   cat > conftest.$ac_ext <<EOF
3832 < #line 3672 "configure"
3832 > #line 3833 "configure"
3833   #include "confdefs.h"
3834   /* Override any gcc2 internal prototype to avoid an error.  */
3835   /* We use char because int might match the return type of a gcc2
# Line 3679 | Line 3840 | int main() {
3840   cam_open_btl()
3841   ; return 0; }
3842   EOF
3843 < if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3843 > if { (eval echo configure:3844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3844    rm -rf conftest*
3845    eval "ac_cv_lib_$ac_lib_var=yes"
3846   else
# Line 3705 | Line 3866 | fi
3866      else
3867              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3868   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3869 < echo "configure:3709: checking for /sys/cam/cam.h" >&5
3869 > echo "configure:3870: checking for /sys/cam/cam.h" >&5
3870   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3871    echo $ac_n "(cached) $ac_c" 1>&6
3872   else
3873    cat > conftest.$ac_ext <<EOF
3874 < #line 3714 "configure"
3874 > #line 3875 "configure"
3875   #include "confdefs.h"
3876   #include </sys/cam/cam.h>
3877   EOF
3878   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3879 < { (eval echo configure:3719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3879 > { (eval echo configure:3880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3880   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3881   if test -z "$ac_err"; then
3882    rm -rf conftest*
# Line 3748 | Line 3909 | fi
3909      ;;
3910    FreeBSD*)
3911          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3912 < echo "configure:3752: checking for scsi_open in -lscsi" >&5
3912 > echo "configure:3913: checking for scsi_open in -lscsi" >&5
3913   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3914   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3915    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3756 | Line 3917 | else
3917    ac_save_LIBS="$LIBS"
3918   LIBS="-lscsi  $LIBS"
3919   cat > conftest.$ac_ext <<EOF
3920 < #line 3760 "configure"
3920 > #line 3921 "configure"
3921   #include "confdefs.h"
3922   /* Override any gcc2 internal prototype to avoid an error.  */
3923   /* We use char because int might match the return type of a gcc2
# Line 3767 | Line 3928 | int main() {
3928   scsi_open()
3929   ; return 0; }
3930   EOF
3931 < if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3931 > if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3932    rm -rf conftest*
3933    eval "ac_cv_lib_$ac_lib_var=yes"
3934   else
# Line 3793 | Line 3954 | fi
3954      else
3955              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3956   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3957 < echo "configure:3797: checking for scsi.h sys/scsiio.h" >&5
3957 > echo "configure:3958: checking for scsi.h sys/scsiio.h" >&5
3958   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3959    echo $ac_n "(cached) $ac_c" 1>&6
3960   else
3961    cat > conftest.$ac_ext <<EOF
3962 < #line 3802 "configure"
3962 > #line 3963 "configure"
3963   #include "confdefs.h"
3964   #include <scsi.h sys/scsiio.h>
3965   EOF
3966   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3967 < { (eval echo configure:3807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3967 > { (eval echo configure:3968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3968   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3969   if test -z "$ac_err"; then
3970    rm -rf conftest*
# Line 3847 | Line 4008 | SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONS
4008  
4009   HAVE_I386=no
4010   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
4011 < echo "configure:3851: checking for x86 target CPU" >&5
4011 > echo "configure:4012: checking for x86 target CPU" >&5
4012   cat > conftest.$ac_ext <<EOF
4013 < #line 3853 "configure"
4013 > #line 4014 "configure"
4014   #include "confdefs.h"
4015  
4016   #ifdef __i386__
# Line 3870 | Line 4031 | rm -f conftest*
4031  
4032   HAVE_SPARC=no
4033   echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
4034 < echo "configure:3874: checking for SPARC target CPU" >&5
4034 > echo "configure:4035: checking for SPARC target CPU" >&5
4035   cat > conftest.$ac_ext <<EOF
4036 < #line 3876 "configure"
4036 > #line 4037 "configure"
4037   #include "confdefs.h"
4038  
4039   #ifdef __sparc__
# Line 3893 | Line 4054 | rm -f conftest*
4054  
4055   HAVE_GAS=no
4056   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
4057 < echo "configure:3897: checking for GAS .p2align feature" >&5
4057 > echo "configure:4058: checking for GAS .p2align feature" >&5
4058   cat >conftest.S << EOF
4059          .text
4060          .p2align 5
# Line 3903 | Line 4064 | echo "$ac_t""$HAVE_GAS" 1>&6
4064  
4065   HAVE_GCC27=no
4066   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
4067 < echo "configure:3907: checking for GCC 2.7 or higher" >&5
4067 > echo "configure:4068: checking for GCC 2.7 or higher" >&5
4068   cat > conftest.$ac_ext <<EOF
4069 < #line 3909 "configure"
4069 > #line 4070 "configure"
4070   #include "confdefs.h"
4071   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
4072    yes
# Line 3937 | Line 4098 | if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_
4098    if [ "x$HAVE_GAS" = "xyes" ]; then
4099      WANT_X86_ASSEMBLY=yes
4100      DEFINES="$DEFINES -DX86_ASSEMBLY"
4101 <    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4101 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4102    fi
4103   elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
4104      case "$MACHINE" in
4105    SunOS*)
4106      echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
4107 < echo "configure:3947: checking SPARC CPU architecture" >&5
4107 > echo "configure:4108: checking SPARC CPU architecture" >&5
4108      SPARC_TYPE=`Solaris/which_sparc`
4109      echo "$ac_t""$SPARC_TYPE" 1>&6
4110      case "$SPARC_TYPE" in
# Line 4349 | Line 4510 | echo
4510   echo Basilisk II configuration summary:
4511   echo
4512   echo XFree86 DGA support .............. : $WANT_XF86_DGA
4513 + echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
4514   echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4515   echo ESD sound support ................ : $WANT_ESD
4516 < echo GTK user interface ............... : $WANT_UI
4516 > echo GTK user interface ............... : $WANT_GTK
4517   echo mon debugger support ............. : $WANT_MON
4518   echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4519   echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines