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

# Line 16 | Line 16 | ac_help="$ac_help
16   ac_help="$ac_help
17    --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]"
18   ac_help="$ac_help
19 <  --enable-esd            Enlightened Sound Daemon support [default=yes]"
19 >  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]"
20   ac_help="$ac_help
21 <  --enable-ui             use GTK user interface [default=yes]"
21 >  --with-gtk              use GTK user interface [default=yes]"
22 > ac_help="$ac_help
23 >  --with-mon              use mon as debugger [default=yes]"
24   ac_help="$ac_help
25    --with-x                use the X Window System"
26   ac_help="$ac_help
# Line 562 | Line 564 | else
564    WANT_FBDEV_DGA=yes
565   fi
566  
567 < # Check whether --enable-esd or --disable-esd was given.
568 < if test "${enable_esd+set}" = set; then
569 <  enableval="$enable_esd"
570 <  WANT_ESD=$enableval
567 > # Check whether --with-esd or --without-esd was given.
568 > if test "${with_esd+set}" = set; then
569 >  withval="$with_esd"
570 >  WANT_ESD=$withval
571   else
572    WANT_ESD=yes
573   fi
574  
575 < # Check whether --enable-ui or --disable-ui was given.
576 < if test "${enable_ui+set}" = set; then
577 <  enableval="$enable_ui"
578 <  WANT_UI=$enableval
575 > # Check whether --with-gtk or --without-gtk was given.
576 > if test "${with_gtk+set}" = set; then
577 >  withval="$with_gtk"
578 >  WANT_GTK=$withval
579 > else
580 >  WANT_GTK=yes
581 > fi
582 >
583 > # Check whether --with-mon or --without-mon was given.
584 > if test "${with_mon+set}" = set; then
585 >  withval="$with_mon"
586 >  WANT_MON=$withval
587   else
588 <  WANT_UI=yes
588 >  WANT_MON=yes
589   fi
590  
591  
592   # Extract the first word of "gcc", so it can be a program name with args.
593   set dummy gcc; ac_word=$2
594   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
595 < echo "configure:586: checking for $ac_word" >&5
595 > echo "configure:596: checking for $ac_word" >&5
596   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
597    echo $ac_n "(cached) $ac_c" 1>&6
598   else
# Line 612 | Line 622 | if test -z "$CC"; then
622    # Extract the first word of "cc", so it can be a program name with args.
623   set dummy cc; ac_word=$2
624   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
625 < echo "configure:616: checking for $ac_word" >&5
625 > echo "configure:626: checking for $ac_word" >&5
626   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
627    echo $ac_n "(cached) $ac_c" 1>&6
628   else
# Line 663 | Line 673 | fi
673        # Extract the first word of "cl", so it can be a program name with args.
674   set dummy cl; ac_word=$2
675   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
676 < echo "configure:667: checking for $ac_word" >&5
676 > echo "configure:677: checking for $ac_word" >&5
677   if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
678    echo $ac_n "(cached) $ac_c" 1>&6
679   else
# Line 695 | Line 705 | fi
705   fi
706  
707   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
708 < echo "configure:699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
708 > echo "configure:709: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
709  
710   ac_ext=c
711   # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 706 | Line 716 | cross_compiling=$ac_cv_prog_cc_cross
716  
717   cat > conftest.$ac_ext << EOF
718  
719 < #line 710 "configure"
719 > #line 720 "configure"
720   #include "confdefs.h"
721  
722   main(){return(0);}
723   EOF
724 < if { (eval echo configure:715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
724 > if { (eval echo configure:725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
725    ac_cv_prog_cc_works=yes
726    # If we can't run a trivial program, we are probably using a cross compiler.
727    if (./conftest; exit) 2>/dev/null; then
# Line 737 | Line 747 | if test $ac_cv_prog_cc_works = no; then
747    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
748   fi
749   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
750 < echo "configure:741: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
750 > echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
751   echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
752   cross_compiling=$ac_cv_prog_cc_cross
753  
754   echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
755 < echo "configure:746: checking whether we are using GNU C" >&5
755 > echo "configure:756: checking whether we are using GNU C" >&5
756   if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
757    echo $ac_n "(cached) $ac_c" 1>&6
758   else
# Line 751 | Line 761 | else
761    yes;
762   #endif
763   EOF
764 < 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
764 > if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
765    ac_cv_prog_gcc=yes
766   else
767    ac_cv_prog_gcc=no
# Line 770 | Line 780 | ac_test_CFLAGS="${CFLAGS+set}"
780   ac_save_CFLAGS="$CFLAGS"
781   CFLAGS=
782   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
783 < echo "configure:774: checking whether ${CC-cc} accepts -g" >&5
783 > echo "configure:784: checking whether ${CC-cc} accepts -g" >&5
784   if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
785    echo $ac_n "(cached) $ac_c" 1>&6
786   else
# Line 802 | Line 812 | else
812   fi
813  
814   echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
815 < echo "configure:806: checking how to run the C preprocessor" >&5
815 > echo "configure:816: checking how to run the C preprocessor" >&5
816   # On Suns, sometimes $CPP names a directory.
817   if test -n "$CPP" && test -d "$CPP"; then
818    CPP=
# Line 817 | Line 827 | else
827    # On the NeXT, cc -E runs the code through the compiler's parser,
828    # not just through cpp.
829    cat > conftest.$ac_ext <<EOF
830 < #line 821 "configure"
830 > #line 831 "configure"
831   #include "confdefs.h"
832   #include <assert.h>
833   Syntax Error
834   EOF
835   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
836 < { (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
836 > { (eval echo configure:837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
837   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
838   if test -z "$ac_err"; then
839    :
# Line 834 | Line 844 | else
844    rm -rf conftest*
845    CPP="${CC-cc} -E -traditional-cpp"
846    cat > conftest.$ac_ext <<EOF
847 < #line 838 "configure"
847 > #line 848 "configure"
848   #include "confdefs.h"
849   #include <assert.h>
850   Syntax Error
851   EOF
852   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
853 < { (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
853 > { (eval echo configure:854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
854   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
855   if test -z "$ac_err"; then
856    :
# Line 851 | Line 861 | else
861    rm -rf conftest*
862    CPP="${CC-cc} -nologo -E"
863    cat > conftest.$ac_ext <<EOF
864 < #line 855 "configure"
864 > #line 865 "configure"
865   #include "confdefs.h"
866   #include <assert.h>
867   Syntax Error
868   EOF
869   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
870 < { (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
870 > { (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
871   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
872   if test -z "$ac_err"; then
873    :
# Line 886 | Line 896 | do
896   # Extract the first word of "$ac_prog", so it can be a program name with args.
897   set dummy $ac_prog; ac_word=$2
898   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
899 < echo "configure:890: checking for $ac_word" >&5
899 > echo "configure:900: checking for $ac_word" >&5
900   if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
901    echo $ac_n "(cached) $ac_c" 1>&6
902   else
# Line 918 | Line 928 | test -n "$CXX" || CXX="gcc"
928  
929  
930   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
931 < echo "configure:922: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
931 > echo "configure:932: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
932  
933   ac_ext=C
934   # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
# Line 929 | Line 939 | cross_compiling=$ac_cv_prog_cxx_cross
939  
940   cat > conftest.$ac_ext << EOF
941  
942 < #line 933 "configure"
942 > #line 943 "configure"
943   #include "confdefs.h"
944  
945   int main(){return(0);}
946   EOF
947 < if { (eval echo configure:938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
947 > if { (eval echo configure:948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
948    ac_cv_prog_cxx_works=yes
949    # If we can't run a trivial program, we are probably using a cross compiler.
950    if (./conftest; exit) 2>/dev/null; then
# Line 960 | Line 970 | if test $ac_cv_prog_cxx_works = no; then
970    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
971   fi
972   echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
973 < echo "configure:964: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
973 > echo "configure:974: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
974   echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
975   cross_compiling=$ac_cv_prog_cxx_cross
976  
977   echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
978 < echo "configure:969: checking whether we are using GNU C++" >&5
978 > echo "configure:979: checking whether we are using GNU C++" >&5
979   if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
980    echo $ac_n "(cached) $ac_c" 1>&6
981   else
# Line 974 | Line 984 | else
984    yes;
985   #endif
986   EOF
987 < 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
987 > if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
988    ac_cv_prog_gxx=yes
989   else
990    ac_cv_prog_gxx=no
# Line 993 | Line 1003 | ac_test_CXXFLAGS="${CXXFLAGS+set}"
1003   ac_save_CXXFLAGS="$CXXFLAGS"
1004   CXXFLAGS=
1005   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
1006 < echo "configure:997: checking whether ${CXX-g++} accepts -g" >&5
1006 > echo "configure:1007: checking whether ${CXX-g++} accepts -g" >&5
1007   if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
1008    echo $ac_n "(cached) $ac_c" 1>&6
1009   else
# Line 1025 | Line 1035 | else
1035   fi
1036  
1037   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
1038 < echo "configure:1029: checking whether ${MAKE-make} sets \${MAKE}" >&5
1038 > echo "configure:1039: checking whether ${MAKE-make} sets \${MAKE}" >&5
1039   set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
1040   if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
1041    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1082 | Line 1092 | ac_configure=$ac_aux_dir/configure # Thi
1092   # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1093   # ./install, which can be erroneously created by make from ./install.sh.
1094   echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
1095 < echo "configure:1086: checking for a BSD compatible install" >&5
1095 > echo "configure:1096: checking for a BSD compatible install" >&5
1096   if test -z "$INSTALL"; then
1097   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
1098    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1137 | Line 1147 | test -z "$INSTALL_DATA" && INSTALL_DATA=
1147  
1148   MONSRCS=
1149   echo $ac_n "checking for mon""... $ac_c" 1>&6
1150 < echo "configure:1141: checking for mon" >&5
1150 > echo "configure:1151: checking for mon" >&5
1151   if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1152    echo "$ac_t""yes" 1>&6
1153    WANT_MON=yes
1154    DEFINES="$DEFINES -DENABLE_MON=1"
1155    MONSRCS="../../../mon/src/mon.cpp ../../../mon/src/mon_6502.cpp ../../../mon/src/mon_68k.cpp ../../../mon/src/mon_8080.cpp ../../../mon/src/mon_cmd.cpp ../../../mon/src/mon_ppc.cpp ../../../mon/src/mon_x86.cpp"
1156    CXXFLAGS="$CXXFLAGS -I../../../mon/src"
1157 +  echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
1158 + echo "configure:1159: checking for readline in -lreadline" >&5
1159 + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
1160 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1161 +  echo $ac_n "(cached) $ac_c" 1>&6
1162 + else
1163 +  ac_save_LIBS="$LIBS"
1164 + LIBS="-lreadline  $LIBS"
1165 + cat > conftest.$ac_ext <<EOF
1166 + #line 1167 "configure"
1167 + #include "confdefs.h"
1168 + /* Override any gcc2 internal prototype to avoid an error.  */
1169 + /* We use char because int might match the return type of a gcc2
1170 +    builtin and then its argument prototype would still apply.  */
1171 + char readline();
1172 +
1173 + int main() {
1174 + readline()
1175 + ; return 0; }
1176 + EOF
1177 + if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1178 +  rm -rf conftest*
1179 +  eval "ac_cv_lib_$ac_lib_var=yes"
1180 + else
1181 +  echo "configure: failed program was:" >&5
1182 +  cat conftest.$ac_ext >&5
1183 +  rm -rf conftest*
1184 +  eval "ac_cv_lib_$ac_lib_var=no"
1185 + fi
1186 + rm -f conftest*
1187 + LIBS="$ac_save_LIBS"
1188 +
1189 + fi
1190 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1191 +  echo "$ac_t""yes" 1>&6
1192 +    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1193 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1194 +  cat >> confdefs.h <<EOF
1195 + #define $ac_tr_lib 1
1196 + EOF
1197 +
1198 +  LIBS="-lreadline $LIBS"
1199 +
1200 + else
1201 +  echo "$ac_t""no" 1>&6
1202 + fi
1203 +
1204 +  for ac_hdr in readline/readline.h readline/history.h
1205 + do
1206 + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1207 + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1208 + echo "configure:1209: checking for $ac_hdr" >&5
1209 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1210 +  echo $ac_n "(cached) $ac_c" 1>&6
1211 + else
1212 +  cat > conftest.$ac_ext <<EOF
1213 + #line 1214 "configure"
1214 + #include "confdefs.h"
1215 + #include <$ac_hdr>
1216 + EOF
1217 + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1218 + { (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1219 + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1220 + if test -z "$ac_err"; then
1221 +  rm -rf conftest*
1222 +  eval "ac_cv_header_$ac_safe=yes"
1223 + else
1224 +  echo "$ac_err" >&5
1225 +  echo "configure: failed program was:" >&5
1226 +  cat conftest.$ac_ext >&5
1227 +  rm -rf conftest*
1228 +  eval "ac_cv_header_$ac_safe=no"
1229 + fi
1230 + rm -f conftest*
1231 + fi
1232 + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
1233 +  echo "$ac_t""yes" 1>&6
1234 +    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
1235 +  cat >> confdefs.h <<EOF
1236 + #define $ac_tr_hdr 1
1237 + EOF
1238 +
1239 + else
1240 +  echo "$ac_t""no" 1>&6
1241 + fi
1242 + done
1243 +
1244   else
1245    echo "$ac_t""no" 1>&6
1246    WANT_MON=no
# Line 1151 | Line 1248 | else
1248   fi
1249  
1250   echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1251 < echo "configure:1155: checking for sem_init in -lposix4" >&5
1251 > echo "configure:1252: checking for sem_init in -lposix4" >&5
1252   ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1253   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1254    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1159 | Line 1256 | else
1256    ac_save_LIBS="$LIBS"
1257   LIBS="-lposix4  $LIBS"
1258   cat > conftest.$ac_ext <<EOF
1259 < #line 1163 "configure"
1259 > #line 1260 "configure"
1260   #include "confdefs.h"
1261   /* Override any gcc2 internal prototype to avoid an error.  */
1262   /* We use char because int might match the return type of a gcc2
# Line 1170 | Line 1267 | int main() {
1267   sem_init()
1268   ; return 0; }
1269   EOF
1270 < if { (eval echo configure:1174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1270 > if { (eval echo configure:1271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1271    rm -rf conftest*
1272    eval "ac_cv_lib_$ac_lib_var=yes"
1273   else
# Line 1203 | Line 1300 | fi
1300   # Uses ac_ vars as temps to allow command line to override cache and checks.
1301   # --without-x overrides everything else, but does not touch the cache.
1302   echo $ac_n "checking for X""... $ac_c" 1>&6
1303 < echo "configure:1207: checking for X" >&5
1303 > echo "configure:1304: checking for X" >&5
1304  
1305   # Check whether --with-x or --without-x was given.
1306   if test "${with_x+set}" = set; then
# Line 1265 | Line 1362 | if test "$ac_x_includes" = NO; then
1362  
1363    # First, try using that file with no special directory specified.
1364   cat > conftest.$ac_ext <<EOF
1365 < #line 1269 "configure"
1365 > #line 1366 "configure"
1366   #include "confdefs.h"
1367   #include <$x_direct_test_include>
1368   EOF
1369   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1370 < { (eval echo configure:1274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1370 > { (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1371   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1372   if test -z "$ac_err"; then
1373    rm -rf conftest*
# Line 1339 | Line 1436 | if test "$ac_x_libraries" = NO; then
1436    ac_save_LIBS="$LIBS"
1437    LIBS="-l$x_direct_test_library $LIBS"
1438   cat > conftest.$ac_ext <<EOF
1439 < #line 1343 "configure"
1439 > #line 1440 "configure"
1440   #include "confdefs.h"
1441  
1442   int main() {
1443   ${x_direct_test_function}()
1444   ; return 0; }
1445   EOF
1446 < if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1446 > if { (eval echo configure:1447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1447    rm -rf conftest*
1448    LIBS="$ac_save_LIBS"
1449   # We can link X programs with no special library path.
# Line 1452 | Line 1549 | else
1549      case "`(uname -sr) 2>/dev/null`" in
1550      "SunOS 5"*)
1551        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1552 < echo "configure:1456: checking whether -R must be followed by a space" >&5
1552 > echo "configure:1553: checking whether -R must be followed by a space" >&5
1553        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1554        cat > conftest.$ac_ext <<EOF
1555 < #line 1459 "configure"
1555 > #line 1556 "configure"
1556   #include "confdefs.h"
1557  
1558   int main() {
1559  
1560   ; return 0; }
1561   EOF
1562 < if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1562 > if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1563    rm -rf conftest*
1564    ac_R_nospace=yes
1565   else
# Line 1478 | Line 1575 | rm -f conftest*
1575        else
1576          LIBS="$ac_xsave_LIBS -R $x_libraries"
1577          cat > conftest.$ac_ext <<EOF
1578 < #line 1482 "configure"
1578 > #line 1579 "configure"
1579   #include "confdefs.h"
1580  
1581   int main() {
1582  
1583   ; return 0; }
1584   EOF
1585 < if { (eval echo configure:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1585 > if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1586    rm -rf conftest*
1587    ac_R_space=yes
1588   else
# Line 1517 | Line 1614 | rm -f conftest*
1614      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1615      # the Alpha needs dnet_stub (dnet does not exist).
1616      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1617 < echo "configure:1521: checking for dnet_ntoa in -ldnet" >&5
1617 > echo "configure:1618: checking for dnet_ntoa in -ldnet" >&5
1618   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1619   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1620    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1525 | Line 1622 | else
1622    ac_save_LIBS="$LIBS"
1623   LIBS="-ldnet  $LIBS"
1624   cat > conftest.$ac_ext <<EOF
1625 < #line 1529 "configure"
1625 > #line 1626 "configure"
1626   #include "confdefs.h"
1627   /* Override any gcc2 internal prototype to avoid an error.  */
1628   /* We use char because int might match the return type of a gcc2
# Line 1536 | Line 1633 | int main() {
1633   dnet_ntoa()
1634   ; return 0; }
1635   EOF
1636 < if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1636 > if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1637    rm -rf conftest*
1638    eval "ac_cv_lib_$ac_lib_var=yes"
1639   else
# Line 1558 | Line 1655 | fi
1655  
1656      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1657        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1658 < echo "configure:1562: checking for dnet_ntoa in -ldnet_stub" >&5
1658 > echo "configure:1659: checking for dnet_ntoa in -ldnet_stub" >&5
1659   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1660   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1661    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1566 | Line 1663 | else
1663    ac_save_LIBS="$LIBS"
1664   LIBS="-ldnet_stub  $LIBS"
1665   cat > conftest.$ac_ext <<EOF
1666 < #line 1570 "configure"
1666 > #line 1667 "configure"
1667   #include "confdefs.h"
1668   /* Override any gcc2 internal prototype to avoid an error.  */
1669   /* We use char because int might match the return type of a gcc2
# Line 1577 | Line 1674 | int main() {
1674   dnet_ntoa()
1675   ; return 0; }
1676   EOF
1677 < if { (eval echo configure:1581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1677 > if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1678    rm -rf conftest*
1679    eval "ac_cv_lib_$ac_lib_var=yes"
1680   else
# Line 1606 | Line 1703 | fi
1703      # The nsl library prevents programs from opening the X display
1704      # on Irix 5.2, according to dickey@clark.net.
1705      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1706 < echo "configure:1610: checking for gethostbyname" >&5
1706 > echo "configure:1707: checking for gethostbyname" >&5
1707   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1708    echo $ac_n "(cached) $ac_c" 1>&6
1709   else
1710    cat > conftest.$ac_ext <<EOF
1711 < #line 1615 "configure"
1711 > #line 1712 "configure"
1712   #include "confdefs.h"
1713   /* System header to define __stub macros and hopefully few prototypes,
1714      which can conflict with char gethostbyname(); below.  */
# Line 1634 | Line 1731 | gethostbyname();
1731  
1732   ; return 0; }
1733   EOF
1734 < if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1734 > if { (eval echo configure:1735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1735    rm -rf conftest*
1736    eval "ac_cv_func_gethostbyname=yes"
1737   else
# Line 1655 | Line 1752 | fi
1752  
1753      if test $ac_cv_func_gethostbyname = no; then
1754        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1755 < echo "configure:1659: checking for gethostbyname in -lnsl" >&5
1755 > echo "configure:1756: checking for gethostbyname in -lnsl" >&5
1756   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1757   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1758    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1663 | Line 1760 | else
1760    ac_save_LIBS="$LIBS"
1761   LIBS="-lnsl  $LIBS"
1762   cat > conftest.$ac_ext <<EOF
1763 < #line 1667 "configure"
1763 > #line 1764 "configure"
1764   #include "confdefs.h"
1765   /* Override any gcc2 internal prototype to avoid an error.  */
1766   /* We use char because int might match the return type of a gcc2
# Line 1674 | Line 1771 | int main() {
1771   gethostbyname()
1772   ; return 0; }
1773   EOF
1774 < if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1774 > if { (eval echo configure:1775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1775    rm -rf conftest*
1776    eval "ac_cv_lib_$ac_lib_var=yes"
1777   else
# Line 1704 | Line 1801 | fi
1801      # -lsocket must be given before -lnsl if both are needed.
1802      # We assume that if connect needs -lnsl, so does gethostbyname.
1803      echo $ac_n "checking for connect""... $ac_c" 1>&6
1804 < echo "configure:1708: checking for connect" >&5
1804 > echo "configure:1805: checking for connect" >&5
1805   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1806    echo $ac_n "(cached) $ac_c" 1>&6
1807   else
1808    cat > conftest.$ac_ext <<EOF
1809 < #line 1713 "configure"
1809 > #line 1810 "configure"
1810   #include "confdefs.h"
1811   /* System header to define __stub macros and hopefully few prototypes,
1812      which can conflict with char connect(); below.  */
# Line 1732 | Line 1829 | connect();
1829  
1830   ; return 0; }
1831   EOF
1832 < if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1832 > if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1833    rm -rf conftest*
1834    eval "ac_cv_func_connect=yes"
1835   else
# Line 1753 | Line 1850 | fi
1850  
1851      if test $ac_cv_func_connect = no; then
1852        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1853 < echo "configure:1757: checking for connect in -lsocket" >&5
1853 > echo "configure:1854: checking for connect in -lsocket" >&5
1854   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1855   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1856    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1761 | Line 1858 | else
1858    ac_save_LIBS="$LIBS"
1859   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1860   cat > conftest.$ac_ext <<EOF
1861 < #line 1765 "configure"
1861 > #line 1862 "configure"
1862   #include "confdefs.h"
1863   /* Override any gcc2 internal prototype to avoid an error.  */
1864   /* We use char because int might match the return type of a gcc2
# Line 1772 | Line 1869 | int main() {
1869   connect()
1870   ; return 0; }
1871   EOF
1872 < if { (eval echo configure:1776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1872 > if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1873    rm -rf conftest*
1874    eval "ac_cv_lib_$ac_lib_var=yes"
1875   else
# Line 1796 | Line 1893 | fi
1893  
1894      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1895      echo $ac_n "checking for remove""... $ac_c" 1>&6
1896 < echo "configure:1800: checking for remove" >&5
1896 > echo "configure:1897: checking for remove" >&5
1897   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1898    echo $ac_n "(cached) $ac_c" 1>&6
1899   else
1900    cat > conftest.$ac_ext <<EOF
1901 < #line 1805 "configure"
1901 > #line 1902 "configure"
1902   #include "confdefs.h"
1903   /* System header to define __stub macros and hopefully few prototypes,
1904      which can conflict with char remove(); below.  */
# Line 1824 | Line 1921 | remove();
1921  
1922   ; return 0; }
1923   EOF
1924 < if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1924 > if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1925    rm -rf conftest*
1926    eval "ac_cv_func_remove=yes"
1927   else
# Line 1845 | Line 1942 | fi
1942  
1943      if test $ac_cv_func_remove = no; then
1944        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1945 < echo "configure:1849: checking for remove in -lposix" >&5
1945 > echo "configure:1946: checking for remove in -lposix" >&5
1946   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1947   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1948    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1853 | Line 1950 | else
1950    ac_save_LIBS="$LIBS"
1951   LIBS="-lposix  $LIBS"
1952   cat > conftest.$ac_ext <<EOF
1953 < #line 1857 "configure"
1953 > #line 1954 "configure"
1954   #include "confdefs.h"
1955   /* Override any gcc2 internal prototype to avoid an error.  */
1956   /* We use char because int might match the return type of a gcc2
# Line 1864 | Line 1961 | int main() {
1961   remove()
1962   ; return 0; }
1963   EOF
1964 < if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1964 > if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1965    rm -rf conftest*
1966    eval "ac_cv_lib_$ac_lib_var=yes"
1967   else
# Line 1888 | Line 1985 | fi
1985  
1986      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1987      echo $ac_n "checking for shmat""... $ac_c" 1>&6
1988 < echo "configure:1892: checking for shmat" >&5
1988 > echo "configure:1989: checking for shmat" >&5
1989   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
1990    echo $ac_n "(cached) $ac_c" 1>&6
1991   else
1992    cat > conftest.$ac_ext <<EOF
1993 < #line 1897 "configure"
1993 > #line 1994 "configure"
1994   #include "confdefs.h"
1995   /* System header to define __stub macros and hopefully few prototypes,
1996      which can conflict with char shmat(); below.  */
# Line 1916 | Line 2013 | shmat();
2013  
2014   ; return 0; }
2015   EOF
2016 < if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2016 > if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2017    rm -rf conftest*
2018    eval "ac_cv_func_shmat=yes"
2019   else
# Line 1937 | Line 2034 | fi
2034  
2035      if test $ac_cv_func_shmat = no; then
2036        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
2037 < echo "configure:1941: checking for shmat in -lipc" >&5
2037 > echo "configure:2038: checking for shmat in -lipc" >&5
2038   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
2039   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2040    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1945 | Line 2042 | else
2042    ac_save_LIBS="$LIBS"
2043   LIBS="-lipc  $LIBS"
2044   cat > conftest.$ac_ext <<EOF
2045 < #line 1949 "configure"
2045 > #line 2046 "configure"
2046   #include "confdefs.h"
2047   /* Override any gcc2 internal prototype to avoid an error.  */
2048   /* We use char because int might match the return type of a gcc2
# Line 1956 | Line 2053 | int main() {
2053   shmat()
2054   ; return 0; }
2055   EOF
2056 < if { (eval echo configure:1960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2056 > if { (eval echo configure:2057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2057    rm -rf conftest*
2058    eval "ac_cv_lib_$ac_lib_var=yes"
2059   else
# Line 1989 | Line 2086 | fi
2086    # libraries we check for below, so use a different variable.
2087    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
2088    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
2089 < echo "configure:1993: checking for IceConnectionNumber in -lICE" >&5
2089 > echo "configure:2090: checking for IceConnectionNumber in -lICE" >&5
2090   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
2091   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2092    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1997 | Line 2094 | else
2094    ac_save_LIBS="$LIBS"
2095   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
2096   cat > conftest.$ac_ext <<EOF
2097 < #line 2001 "configure"
2097 > #line 2098 "configure"
2098   #include "confdefs.h"
2099   /* Override any gcc2 internal prototype to avoid an error.  */
2100   /* We use char because int might match the return type of a gcc2
# Line 2008 | Line 2105 | int main() {
2105   IceConnectionNumber()
2106   ; return 0; }
2107   EOF
2108 < if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2108 > if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2109    rm -rf conftest*
2110    eval "ac_cv_lib_$ac_lib_var=yes"
2111   else
# Line 2040 | Line 2137 | CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2137   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
2138  
2139   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2140 < echo "configure:2044: checking for pthread_create in -lpthread" >&5
2140 > echo "configure:2141: checking for pthread_create in -lpthread" >&5
2141   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2142   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2143    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2048 | Line 2145 | else
2145    ac_save_LIBS="$LIBS"
2146   LIBS="-lpthread  $LIBS"
2147   cat > conftest.$ac_ext <<EOF
2148 < #line 2052 "configure"
2148 > #line 2149 "configure"
2149   #include "confdefs.h"
2150   /* Override any gcc2 internal prototype to avoid an error.  */
2151   /* We use char because int might match the return type of a gcc2
# Line 2059 | Line 2156 | int main() {
2156   pthread_create()
2157   ; return 0; }
2158   EOF
2159 < if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2159 > if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2160    rm -rf conftest*
2161    eval "ac_cv_lib_$ac_lib_var=yes"
2162   else
# Line 2086 | Line 2183 | else
2183    echo "$ac_t""no" 1>&6
2184  
2185    echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2186 < echo "configure:2090: checking for pthread_create in -lc_r" >&5
2186 > echo "configure:2187: checking for pthread_create in -lc_r" >&5
2187   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2188   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2189    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2094 | Line 2191 | else
2191    ac_save_LIBS="$LIBS"
2192   LIBS="-lc_r  $LIBS"
2193   cat > conftest.$ac_ext <<EOF
2194 < #line 2098 "configure"
2194 > #line 2195 "configure"
2195   #include "confdefs.h"
2196   /* Override any gcc2 internal prototype to avoid an error.  */
2197   /* We use char because int might match the return type of a gcc2
# Line 2105 | Line 2202 | int main() {
2202   pthread_create()
2203   ; return 0; }
2204   EOF
2205 < if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2205 > if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2206    rm -rf conftest*
2207    eval "ac_cv_lib_$ac_lib_var=yes"
2208   else
# Line 2132 | Line 2229 | else
2229    echo "$ac_t""no" 1>&6
2230  
2231      echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2232 < echo "configure:2136: checking for pthread_create in -lPTL" >&5
2232 > echo "configure:2233: checking for pthread_create in -lPTL" >&5
2233   ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2234   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2235    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2140 | Line 2237 | else
2237    ac_save_LIBS="$LIBS"
2238   LIBS="-lPTL  $LIBS"
2239   cat > conftest.$ac_ext <<EOF
2240 < #line 2144 "configure"
2240 > #line 2241 "configure"
2241   #include "confdefs.h"
2242   /* Override any gcc2 internal prototype to avoid an error.  */
2243   /* We use char because int might match the return type of a gcc2
# Line 2151 | Line 2248 | int main() {
2248   pthread_create()
2249   ; return 0; }
2250   EOF
2251 < if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2251 > if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2252    rm -rf conftest*
2253    eval "ac_cv_lib_$ac_lib_var=yes"
2254   else
# Line 2192 | Line 2289 | SEMSRCS=
2289   for ac_func in sem_init
2290   do
2291   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2292 < echo "configure:2196: checking for $ac_func" >&5
2292 > echo "configure:2293: checking for $ac_func" >&5
2293   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2294    echo $ac_n "(cached) $ac_c" 1>&6
2295   else
2296    cat > conftest.$ac_ext <<EOF
2297 < #line 2201 "configure"
2297 > #line 2298 "configure"
2298   #include "confdefs.h"
2299   /* System header to define __stub macros and hopefully few prototypes,
2300      which can conflict with char $ac_func(); below.  */
# Line 2220 | Line 2317 | $ac_func();
2317  
2318   ; return 0; }
2319   EOF
2320 < if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2320 > if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2321    rm -rf conftest*
2322    eval "ac_cv_func_$ac_func=yes"
2323   else
# Line 2249 | Line 2346 | done
2346  
2347   if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2348    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2349 < echo "configure:2253: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2349 > echo "configure:2350: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2350   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2351   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2352    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2257 | Line 2354 | else
2354    ac_save_LIBS="$LIBS"
2355   LIBS="-lXxf86dga  $LIBS"
2356   cat > conftest.$ac_ext <<EOF
2357 < #line 2261 "configure"
2357 > #line 2358 "configure"
2358   #include "confdefs.h"
2359   /* Override any gcc2 internal prototype to avoid an error.  */
2360   /* We use char because int might match the return type of a gcc2
# Line 2268 | Line 2365 | int main() {
2365   XF86DGAQueryExtension()
2366   ; return 0; }
2367   EOF
2368 < if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2368 > if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2369    rm -rf conftest*
2370    eval "ac_cv_lib_$ac_lib_var=yes"
2371   else
# Line 2295 | Line 2392 | else
2392    echo "$ac_t""no" 1>&6
2393  
2394      echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2395 +    WANT_XF86_DGA=no
2396      DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2397    
2398   fi
# Line 2309 | Line 2407 | else
2407   fi
2408  
2409   UISRCS=../dummy/prefs_editor_dummy.cpp
2410 < if [ "x$WANT_UI" = "xyes" ]; then
2410 > if [ "x$WANT_GTK" = "xyes" ]; then
2411    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2412   if test "${with_gtk_prefix+set}" = set; then
2413    withval="$with_gtk_prefix"
# Line 2351 | Line 2449 | fi
2449    # Extract the first word of "gtk-config", so it can be a program name with args.
2450   set dummy gtk-config; ac_word=$2
2451   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2452 < echo "configure:2355: checking for $ac_word" >&5
2452 > echo "configure:2453: checking for $ac_word" >&5
2453   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2454    echo $ac_n "(cached) $ac_c" 1>&6
2455   else
# Line 2386 | Line 2484 | fi
2484  
2485    min_gtk_version=1.2.0
2486    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2487 < echo "configure:2390: checking for GTK - version >= $min_gtk_version" >&5
2487 > echo "configure:2488: checking for GTK - version >= $min_gtk_version" >&5
2488    no_gtk=""
2489    if test "$GTK_CONFIG" = "no" ; then
2490      no_gtk=yes
# Line 2409 | Line 2507 | echo "configure:2390: checking for GTK -
2507    echo $ac_n "cross compiling; assumed OK... $ac_c"
2508   else
2509    cat > conftest.$ac_ext <<EOF
2510 < #line 2413 "configure"
2510 > #line 2511 "configure"
2511   #include "confdefs.h"
2512  
2513   #include <gtk/gtk.h>
# Line 2472 | Line 2570 | main ()
2570   }
2571  
2572   EOF
2573 < if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2573 > if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2574   then
2575    :
2576   else
# Line 2512 | Line 2610 | fi
2610            CFLAGS="$CFLAGS $GTK_CFLAGS"
2611            LIBS="$LIBS $GTK_LIBS"
2612            cat > conftest.$ac_ext <<EOF
2613 < #line 2516 "configure"
2613 > #line 2614 "configure"
2614   #include "confdefs.h"
2615  
2616   #include <gtk/gtk.h>
# Line 2522 | Line 2620 | int main() {
2620   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2621   ; return 0; }
2622   EOF
2623 < if { (eval echo configure:2526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2623 > if { (eval echo configure:2624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2624    rm -rf conftest*
2625     echo "*** The test program compiled, but did not run. This usually means"
2626            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2556 | Line 2654 | rm -f conftest*
2654       GTK_LIBS=""
2655      
2656      echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2657 <    WANT_UI=no
2657 >    WANT_GTK=no
2658 >    DEFINES="$DEFINES -DENABLE_GTK=0"
2659    
2660    fi
2661    
# Line 2607 | Line 2706 | fi
2706    # Extract the first word of "esd-config", so it can be a program name with args.
2707   set dummy esd-config; ac_word=$2
2708   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2709 < echo "configure:2611: checking for $ac_word" >&5
2709 > echo "configure:2710: checking for $ac_word" >&5
2710   if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2711    echo $ac_n "(cached) $ac_c" 1>&6
2712   else
# Line 2642 | Line 2741 | fi
2741  
2742    min_esd_version=0.2.8
2743    echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2744 < echo "configure:2646: checking for ESD - version >= $min_esd_version" >&5
2744 > echo "configure:2745: checking for ESD - version >= $min_esd_version" >&5
2745    no_esd=""
2746    if test "$ESD_CONFIG" = "no" ; then
2747      no_esd=yes
# Line 2666 | Line 2765 | echo "configure:2646: checking for ESD -
2765    echo $ac_n "cross compiling; assumed OK... $ac_c"
2766   else
2767    cat > conftest.$ac_ext <<EOF
2768 < #line 2670 "configure"
2768 > #line 2769 "configure"
2769   #include "confdefs.h"
2770  
2771   #include <stdio.h>
# Line 2724 | Line 2823 | int main ()
2823  
2824  
2825   EOF
2826 < if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2826 > if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2827   then
2828    :
2829   else
# Line 2763 | Line 2862 | fi
2862            CFLAGS="$CFLAGS $ESD_CFLAGS"
2863            LIBS="$LIBS $ESD_LIBS"
2864            cat > conftest.$ac_ext <<EOF
2865 < #line 2767 "configure"
2865 > #line 2866 "configure"
2866   #include "confdefs.h"
2867  
2868   #include <stdio.h>
# Line 2773 | Line 2872 | int main() {
2872   return 0;
2873   ; return 0; }
2874   EOF
2875 < if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2875 > if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2876    rm -rf conftest*
2877     echo "*** The test program compiled, but did not run. This usually means"
2878            echo "*** that the run-time linker is not finding ESD or finding the wrong"
# Line 2803 | Line 2902 | rm -f conftest*
2902      
2903      echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
2904      WANT_ESD=no
2905 +    DEFINES="$DEFINES -DENABLE_ESD=0"
2906    
2907    fi
2908    
# Line 2812 | Line 2912 | rm -f conftest*
2912   fi
2913  
2914   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2915 < echo "configure:2816: checking for ANSI C header files" >&5
2915 > echo "configure:2916: checking for ANSI C header files" >&5
2916   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2917    echo $ac_n "(cached) $ac_c" 1>&6
2918   else
2919    cat > conftest.$ac_ext <<EOF
2920 < #line 2821 "configure"
2920 > #line 2921 "configure"
2921   #include "confdefs.h"
2922   #include <stdlib.h>
2923   #include <stdarg.h>
# Line 2825 | Line 2925 | else
2925   #include <float.h>
2926   EOF
2927   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2928 < { (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2928 > { (eval echo configure:2929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2929   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2930   if test -z "$ac_err"; then
2931    rm -rf conftest*
# Line 2842 | Line 2942 | rm -f conftest*
2942   if test $ac_cv_header_stdc = yes; then
2943    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2944   cat > conftest.$ac_ext <<EOF
2945 < #line 2846 "configure"
2945 > #line 2946 "configure"
2946   #include "confdefs.h"
2947   #include <string.h>
2948   EOF
# Line 2860 | Line 2960 | fi
2960   if test $ac_cv_header_stdc = yes; then
2961    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2962   cat > conftest.$ac_ext <<EOF
2963 < #line 2864 "configure"
2963 > #line 2964 "configure"
2964   #include "confdefs.h"
2965   #include <stdlib.h>
2966   EOF
# Line 2881 | Line 2981 | if test "$cross_compiling" = yes; then
2981    :
2982   else
2983    cat > conftest.$ac_ext <<EOF
2984 < #line 2885 "configure"
2984 > #line 2985 "configure"
2985   #include "confdefs.h"
2986   #include <ctype.h>
2987   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2892 | Line 2992 | if (XOR (islower (i), ISLOWER (i)) || to
2992   exit (0); }
2993  
2994   EOF
2995 < if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2995 > if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2996   then
2997    :
2998   else
# Line 2919 | Line 3019 | for ac_hdr in unistd.h fcntl.h sys/time.
3019   do
3020   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3021   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3022 < echo "configure:2923: checking for $ac_hdr" >&5
3022 > echo "configure:3023: checking for $ac_hdr" >&5
3023   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3024    echo $ac_n "(cached) $ac_c" 1>&6
3025   else
3026    cat > conftest.$ac_ext <<EOF
3027 < #line 2928 "configure"
3027 > #line 3028 "configure"
3028   #include "confdefs.h"
3029   #include <$ac_hdr>
3030   EOF
3031   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3032 < { (eval echo configure:2933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3032 > { (eval echo configure:3033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3033   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3034   if test -z "$ac_err"; then
3035    rm -rf conftest*
# Line 2957 | Line 3057 | done
3057  
3058  
3059   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
3060 < echo "configure:2961: checking whether byte ordering is bigendian" >&5
3060 > echo "configure:3061: checking whether byte ordering is bigendian" >&5
3061   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
3062    echo $ac_n "(cached) $ac_c" 1>&6
3063   else
3064    ac_cv_c_bigendian=unknown
3065   # See if sys/param.h defines the BYTE_ORDER macro.
3066   cat > conftest.$ac_ext <<EOF
3067 < #line 2968 "configure"
3067 > #line 3068 "configure"
3068   #include "confdefs.h"
3069   #include <sys/types.h>
3070   #include <sys/param.h>
# Line 2975 | Line 3075 | int main() {
3075   #endif
3076   ; return 0; }
3077   EOF
3078 < if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3078 > if { (eval echo configure:3079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3079    rm -rf conftest*
3080    # It does; now see whether it defined to BIG_ENDIAN or not.
3081   cat > conftest.$ac_ext <<EOF
3082 < #line 2983 "configure"
3082 > #line 3083 "configure"
3083   #include "confdefs.h"
3084   #include <sys/types.h>
3085   #include <sys/param.h>
# Line 2990 | Line 3090 | int main() {
3090   #endif
3091   ; return 0; }
3092   EOF
3093 < if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3093 > if { (eval echo configure:3094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3094    rm -rf conftest*
3095    ac_cv_c_bigendian=yes
3096   else
# Line 3010 | Line 3110 | if test "$cross_compiling" = yes; then
3110      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3111   else
3112    cat > conftest.$ac_ext <<EOF
3113 < #line 3014 "configure"
3113 > #line 3114 "configure"
3114   #include "confdefs.h"
3115   main () {
3116    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 3023 | Line 3123 | main () {
3123    exit (u.c[sizeof (long) - 1] == 1);
3124   }
3125   EOF
3126 < if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3126 > if { (eval echo configure:3127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3127   then
3128    ac_cv_c_bigendian=no
3129   else
# Line 3047 | Line 3147 | EOF
3147   fi
3148  
3149   echo $ac_n "checking for working const""... $ac_c" 1>&6
3150 < echo "configure:3051: checking for working const" >&5
3150 > echo "configure:3151: checking for working const" >&5
3151   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3152    echo $ac_n "(cached) $ac_c" 1>&6
3153   else
3154    cat > conftest.$ac_ext <<EOF
3155 < #line 3056 "configure"
3155 > #line 3156 "configure"
3156   #include "confdefs.h"
3157  
3158   int main() {
# Line 3101 | Line 3201 | ccp = (char const *const *) p;
3201  
3202   ; return 0; }
3203   EOF
3204 < if { (eval echo configure:3105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3204 > if { (eval echo configure:3205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3205    rm -rf conftest*
3206    ac_cv_c_const=yes
3207   else
# Line 3122 | Line 3222 | EOF
3222   fi
3223  
3224   echo $ac_n "checking for inline""... $ac_c" 1>&6
3225 < echo "configure:3126: checking for inline" >&5
3225 > echo "configure:3226: checking for inline" >&5
3226   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3227    echo $ac_n "(cached) $ac_c" 1>&6
3228   else
3229    ac_cv_c_inline=no
3230   for ac_kw in inline __inline__ __inline; do
3231    cat > conftest.$ac_ext <<EOF
3232 < #line 3133 "configure"
3232 > #line 3233 "configure"
3233   #include "confdefs.h"
3234  
3235   int main() {
3236   } $ac_kw foo() {
3237   ; return 0; }
3238   EOF
3239 < if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3239 > if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3240    rm -rf conftest*
3241    ac_cv_c_inline=$ac_kw; break
3242   else
# Line 3162 | Line 3262 | EOF
3262   esac
3263  
3264   echo $ac_n "checking size of short""... $ac_c" 1>&6
3265 < echo "configure:3166: checking size of short" >&5
3265 > echo "configure:3266: checking size of short" >&5
3266   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3267    echo $ac_n "(cached) $ac_c" 1>&6
3268   else
# Line 3170 | Line 3270 | else
3270    ac_cv_sizeof_short=2
3271   else
3272    cat > conftest.$ac_ext <<EOF
3273 < #line 3174 "configure"
3273 > #line 3274 "configure"
3274   #include "confdefs.h"
3275   #include <stdio.h>
3276   main()
# Line 3181 | Line 3281 | main()
3281    exit(0);
3282   }
3283   EOF
3284 < if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3284 > if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3285   then
3286    ac_cv_sizeof_short=`cat conftestval`
3287   else
# Line 3201 | Line 3301 | EOF
3301  
3302  
3303   echo $ac_n "checking size of int""... $ac_c" 1>&6
3304 < echo "configure:3205: checking size of int" >&5
3304 > echo "configure:3305: checking size of int" >&5
3305   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3306    echo $ac_n "(cached) $ac_c" 1>&6
3307   else
# Line 3209 | Line 3309 | else
3309    ac_cv_sizeof_int=4
3310   else
3311    cat > conftest.$ac_ext <<EOF
3312 < #line 3213 "configure"
3312 > #line 3313 "configure"
3313   #include "confdefs.h"
3314   #include <stdio.h>
3315   main()
# Line 3220 | Line 3320 | main()
3320    exit(0);
3321   }
3322   EOF
3323 < if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3323 > if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3324   then
3325    ac_cv_sizeof_int=`cat conftestval`
3326   else
# Line 3240 | Line 3340 | EOF
3340  
3341  
3342   echo $ac_n "checking size of long""... $ac_c" 1>&6
3343 < echo "configure:3244: checking size of long" >&5
3343 > echo "configure:3344: checking size of long" >&5
3344   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3345    echo $ac_n "(cached) $ac_c" 1>&6
3346   else
# Line 3248 | Line 3348 | else
3348    ac_cv_sizeof_long=4
3349   else
3350    cat > conftest.$ac_ext <<EOF
3351 < #line 3252 "configure"
3351 > #line 3352 "configure"
3352   #include "confdefs.h"
3353   #include <stdio.h>
3354   main()
# Line 3259 | Line 3359 | main()
3359    exit(0);
3360   }
3361   EOF
3362 < if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3362 > if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3363   then
3364    ac_cv_sizeof_long=`cat conftestval`
3365   else
# Line 3279 | Line 3379 | EOF
3379  
3380  
3381   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3382 < echo "configure:3283: checking size of long long" >&5
3382 > echo "configure:3383: checking size of long long" >&5
3383   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3384    echo $ac_n "(cached) $ac_c" 1>&6
3385   else
# Line 3287 | Line 3387 | else
3387    ac_cv_sizeof_long_long=8
3388   else
3389    cat > conftest.$ac_ext <<EOF
3390 < #line 3291 "configure"
3390 > #line 3391 "configure"
3391   #include "confdefs.h"
3392   #include <stdio.h>
3393   main()
# Line 3298 | Line 3398 | main()
3398    exit(0);
3399   }
3400   EOF
3401 < if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3401 > if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3402   then
3403    ac_cv_sizeof_long_long=`cat conftestval`
3404   else
# Line 3318 | Line 3418 | EOF
3418  
3419  
3420   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3421 < echo "configure:3322: checking for off_t" >&5
3421 > echo "configure:3422: checking for off_t" >&5
3422   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3423    echo $ac_n "(cached) $ac_c" 1>&6
3424   else
3425    cat > conftest.$ac_ext <<EOF
3426 < #line 3327 "configure"
3426 > #line 3427 "configure"
3427   #include "confdefs.h"
3428   #include <sys/types.h>
3429   #if STDC_HEADERS
# Line 3351 | Line 3451 | EOF
3451   fi
3452  
3453   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3454 < echo "configure:3355: checking for loff_t" >&5
3454 > echo "configure:3455: checking for loff_t" >&5
3455   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3456    echo $ac_n "(cached) $ac_c" 1>&6
3457   else
3458    cat > conftest.$ac_ext <<EOF
3459 < #line 3360 "configure"
3459 > #line 3460 "configure"
3460   #include "confdefs.h"
3461   #include <sys/types.h>
3462   #if STDC_HEADERS
# Line 3384 | Line 3484 | EOF
3484   fi
3485  
3486   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3487 < echo "configure:3388: checking for size_t" >&5
3487 > echo "configure:3488: checking for size_t" >&5
3488   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3489    echo $ac_n "(cached) $ac_c" 1>&6
3490   else
3491    cat > conftest.$ac_ext <<EOF
3492 < #line 3393 "configure"
3492 > #line 3493 "configure"
3493   #include "confdefs.h"
3494   #include <sys/types.h>
3495   #if STDC_HEADERS
# Line 3417 | Line 3517 | EOF
3517   fi
3518  
3519   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3520 < echo "configure:3421: checking whether time.h and sys/time.h may both be included" >&5
3520 > echo "configure:3521: checking whether time.h and sys/time.h may both be included" >&5
3521   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3522    echo $ac_n "(cached) $ac_c" 1>&6
3523   else
3524    cat > conftest.$ac_ext <<EOF
3525 < #line 3426 "configure"
3525 > #line 3526 "configure"
3526   #include "confdefs.h"
3527   #include <sys/types.h>
3528   #include <sys/time.h>
# Line 3431 | Line 3531 | int main() {
3531   struct tm *tp;
3532   ; return 0; }
3533   EOF
3534 < if { (eval echo configure:3435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3534 > if { (eval echo configure:3535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3535    rm -rf conftest*
3536    ac_cv_header_time=yes
3537   else
# Line 3452 | Line 3552 | EOF
3552   fi
3553  
3554   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3555 < echo "configure:3456: checking whether struct tm is in sys/time.h or time.h" >&5
3555 > echo "configure:3556: checking whether struct tm is in sys/time.h or time.h" >&5
3556   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3557    echo $ac_n "(cached) $ac_c" 1>&6
3558   else
3559    cat > conftest.$ac_ext <<EOF
3560 < #line 3461 "configure"
3560 > #line 3561 "configure"
3561   #include "confdefs.h"
3562   #include <sys/types.h>
3563   #include <time.h>
# Line 3465 | Line 3565 | int main() {
3565   struct tm *tp; tp->tm_sec;
3566   ; return 0; }
3567   EOF
3568 < if { (eval echo configure:3469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3568 > if { (eval echo configure:3569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3569    rm -rf conftest*
3570    ac_cv_struct_tm=time.h
3571   else
# Line 3489 | Line 3589 | fi
3589   for ac_func in strdup cfmakeraw
3590   do
3591   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3592 < echo "configure:3493: checking for $ac_func" >&5
3592 > echo "configure:3593: checking for $ac_func" >&5
3593   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3594    echo $ac_n "(cached) $ac_c" 1>&6
3595   else
3596    cat > conftest.$ac_ext <<EOF
3597 < #line 3498 "configure"
3597 > #line 3598 "configure"
3598   #include "confdefs.h"
3599   /* System header to define __stub macros and hopefully few prototypes,
3600      which can conflict with char $ac_func(); below.  */
# Line 3517 | Line 3617 | $ac_func();
3617  
3618   ; return 0; }
3619   EOF
3620 < if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3620 > if { (eval echo configure:3621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3621    rm -rf conftest*
3622    eval "ac_cv_func_$ac_func=yes"
3623   else
# Line 3544 | Line 3644 | done
3644   for ac_func in nanosleep clock_gettime timer_create
3645   do
3646   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3647 < echo "configure:3548: checking for $ac_func" >&5
3647 > echo "configure:3648: checking for $ac_func" >&5
3648   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3649    echo $ac_n "(cached) $ac_c" 1>&6
3650   else
3651    cat > conftest.$ac_ext <<EOF
3652 < #line 3553 "configure"
3652 > #line 3653 "configure"
3653   #include "confdefs.h"
3654   /* System header to define __stub macros and hopefully few prototypes,
3655      which can conflict with char $ac_func(); below.  */
# Line 3572 | Line 3672 | $ac_func();
3672  
3673   ; return 0; }
3674   EOF
3675 < if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3675 > if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3676    rm -rf conftest*
3677    eval "ac_cv_func_$ac_func=yes"
3678   else
# Line 3599 | Line 3699 | done
3699   for ac_func in pthread_cancel
3700   do
3701   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3702 < echo "configure:3603: checking for $ac_func" >&5
3702 > echo "configure:3703: checking for $ac_func" >&5
3703   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3704    echo $ac_n "(cached) $ac_c" 1>&6
3705   else
3706    cat > conftest.$ac_ext <<EOF
3707 < #line 3608 "configure"
3707 > #line 3708 "configure"
3708   #include "confdefs.h"
3709   /* System header to define __stub macros and hopefully few prototypes,
3710      which can conflict with char $ac_func(); below.  */
# Line 3627 | Line 3727 | $ac_func();
3727  
3728   ; return 0; }
3729   EOF
3730 < if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3730 > if { (eval echo configure:3731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3731    rm -rf conftest*
3732    eval "ac_cv_func_$ac_func=yes"
3733   else
# Line 3660 | Line 3760 | if MACHINE=`uname -a 2>/dev/null`; then
3760      ;;
3761    FreeBSD*3.*)
3762          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3763 < echo "configure:3664: checking for cam_open_btl in -lcam" >&5
3763 > echo "configure:3764: checking for cam_open_btl in -lcam" >&5
3764   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3765   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3766    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3668 | Line 3768 | else
3768    ac_save_LIBS="$LIBS"
3769   LIBS="-lcam  $LIBS"
3770   cat > conftest.$ac_ext <<EOF
3771 < #line 3672 "configure"
3771 > #line 3772 "configure"
3772   #include "confdefs.h"
3773   /* Override any gcc2 internal prototype to avoid an error.  */
3774   /* We use char because int might match the return type of a gcc2
# Line 3679 | Line 3779 | int main() {
3779   cam_open_btl()
3780   ; return 0; }
3781   EOF
3782 < if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3782 > if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3783    rm -rf conftest*
3784    eval "ac_cv_lib_$ac_lib_var=yes"
3785   else
# Line 3705 | Line 3805 | fi
3805      else
3806              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3807   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3808 < echo "configure:3709: checking for /sys/cam/cam.h" >&5
3808 > echo "configure:3809: checking for /sys/cam/cam.h" >&5
3809   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3810    echo $ac_n "(cached) $ac_c" 1>&6
3811   else
3812    cat > conftest.$ac_ext <<EOF
3813 < #line 3714 "configure"
3813 > #line 3814 "configure"
3814   #include "confdefs.h"
3815   #include </sys/cam/cam.h>
3816   EOF
3817   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3818 < { (eval echo configure:3719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3818 > { (eval echo configure:3819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3819   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3820   if test -z "$ac_err"; then
3821    rm -rf conftest*
# Line 3748 | Line 3848 | fi
3848      ;;
3849    FreeBSD*)
3850          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3851 < echo "configure:3752: checking for scsi_open in -lscsi" >&5
3851 > echo "configure:3852: checking for scsi_open in -lscsi" >&5
3852   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3853   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3854    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3756 | Line 3856 | else
3856    ac_save_LIBS="$LIBS"
3857   LIBS="-lscsi  $LIBS"
3858   cat > conftest.$ac_ext <<EOF
3859 < #line 3760 "configure"
3859 > #line 3860 "configure"
3860   #include "confdefs.h"
3861   /* Override any gcc2 internal prototype to avoid an error.  */
3862   /* We use char because int might match the return type of a gcc2
# Line 3767 | Line 3867 | int main() {
3867   scsi_open()
3868   ; return 0; }
3869   EOF
3870 < if { (eval echo configure:3771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3870 > if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3871    rm -rf conftest*
3872    eval "ac_cv_lib_$ac_lib_var=yes"
3873   else
# Line 3793 | Line 3893 | fi
3893      else
3894              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3895   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3896 < echo "configure:3797: checking for scsi.h sys/scsiio.h" >&5
3896 > echo "configure:3897: checking for scsi.h sys/scsiio.h" >&5
3897   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3898    echo $ac_n "(cached) $ac_c" 1>&6
3899   else
3900    cat > conftest.$ac_ext <<EOF
3901 < #line 3802 "configure"
3901 > #line 3902 "configure"
3902   #include "confdefs.h"
3903   #include <scsi.h sys/scsiio.h>
3904   EOF
3905   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3906 < { (eval echo configure:3807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3906 > { (eval echo configure:3907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3907   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3908   if test -z "$ac_err"; then
3909    rm -rf conftest*
# Line 3847 | Line 3947 | SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONS
3947  
3948   HAVE_I386=no
3949   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
3950 < echo "configure:3851: checking for x86 target CPU" >&5
3950 > echo "configure:3951: checking for x86 target CPU" >&5
3951   cat > conftest.$ac_ext <<EOF
3952 < #line 3853 "configure"
3952 > #line 3953 "configure"
3953   #include "confdefs.h"
3954  
3955   #ifdef __i386__
# Line 3870 | Line 3970 | rm -f conftest*
3970  
3971   HAVE_SPARC=no
3972   echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
3973 < echo "configure:3874: checking for SPARC target CPU" >&5
3973 > echo "configure:3974: checking for SPARC target CPU" >&5
3974   cat > conftest.$ac_ext <<EOF
3975 < #line 3876 "configure"
3975 > #line 3976 "configure"
3976   #include "confdefs.h"
3977  
3978   #ifdef __sparc__
# Line 3893 | Line 3993 | rm -f conftest*
3993  
3994   HAVE_GAS=no
3995   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
3996 < echo "configure:3897: checking for GAS .p2align feature" >&5
3996 > echo "configure:3997: checking for GAS .p2align feature" >&5
3997   cat >conftest.S << EOF
3998          .text
3999          .p2align 5
# Line 3903 | Line 4003 | echo "$ac_t""$HAVE_GAS" 1>&6
4003  
4004   HAVE_GCC27=no
4005   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
4006 < echo "configure:3907: checking for GCC 2.7 or higher" >&5
4006 > echo "configure:4007: checking for GCC 2.7 or higher" >&5
4007   cat > conftest.$ac_ext <<EOF
4008 < #line 3909 "configure"
4008 > #line 4009 "configure"
4009   #include "confdefs.h"
4010   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
4011    yes
# Line 3937 | Line 4037 | if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_
4037    if [ "x$HAVE_GAS" = "xyes" ]; then
4038      WANT_X86_ASSEMBLY=yes
4039      DEFINES="$DEFINES -DX86_ASSEMBLY"
4040 <    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4040 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4041    fi
4042   elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
4043      case "$MACHINE" in
4044    SunOS*)
4045      echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
4046 < echo "configure:3947: checking SPARC CPU architecture" >&5
4046 > echo "configure:4047: checking SPARC CPU architecture" >&5
4047      SPARC_TYPE=`Solaris/which_sparc`
4048      echo "$ac_t""$SPARC_TYPE" 1>&6
4049      case "$SPARC_TYPE" in
# Line 4351 | Line 4451 | echo
4451   echo XFree86 DGA support .............. : $WANT_XF86_DGA
4452   echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4453   echo ESD sound support ................ : $WANT_ESD
4454 < echo GTK user interface ............... : $WANT_UI
4454 > echo GTK user interface ............... : $WANT_GTK
4455   echo mon debugger support ............. : $WANT_MON
4456   echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4457   echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines