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.8 by cebix, 1999-10-21T15:14:34Z vs.
Revision 1.17 by cebix, 2000-04-14T18:45:56Z

# Line 12 | Line 12 | ac_help=
12   ac_default_prefix=/usr/local
13   # Any additions from configure.in:
14   ac_help="$ac_help
15 <  --enable-xf86-dga       use the XFree86 DGA extension (default)"
15 >  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]"
16   ac_help="$ac_help
17 <  --enable-fbdev-dga      use direct frame buffer access via /dev/fb (default)"
17 >  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]"
18   ac_help="$ac_help
19 <  --enable-ui             use GTK user interface (default)"
19 >  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]"
20 > ac_help="$ac_help
21 >  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]"
22 > ac_help="$ac_help
23 >  --with-gtk              use GTK user interface [default=yes]"
24 > ac_help="$ac_help
25 >  --with-mon              use mon as debugger [default=yes]"
26   ac_help="$ac_help
27    --with-x                use the X Window System"
28   ac_help="$ac_help
# Line 25 | Line 31 | ac_help="$ac_help
31    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
32   ac_help="$ac_help
33    --disable-gtktest       Do not try to compile and run a test GTK program"
34 + ac_help="$ac_help
35 +  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)"
36 + ac_help="$ac_help
37 +  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
38 + ac_help="$ac_help
39 +  --disable-esdtest       Do not try to compile and run a test ESD program"
40  
41   # Initialize some variables set by options.
42   # The variables have the same names as the options, with
# Line 538 | Line 550 | fi
550  
551  
552  
541 – WANT_XF86_DGA=yes
542 – WANT_FBDEV_DGA=yes
543 – WANT_UI=yes
553   # Check whether --enable-xf86-dga or --disable-xf86-dga was given.
554   if test "${enable_xf86_dga+set}" = set; then
555    enableval="$enable_xf86_dga"
556    WANT_XF86_DGA=$enableval
557 + else
558 +  WANT_XF86_DGA=yes
559 + fi
560 +
561 + # Check whether --enable-xf86-vidmode or --disable-xf86-vidmode was given.
562 + if test "${enable_xf86_vidmode+set}" = set; then
563 +  enableval="$enable_xf86_vidmode"
564 +  WANT_XF86_VIDMODE=$enableval
565 + else
566 +  WANT_XF86_VIDMODE=yes
567   fi
568  
569   # Check whether --enable-fbdev-dga or --disable-fbdev-dga was given.
570   if test "${enable_fbdev_dga+set}" = set; then
571    enableval="$enable_fbdev_dga"
572    WANT_FBDEV_DGA=$enableval
573 + else
574 +  WANT_FBDEV_DGA=yes
575   fi
576  
577 < # Check whether --enable-ui or --disable-ui was given.
578 < if test "${enable_ui+set}" = set; then
579 <  enableval="$enable_ui"
580 <  WANT_UI=$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 --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_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:567: 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 593 | 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:597: 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 644 | 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:648: 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 676 | 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:680: 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 687 | Line 726 | cross_compiling=$ac_cv_prog_cc_cross
726  
727   cat > conftest.$ac_ext << EOF
728  
729 < #line 691 "configure"
729 > #line 730 "configure"
730   #include "confdefs.h"
731  
732   main(){return(0);}
733   EOF
734 < if { (eval echo configure:696: \"$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 718 | 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:722: 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:727: 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 732 | Line 771 | else
771    yes;
772   #endif
773   EOF
774 < if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:736: \"$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 751 | 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:755: 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 783 | Line 822 | else
822   fi
823  
824   echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
825 < echo "configure:787: 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 798 | 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 802 "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:808: \"$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 815 | Line 854 | else
854    rm -rf conftest*
855    CPP="${CC-cc} -E -traditional-cpp"
856    cat > conftest.$ac_ext <<EOF
857 < #line 819 "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:825: \"$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 832 | Line 871 | else
871    rm -rf conftest*
872    CPP="${CC-cc} -nologo -E"
873    cat > conftest.$ac_ext <<EOF
874 < #line 836 "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:842: \"$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 867 | 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:871: 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 899 | 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:903: 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 910 | Line 949 | cross_compiling=$ac_cv_prog_cxx_cross
949  
950   cat > conftest.$ac_ext << EOF
951  
952 < #line 914 "configure"
952 > #line 953 "configure"
953   #include "confdefs.h"
954  
955   int main(){return(0);}
956   EOF
957 < if { (eval echo configure:919: \"$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 941 | 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:945: 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:950: 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 955 | Line 994 | else
994    yes;
995   #endif
996   EOF
997 < if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:959: \"$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 974 | 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:978: 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 1006 | Line 1045 | else
1045   fi
1046  
1047   echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
1048 < echo "configure:1010: 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 1063 | 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:1067: 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 1116 | Line 1155 | test -z "$INSTALL_SCRIPT" && INSTALL_SCR
1155   test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1156  
1157  
1158 + MONSRCS=
1159 + if [ "x$WANT_MON" = "xyes" ]; then
1160 +  echo $ac_n "checking for mon""... $ac_c" 1>&6
1161 + echo "configure:1162: checking for mon" >&5
1162 +  if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
1163 +    echo "$ac_t""yes" 1>&6
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 +    echo "configure: warning: Could not find mon, ignoring --with-mon." 1>&2
1257 +    WANT_MON=no
1258 +    DEFINES="$DEFINES -DENABLE_MON=0"
1259 +  fi
1260 + fi
1261 +
1262 + echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
1263 + echo "configure:1264: checking for sem_init in -lposix4" >&5
1264 + ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
1265 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1266 +  echo $ac_n "(cached) $ac_c" 1>&6
1267 + else
1268 +  ac_save_LIBS="$LIBS"
1269 + LIBS="-lposix4  $LIBS"
1270 + cat > conftest.$ac_ext <<EOF
1271 + #line 1272 "configure"
1272 + #include "confdefs.h"
1273 + /* Override any gcc2 internal prototype to avoid an error.  */
1274 + /* We use char because int might match the return type of a gcc2
1275 +    builtin and then its argument prototype would still apply.  */
1276 + char sem_init();
1277 +
1278 + int main() {
1279 + sem_init()
1280 + ; return 0; }
1281 + EOF
1282 + if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1283 +  rm -rf conftest*
1284 +  eval "ac_cv_lib_$ac_lib_var=yes"
1285 + else
1286 +  echo "configure: failed program was:" >&5
1287 +  cat conftest.$ac_ext >&5
1288 +  rm -rf conftest*
1289 +  eval "ac_cv_lib_$ac_lib_var=no"
1290 + fi
1291 + rm -f conftest*
1292 + LIBS="$ac_save_LIBS"
1293 +
1294 + fi
1295 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1296 +  echo "$ac_t""yes" 1>&6
1297 +    ac_tr_lib=HAVE_LIB`echo posix4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
1298 +    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
1299 +  cat >> confdefs.h <<EOF
1300 + #define $ac_tr_lib 1
1301 + EOF
1302 +
1303 +  LIBS="-lposix4 $LIBS"
1304 +
1305 + else
1306 +  echo "$ac_t""no" 1>&6
1307 + fi
1308 +
1309 +
1310   # If we find X, set shell vars x_includes and x_libraries to the
1311   # paths, otherwise set no_x=yes.
1312   # Uses ac_ vars as temps to allow command line to override cache and checks.
1313   # --without-x overrides everything else, but does not touch the cache.
1314   echo $ac_n "checking for X""... $ac_c" 1>&6
1315 < echo "configure:1125: checking for X" >&5
1315 > echo "configure:1316: checking for X" >&5
1316  
1317   # Check whether --with-x or --without-x was given.
1318   if test "${with_x+set}" = set; then
# Line 1183 | Line 1374 | if test "$ac_x_includes" = NO; then
1374  
1375    # First, try using that file with no special directory specified.
1376   cat > conftest.$ac_ext <<EOF
1377 < #line 1187 "configure"
1377 > #line 1378 "configure"
1378   #include "confdefs.h"
1379   #include <$x_direct_test_include>
1380   EOF
1381   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1382 < { (eval echo configure:1192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1382 > { (eval echo configure:1383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1383   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1384   if test -z "$ac_err"; then
1385    rm -rf conftest*
# Line 1257 | Line 1448 | if test "$ac_x_libraries" = NO; then
1448    ac_save_LIBS="$LIBS"
1449    LIBS="-l$x_direct_test_library $LIBS"
1450   cat > conftest.$ac_ext <<EOF
1451 < #line 1261 "configure"
1451 > #line 1452 "configure"
1452   #include "confdefs.h"
1453  
1454   int main() {
1455   ${x_direct_test_function}()
1456   ; return 0; }
1457   EOF
1458 < if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1458 > if { (eval echo configure:1459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1459    rm -rf conftest*
1460    LIBS="$ac_save_LIBS"
1461   # We can link X programs with no special library path.
# Line 1370 | Line 1561 | else
1561      case "`(uname -sr) 2>/dev/null`" in
1562      "SunOS 5"*)
1563        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
1564 < echo "configure:1374: checking whether -R must be followed by a space" >&5
1564 > echo "configure:1565: checking whether -R must be followed by a space" >&5
1565        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
1566        cat > conftest.$ac_ext <<EOF
1567 < #line 1377 "configure"
1567 > #line 1568 "configure"
1568   #include "confdefs.h"
1569  
1570   int main() {
1571  
1572   ; return 0; }
1573   EOF
1574 < if { (eval echo configure:1384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1574 > if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1575    rm -rf conftest*
1576    ac_R_nospace=yes
1577   else
# Line 1396 | Line 1587 | rm -f conftest*
1587        else
1588          LIBS="$ac_xsave_LIBS -R $x_libraries"
1589          cat > conftest.$ac_ext <<EOF
1590 < #line 1400 "configure"
1590 > #line 1591 "configure"
1591   #include "confdefs.h"
1592  
1593   int main() {
1594  
1595   ; return 0; }
1596   EOF
1597 < if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1597 > if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1598    rm -rf conftest*
1599    ac_R_space=yes
1600   else
# Line 1435 | Line 1626 | rm -f conftest*
1626      # libraries were built with DECnet support.  And karl@cs.umb.edu says
1627      # the Alpha needs dnet_stub (dnet does not exist).
1628      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
1629 < echo "configure:1439: checking for dnet_ntoa in -ldnet" >&5
1629 > echo "configure:1630: checking for dnet_ntoa in -ldnet" >&5
1630   ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1631   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1632    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1443 | Line 1634 | else
1634    ac_save_LIBS="$LIBS"
1635   LIBS="-ldnet  $LIBS"
1636   cat > conftest.$ac_ext <<EOF
1637 < #line 1447 "configure"
1637 > #line 1638 "configure"
1638   #include "confdefs.h"
1639   /* Override any gcc2 internal prototype to avoid an error.  */
1640   /* We use char because int might match the return type of a gcc2
# Line 1454 | Line 1645 | int main() {
1645   dnet_ntoa()
1646   ; return 0; }
1647   EOF
1648 < if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1648 > if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1649    rm -rf conftest*
1650    eval "ac_cv_lib_$ac_lib_var=yes"
1651   else
# Line 1476 | Line 1667 | fi
1667  
1668      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1669        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
1670 < echo "configure:1480: checking for dnet_ntoa in -ldnet_stub" >&5
1670 > echo "configure:1671: checking for dnet_ntoa in -ldnet_stub" >&5
1671   ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
1672   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1673    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1484 | Line 1675 | else
1675    ac_save_LIBS="$LIBS"
1676   LIBS="-ldnet_stub  $LIBS"
1677   cat > conftest.$ac_ext <<EOF
1678 < #line 1488 "configure"
1678 > #line 1679 "configure"
1679   #include "confdefs.h"
1680   /* Override any gcc2 internal prototype to avoid an error.  */
1681   /* We use char because int might match the return type of a gcc2
# Line 1495 | Line 1686 | int main() {
1686   dnet_ntoa()
1687   ; return 0; }
1688   EOF
1689 < if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1689 > if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1690    rm -rf conftest*
1691    eval "ac_cv_lib_$ac_lib_var=yes"
1692   else
# Line 1524 | Line 1715 | fi
1715      # The nsl library prevents programs from opening the X display
1716      # on Irix 5.2, according to dickey@clark.net.
1717      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
1718 < echo "configure:1528: checking for gethostbyname" >&5
1718 > echo "configure:1719: checking for gethostbyname" >&5
1719   if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
1720    echo $ac_n "(cached) $ac_c" 1>&6
1721   else
1722    cat > conftest.$ac_ext <<EOF
1723 < #line 1533 "configure"
1723 > #line 1724 "configure"
1724   #include "confdefs.h"
1725   /* System header to define __stub macros and hopefully few prototypes,
1726      which can conflict with char gethostbyname(); below.  */
# Line 1552 | Line 1743 | gethostbyname();
1743  
1744   ; return 0; }
1745   EOF
1746 < if { (eval echo configure:1556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1746 > if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1747    rm -rf conftest*
1748    eval "ac_cv_func_gethostbyname=yes"
1749   else
# Line 1573 | Line 1764 | fi
1764  
1765      if test $ac_cv_func_gethostbyname = no; then
1766        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
1767 < echo "configure:1577: checking for gethostbyname in -lnsl" >&5
1767 > echo "configure:1768: checking for gethostbyname in -lnsl" >&5
1768   ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
1769   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1770    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1581 | Line 1772 | else
1772    ac_save_LIBS="$LIBS"
1773   LIBS="-lnsl  $LIBS"
1774   cat > conftest.$ac_ext <<EOF
1775 < #line 1585 "configure"
1775 > #line 1776 "configure"
1776   #include "confdefs.h"
1777   /* Override any gcc2 internal prototype to avoid an error.  */
1778   /* We use char because int might match the return type of a gcc2
# Line 1592 | Line 1783 | int main() {
1783   gethostbyname()
1784   ; return 0; }
1785   EOF
1786 < if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1786 > if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1787    rm -rf conftest*
1788    eval "ac_cv_lib_$ac_lib_var=yes"
1789   else
# Line 1622 | Line 1813 | fi
1813      # -lsocket must be given before -lnsl if both are needed.
1814      # We assume that if connect needs -lnsl, so does gethostbyname.
1815      echo $ac_n "checking for connect""... $ac_c" 1>&6
1816 < echo "configure:1626: checking for connect" >&5
1816 > echo "configure:1817: checking for connect" >&5
1817   if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
1818    echo $ac_n "(cached) $ac_c" 1>&6
1819   else
1820    cat > conftest.$ac_ext <<EOF
1821 < #line 1631 "configure"
1821 > #line 1822 "configure"
1822   #include "confdefs.h"
1823   /* System header to define __stub macros and hopefully few prototypes,
1824      which can conflict with char connect(); below.  */
# Line 1650 | Line 1841 | connect();
1841  
1842   ; return 0; }
1843   EOF
1844 < if { (eval echo configure:1654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1844 > if { (eval echo configure:1845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1845    rm -rf conftest*
1846    eval "ac_cv_func_connect=yes"
1847   else
# Line 1671 | Line 1862 | fi
1862  
1863      if test $ac_cv_func_connect = no; then
1864        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
1865 < echo "configure:1675: checking for connect in -lsocket" >&5
1865 > echo "configure:1866: checking for connect in -lsocket" >&5
1866   ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
1867   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1868    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1679 | Line 1870 | else
1870    ac_save_LIBS="$LIBS"
1871   LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1872   cat > conftest.$ac_ext <<EOF
1873 < #line 1683 "configure"
1873 > #line 1874 "configure"
1874   #include "confdefs.h"
1875   /* Override any gcc2 internal prototype to avoid an error.  */
1876   /* We use char because int might match the return type of a gcc2
# Line 1690 | Line 1881 | int main() {
1881   connect()
1882   ; return 0; }
1883   EOF
1884 < if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1884 > if { (eval echo configure:1885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1885    rm -rf conftest*
1886    eval "ac_cv_lib_$ac_lib_var=yes"
1887   else
# Line 1714 | Line 1905 | fi
1905  
1906      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
1907      echo $ac_n "checking for remove""... $ac_c" 1>&6
1908 < echo "configure:1718: checking for remove" >&5
1908 > echo "configure:1909: checking for remove" >&5
1909   if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
1910    echo $ac_n "(cached) $ac_c" 1>&6
1911   else
1912    cat > conftest.$ac_ext <<EOF
1913 < #line 1723 "configure"
1913 > #line 1914 "configure"
1914   #include "confdefs.h"
1915   /* System header to define __stub macros and hopefully few prototypes,
1916      which can conflict with char remove(); below.  */
# Line 1742 | Line 1933 | remove();
1933  
1934   ; return 0; }
1935   EOF
1936 < if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1936 > if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1937    rm -rf conftest*
1938    eval "ac_cv_func_remove=yes"
1939   else
# Line 1763 | Line 1954 | fi
1954  
1955      if test $ac_cv_func_remove = no; then
1956        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
1957 < echo "configure:1767: checking for remove in -lposix" >&5
1957 > echo "configure:1958: checking for remove in -lposix" >&5
1958   ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
1959   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1960    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1771 | Line 1962 | else
1962    ac_save_LIBS="$LIBS"
1963   LIBS="-lposix  $LIBS"
1964   cat > conftest.$ac_ext <<EOF
1965 < #line 1775 "configure"
1965 > #line 1966 "configure"
1966   #include "confdefs.h"
1967   /* Override any gcc2 internal prototype to avoid an error.  */
1968   /* We use char because int might match the return type of a gcc2
# Line 1782 | Line 1973 | int main() {
1973   remove()
1974   ; return 0; }
1975   EOF
1976 < if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1976 > if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1977    rm -rf conftest*
1978    eval "ac_cv_lib_$ac_lib_var=yes"
1979   else
# Line 1806 | Line 1997 | fi
1997  
1998      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1999      echo $ac_n "checking for shmat""... $ac_c" 1>&6
2000 < echo "configure:1810: checking for shmat" >&5
2000 > echo "configure:2001: checking for shmat" >&5
2001   if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
2002    echo $ac_n "(cached) $ac_c" 1>&6
2003   else
2004    cat > conftest.$ac_ext <<EOF
2005 < #line 1815 "configure"
2005 > #line 2006 "configure"
2006   #include "confdefs.h"
2007   /* System header to define __stub macros and hopefully few prototypes,
2008      which can conflict with char shmat(); below.  */
# Line 1834 | Line 2025 | shmat();
2025  
2026   ; return 0; }
2027   EOF
2028 < if { (eval echo configure:1838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2028 > if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2029    rm -rf conftest*
2030    eval "ac_cv_func_shmat=yes"
2031   else
# Line 1855 | Line 2046 | fi
2046  
2047      if test $ac_cv_func_shmat = no; then
2048        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
2049 < echo "configure:1859: checking for shmat in -lipc" >&5
2049 > echo "configure:2050: checking for shmat in -lipc" >&5
2050   ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
2051   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2052    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1863 | Line 2054 | else
2054    ac_save_LIBS="$LIBS"
2055   LIBS="-lipc  $LIBS"
2056   cat > conftest.$ac_ext <<EOF
2057 < #line 1867 "configure"
2057 > #line 2058 "configure"
2058   #include "confdefs.h"
2059   /* Override any gcc2 internal prototype to avoid an error.  */
2060   /* We use char because int might match the return type of a gcc2
# Line 1874 | Line 2065 | int main() {
2065   shmat()
2066   ; return 0; }
2067   EOF
2068 < if { (eval echo configure:1878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2068 > if { (eval echo configure:2069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2069    rm -rf conftest*
2070    eval "ac_cv_lib_$ac_lib_var=yes"
2071   else
# Line 1907 | Line 2098 | fi
2098    # libraries we check for below, so use a different variable.
2099    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
2100    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
2101 < echo "configure:1911: checking for IceConnectionNumber in -lICE" >&5
2101 > echo "configure:2102: checking for IceConnectionNumber in -lICE" >&5
2102   ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
2103   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2104    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1915 | Line 2106 | else
2106    ac_save_LIBS="$LIBS"
2107   LIBS="-lICE $X_EXTRA_LIBS $LIBS"
2108   cat > conftest.$ac_ext <<EOF
2109 < #line 1919 "configure"
2109 > #line 2110 "configure"
2110   #include "confdefs.h"
2111   /* Override any gcc2 internal prototype to avoid an error.  */
2112   /* We use char because int might match the return type of a gcc2
# Line 1926 | Line 2117 | int main() {
2117   IceConnectionNumber()
2118   ; return 0; }
2119   EOF
2120 < if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2120 > if { (eval echo configure:2121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2121    rm -rf conftest*
2122    eval "ac_cv_lib_$ac_lib_var=yes"
2123   else
# Line 1953 | Line 2144 | fi
2144   if [ "x$no_x" = "xyes" ]; then
2145    { echo "configure: error: You need X11 to run Basilisk II." 1>&2; exit 1; }
2146   fi
1956 –
2147   CFLAGS="$CFLAGS $X_CFLAGS"
2148   CXXFLAGS="$CXXFLAGS $X_CFLAGS"
2149   LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
1960 – STATICLIBS=
2150  
2151   echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2152 < echo "configure:1964: checking for pthread_create in -lpthread" >&5
2152 > echo "configure:2153: checking for pthread_create in -lpthread" >&5
2153   ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2154   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2155    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1968 | Line 2157 | else
2157    ac_save_LIBS="$LIBS"
2158   LIBS="-lpthread  $LIBS"
2159   cat > conftest.$ac_ext <<EOF
2160 < #line 1972 "configure"
2160 > #line 2161 "configure"
2161   #include "confdefs.h"
2162   /* Override any gcc2 internal prototype to avoid an error.  */
2163   /* We use char because int might match the return type of a gcc2
# Line 1979 | Line 2168 | int main() {
2168   pthread_create()
2169   ; return 0; }
2170   EOF
2171 < if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2171 > if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2172    rm -rf conftest*
2173    eval "ac_cv_lib_$ac_lib_var=yes"
2174   else
# Line 1994 | Line 2183 | LIBS="$ac_save_LIBS"
2183   fi
2184   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2185    echo "$ac_t""yes" 1>&6
2186 <  HAVE_PTHREADS=yes
2186 >    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2187 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2188 >  cat >> confdefs.h <<EOF
2189 > #define $ac_tr_lib 1
2190 > EOF
2191 >
2192 >  LIBS="-lpthread $LIBS"
2193 >
2194   else
2195    echo "$ac_t""no" 1>&6
2000 – HAVE_PTHREADS=no
2001 – fi
2196  
2197 < if [ "x$HAVE_PTHREADS" = "xno" ]; then
2198 <    echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2005 < echo "configure:2006: checking for pthread_create in -lc_r" >&5
2197 >  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2198 > echo "configure:2199: checking for pthread_create in -lc_r" >&5
2199   ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2200   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2201    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2010 | Line 2203 | else
2203    ac_save_LIBS="$LIBS"
2204   LIBS="-lc_r  $LIBS"
2205   cat > conftest.$ac_ext <<EOF
2206 < #line 2014 "configure"
2206 > #line 2207 "configure"
2207   #include "confdefs.h"
2208   /* Override any gcc2 internal prototype to avoid an error.  */
2209   /* We use char because int might match the return type of a gcc2
# Line 2021 | Line 2214 | int main() {
2214   pthread_create()
2215   ; return 0; }
2216   EOF
2217 < if { (eval echo configure:2025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2217 > if { (eval echo configure:2218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2218    rm -rf conftest*
2219    eval "ac_cv_lib_$ac_lib_var=yes"
2220   else
# Line 2036 | Line 2229 | LIBS="$ac_save_LIBS"
2229   fi
2230   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2231    echo "$ac_t""yes" 1>&6
2232 <  HAVE_PTHREADS=yes
2232 >    ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2233 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2234 >  cat >> confdefs.h <<EOF
2235 > #define $ac_tr_lib 1
2236 > EOF
2237 >
2238 >  LIBS="-lc_r $LIBS"
2239 >
2240   else
2241    echo "$ac_t""no" 1>&6
2042 – HAVE_PTHREADS=no
2043 – fi
2242  
2243 <  if [ "x$HAVE_PTHREADS" = "xno" ]; then
2244 <        echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2047 < echo "configure:2048: checking for pthread_create in -lPTL" >&5
2243 >    echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6
2244 > echo "configure:2245: checking for pthread_create in -lPTL" >&5
2245   ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'`
2246   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2247    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2052 | Line 2249 | else
2249    ac_save_LIBS="$LIBS"
2250   LIBS="-lPTL  $LIBS"
2251   cat > conftest.$ac_ext <<EOF
2252 < #line 2056 "configure"
2252 > #line 2253 "configure"
2253   #include "confdefs.h"
2254   /* Override any gcc2 internal prototype to avoid an error.  */
2255   /* We use char because int might match the return type of a gcc2
# Line 2063 | Line 2260 | int main() {
2260   pthread_create()
2261   ; return 0; }
2262   EOF
2263 < if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2263 > if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2264    rm -rf conftest*
2265    eval "ac_cv_lib_$ac_lib_var=yes"
2266   else
# Line 2078 | Line 2275 | LIBS="$ac_save_LIBS"
2275   fi
2276   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2277    echo "$ac_t""yes" 1>&6
2278 <  HAVE_PTHREADS=yes
2278 >    ac_tr_lib=HAVE_LIB`echo PTL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
2279 >    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
2280 >  cat >> confdefs.h <<EOF
2281 > #define $ac_tr_lib 1
2282 > EOF
2283 >
2284 >  LIBS="-lPTL $LIBS"
2285 >
2286   else
2287    echo "$ac_t""no" 1>&6
2084 – HAVE_PTHREADS=no
2085 – fi
2288  
2087 –    if [ "x$HAVE_PTHREADS" = "xno" ]; then
2289        { echo "configure: error: You need pthreads to run Basilisk II." 1>&2; exit 1; }
2290 <    else
2090 <      LIBS="$LIBS -lPTL"
2091 <    fi
2092 <  else
2093 <     LIBS="$LIBS -lc_r"
2094 <  fi
2095 < else
2096 <  LIBS="$LIBS -lpthread"
2290 >    
2291   fi
2292 < for ac_func in pthread_cancel
2292 >
2293 >  
2294 > fi
2295 >
2296 >
2297 > fi
2298 >
2299 >
2300 > SEMSRCS=
2301 > for ac_func in sem_init
2302   do
2303   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2304 < echo "configure:2102: checking for $ac_func" >&5
2304 > echo "configure:2305: checking for $ac_func" >&5
2305   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2306    echo $ac_n "(cached) $ac_c" 1>&6
2307   else
2308    cat > conftest.$ac_ext <<EOF
2309 < #line 2107 "configure"
2309 > #line 2310 "configure"
2310   #include "confdefs.h"
2311   /* System header to define __stub macros and hopefully few prototypes,
2312      which can conflict with char $ac_func(); below.  */
# Line 2126 | Line 2329 | $ac_func();
2329  
2330   ; return 0; }
2331   EOF
2332 < if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2332 > if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2333    rm -rf conftest*
2334    eval "ac_cv_func_$ac_func=yes"
2335   else
# Line 2147 | Line 2350 | EOF
2350  
2351   else
2352    echo "$ac_t""no" 1>&6
2353 + SEMSRCS=posix_sem.cpp
2354 +
2355   fi
2356   done
2357  
2358  
2359   if [ "x$WANT_XF86_DGA" = "xyes" ]; then
2360    echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6
2361 < echo "configure:2157: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2361 > echo "configure:2362: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
2362   ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'`
2363   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2364    echo $ac_n "(cached) $ac_c" 1>&6
# Line 2161 | Line 2366 | else
2366    ac_save_LIBS="$LIBS"
2367   LIBS="-lXxf86dga  $LIBS"
2368   cat > conftest.$ac_ext <<EOF
2369 < #line 2165 "configure"
2369 > #line 2370 "configure"
2370   #include "confdefs.h"
2371   /* Override any gcc2 internal prototype to avoid an error.  */
2372   /* We use char because int might match the return type of a gcc2
# Line 2172 | Line 2377 | int main() {
2377   XF86DGAQueryExtension()
2378   ; return 0; }
2379   EOF
2380 < if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2380 > if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2381    rm -rf conftest*
2382    eval "ac_cv_lib_$ac_lib_var=yes"
2383   else
# Line 2187 | Line 2392 | LIBS="$ac_save_LIBS"
2392   fi
2393   if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2394    echo "$ac_t""yes" 1>&6
2395 <  HAVE_DGA=yes
2191 < else
2192 <  echo "$ac_t""no" 1>&6
2193 < HAVE_DGA=no
2194 < fi
2195 <
2196 <  if [ "x$HAVE_DGA" = "xno" ]; then
2197 <    echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2198 <    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2199 <  else
2395 >  
2396      DEFINES="$DEFINES -DENABLE_XF86_DGA=1"
2397      LIBS="$LIBS -lXxf86dga"
2398      if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then
2399        echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2
2400        WANT_FBDEV_DGA=no
2401      fi
2402 <  fi
2402 >  
2403 > else
2404 >  echo "$ac_t""no" 1>&6
2405 >
2406 >    echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2
2407 >    WANT_XF86_DGA=no
2408 >    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2409 >  
2410 > fi
2411 >
2412   else
2413    DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
2414   fi
# Line 2213 | Line 2418 | else
2418    DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
2419   fi
2420  
2421 < if [ "x$WANT_UI" = "xyes" ]; then
2421 > if [ "x$WANT_XF86_VIDMODE" = "xyes" ]; then
2422 >  echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6
2423 > echo "configure:2424: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
2424 > ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'`
2425 > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2426 >  echo $ac_n "(cached) $ac_c" 1>&6
2427 > else
2428 >  ac_save_LIBS="$LIBS"
2429 > LIBS="-lXxf86vm  $LIBS"
2430 > cat > conftest.$ac_ext <<EOF
2431 > #line 2432 "configure"
2432 > #include "confdefs.h"
2433 > /* Override any gcc2 internal prototype to avoid an error.  */
2434 > /* We use char because int might match the return type of a gcc2
2435 >    builtin and then its argument prototype would still apply.  */
2436 > char XF86VidModeQueryExtension();
2437 >
2438 > int main() {
2439 > XF86VidModeQueryExtension()
2440 > ; return 0; }
2441 > EOF
2442 > if { (eval echo configure:2443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2443 >  rm -rf conftest*
2444 >  eval "ac_cv_lib_$ac_lib_var=yes"
2445 > else
2446 >  echo "configure: failed program was:" >&5
2447 >  cat conftest.$ac_ext >&5
2448 >  rm -rf conftest*
2449 >  eval "ac_cv_lib_$ac_lib_var=no"
2450 > fi
2451 > rm -f conftest*
2452 > LIBS="$ac_save_LIBS"
2453 >
2454 > fi
2455 > if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2456 >  echo "$ac_t""yes" 1>&6
2457 >  
2458 >    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=1"
2459 >    LIBS="$LIBS -lXxf86vm"
2460 >  
2461 > else
2462 >  echo "$ac_t""no" 1>&6
2463 >
2464 >    echo "configure: warning: Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode." 1>&2
2465 >    WANT_XF86_VIDMODE=no
2466 >    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=0"
2467 >  
2468 > fi
2469 >
2470 > fi
2471 >
2472 > UISRCS=../dummy/prefs_editor_dummy.cpp
2473 > if [ "x$WANT_GTK" = "xyes" ]; then
2474    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
2475   if test "${with_gtk_prefix+set}" = set; then
2476    withval="$with_gtk_prefix"
# Line 2255 | Line 2512 | fi
2512    # Extract the first word of "gtk-config", so it can be a program name with args.
2513   set dummy gtk-config; ac_word=$2
2514   echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2515 < echo "configure:2259: checking for $ac_word" >&5
2515 > echo "configure:2516: checking for $ac_word" >&5
2516   if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
2517    echo $ac_n "(cached) $ac_c" 1>&6
2518   else
# Line 2290 | Line 2547 | fi
2547  
2548    min_gtk_version=1.2.0
2549    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
2550 < echo "configure:2294: checking for GTK - version >= $min_gtk_version" >&5
2550 > echo "configure:2551: checking for GTK - version >= $min_gtk_version" >&5
2551    no_gtk=""
2552    if test "$GTK_CONFIG" = "no" ; then
2553      no_gtk=yes
# Line 2313 | Line 2570 | echo "configure:2294: checking for GTK -
2570    echo $ac_n "cross compiling; assumed OK... $ac_c"
2571   else
2572    cat > conftest.$ac_ext <<EOF
2573 < #line 2317 "configure"
2573 > #line 2574 "configure"
2574   #include "confdefs.h"
2575  
2576   #include <gtk/gtk.h>
# Line 2376 | Line 2633 | main ()
2633   }
2634  
2635   EOF
2636 < if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2636 > if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2637   then
2638    :
2639   else
# Line 2394 | Line 2651 | fi
2651    fi
2652    if test "x$no_gtk" = x ; then
2653       echo "$ac_t""yes" 1>&6
2654 <     :    
2654 >    
2655 >    DEFINES="$DEFINES -DENABLE_GTK=1"
2656 >    CFLAGS="$CFLAGS $GTK_CFLAGS"
2657 >    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2658 >    LIBS="$LIBS $GTK_LIBS"
2659 >    UISRCS=prefs_editor_gtk.cpp
2660 >      
2661    else
2662       echo "$ac_t""no" 1>&6
2663       if test "$GTK_CONFIG" = "no" ; then
# Line 2410 | Line 2673 | fi
2673            CFLAGS="$CFLAGS $GTK_CFLAGS"
2674            LIBS="$LIBS $GTK_LIBS"
2675            cat > conftest.$ac_ext <<EOF
2676 < #line 2414 "configure"
2676 > #line 2677 "configure"
2677   #include "confdefs.h"
2678  
2679   #include <gtk/gtk.h>
# Line 2420 | Line 2683 | int main() {
2683   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
2684   ; return 0; }
2685   EOF
2686 < if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2686 > if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2687    rm -rf conftest*
2688     echo "*** The test program compiled, but did not run. This usually means"
2689            echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Line 2452 | Line 2715 | rm -f conftest*
2715       fi
2716       GTK_CFLAGS=""
2717       GTK_LIBS=""
2718 <     :
2718 >    
2719 >    echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2
2720 >    WANT_GTK=no
2721 >    DEFINES="$DEFINES -DENABLE_GTK=0"
2722 >  
2723    fi
2724    
2725    
2726    rm -f conf.gtktest
2727  
2461 –  if [ "x$no_gtk" = "xyes" ]; then
2462 –    echo "Did not find gtk+, disabling user interface."
2463 –    WANT_UI=no
2464 –    GTK_CFLAGS=
2465 –    GTK_LIBS=
2466 –  else
2467 –    DEFINES="$DEFINES -DENABLE_GTK=1"
2468 –  fi
2469 –  CFLAGS="$CFLAGS $GTK_CFLAGS"
2470 –  CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
2471 –  LIBS="$LIBS $GTK_LIBS"
2728   fi
2729  
2730 < SEMSRCS=
2731 < for ac_func in sem_init
2732 < do
2733 < echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2734 < echo "configure:2479: checking for $ac_func" >&5
2735 < if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2730 > if [ "x$WANT_ESD" = "xyes" ]; then
2731 >  # Check whether --with-esd-prefix or --without-esd-prefix was given.
2732 > if test "${with_esd_prefix+set}" = set; then
2733 >  withval="$with_esd_prefix"
2734 >  esd_prefix="$withval"
2735 > else
2736 >  esd_prefix=""
2737 > fi
2738 >
2739 > # Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
2740 > if test "${with_esd_exec_prefix+set}" = set; then
2741 >  withval="$with_esd_exec_prefix"
2742 >  esd_exec_prefix="$withval"
2743 > else
2744 >  esd_exec_prefix=""
2745 > fi
2746 >
2747 > # Check whether --enable-esdtest or --disable-esdtest was given.
2748 > if test "${enable_esdtest+set}" = set; then
2749 >  enableval="$enable_esdtest"
2750 >  :
2751 > else
2752 >  enable_esdtest=yes
2753 > fi
2754 >
2755 >
2756 >  if test x$esd_exec_prefix != x ; then
2757 >     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
2758 >     if test x${ESD_CONFIG+set} != xset ; then
2759 >        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
2760 >     fi
2761 >  fi
2762 >  if test x$esd_prefix != x ; then
2763 >     esd_args="$esd_args --prefix=$esd_prefix"
2764 >     if test x${ESD_CONFIG+set} != xset ; then
2765 >        ESD_CONFIG=$esd_prefix/bin/esd-config
2766 >     fi
2767 >  fi
2768 >
2769 >  # Extract the first word of "esd-config", so it can be a program name with args.
2770 > set dummy esd-config; ac_word=$2
2771 > echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2772 > echo "configure:2773: checking for $ac_word" >&5
2773 > if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
2774    echo $ac_n "(cached) $ac_c" 1>&6
2775   else
2776 +  case "$ESD_CONFIG" in
2777 +  /*)
2778 +  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path.
2779 +  ;;
2780 +  ?:/*)                  
2781 +  ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path.
2782 +  ;;
2783 +  *)
2784 +  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
2785 +  ac_dummy="$PATH"
2786 +  for ac_dir in $ac_dummy; do
2787 +    test -z "$ac_dir" && ac_dir=.
2788 +    if test -f $ac_dir/$ac_word; then
2789 +      ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word"
2790 +      break
2791 +    fi
2792 +  done
2793 +  IFS="$ac_save_ifs"
2794 +  test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no"
2795 +  ;;
2796 + esac
2797 + fi
2798 + ESD_CONFIG="$ac_cv_path_ESD_CONFIG"
2799 + if test -n "$ESD_CONFIG"; then
2800 +  echo "$ac_t""$ESD_CONFIG" 1>&6
2801 + else
2802 +  echo "$ac_t""no" 1>&6
2803 + fi
2804 +
2805 +  min_esd_version=0.2.8
2806 +  echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6
2807 + echo "configure:2808: checking for ESD - version >= $min_esd_version" >&5
2808 +  no_esd=""
2809 +  if test "$ESD_CONFIG" = "no" ; then
2810 +    no_esd=yes
2811 +  else
2812 +    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
2813 +    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
2814 +
2815 +    esd_major_version=`$ESD_CONFIG $esd_args --version | \
2816 +           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
2817 +    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
2818 +           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
2819 +    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
2820 +           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
2821 +    if test "x$enable_esdtest" = "xyes" ; then
2822 +      ac_save_CFLAGS="$CFLAGS"
2823 +      ac_save_LIBS="$LIBS"
2824 +      CFLAGS="$CFLAGS $ESD_CFLAGS"
2825 +      LIBS="$LIBS $ESD_LIBS"
2826 +      rm -f conf.esdtest
2827 +      if test "$cross_compiling" = yes; then
2828 +  echo $ac_n "cross compiling; assumed OK... $ac_c"
2829 + else
2830    cat > conftest.$ac_ext <<EOF
2831 < #line 2484 "configure"
2831 > #line 2832 "configure"
2832   #include "confdefs.h"
2485 – /* System header to define __stub macros and hopefully few prototypes,
2486 –    which can conflict with char $ac_func(); below.  */
2487 – #include <assert.h>
2488 – /* Override any gcc2 internal prototype to avoid an error.  */
2489 – /* We use char because int might match the return type of a gcc2
2490 –    builtin and then its argument prototype would still apply.  */
2491 – char $ac_func();
2833  
2834 < int main() {
2834 > #include <stdio.h>
2835 > #include <stdlib.h>
2836 > #include <string.h>
2837 > #include <esd.h>
2838 >
2839 > char*
2840 > my_strdup (char *str)
2841 > {
2842 >  char *new_str;
2843 >  
2844 >  if (str)
2845 >    {
2846 >      new_str = malloc ((strlen (str) + 1) * sizeof(char));
2847 >      strcpy (new_str, str);
2848 >    }
2849 >  else
2850 >    new_str = NULL;
2851 >  
2852 >  return new_str;
2853 > }
2854 >
2855 > int main ()
2856 > {
2857 >  int major, minor, micro;
2858 >  char *tmp_version;
2859 >
2860 >  system ("touch conf.esdtest");
2861 >
2862 >  /* HP/UX 9 (%@#!) writes to sscanf strings */
2863 >  tmp_version = my_strdup("$min_esd_version");
2864 >  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
2865 >     printf("%s, bad version string\n", "$min_esd_version");
2866 >     exit(1);
2867 >   }
2868 >
2869 >   if (($esd_major_version > major) ||
2870 >      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
2871 >      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
2872 >    {
2873 >      return 0;
2874 >    }
2875 >  else
2876 >    {
2877 >      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
2878 >      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
2879 >      printf("*** best to upgrade to the required version.\n");
2880 >      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
2881 >      printf("*** to point to the correct copy of esd-config, and remove the file\n");
2882 >      printf("*** config.cache before re-running configure\n");
2883 >      return 1;
2884 >    }
2885 > }
2886  
2495 – /* The GNU C library defines this for functions which it implements
2496 –    to always fail with ENOSYS.  Some functions are actually named
2497 –    something starting with __ and the normal name is an alias.  */
2498 – #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
2499 – choke me
2500 – #else
2501 – $ac_func();
2502 – #endif
2887  
2504 – ; return 0; }
2888   EOF
2889 < if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2890 <  rm -rf conftest*
2891 <  eval "ac_cv_func_$ac_func=yes"
2889 > if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2890 > then
2891 >  :
2892   else
2893    echo "configure: failed program was:" >&5
2894    cat conftest.$ac_ext >&5
2895 <  rm -rf conftest*
2896 <  eval "ac_cv_func_$ac_func=no"
2514 < fi
2515 < rm -f conftest*
2895 >  rm -fr conftest*
2896 >  no_esd=yes
2897   fi
2898 <
2518 < if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
2519 <  echo "$ac_t""yes" 1>&6
2520 <    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
2521 <  cat >> confdefs.h <<EOF
2522 < #define $ac_tr_func 1
2523 < EOF
2524 <
2525 < else
2526 <  echo "$ac_t""no" 1>&6
2898 > rm -fr conftest*
2899   fi
2528 – done
2900  
2901 < if [ "x$ac_cv_func_sem_init" = "xno" ]; then
2902 <  echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6
2903 < echo "configure:2533: checking for sem_init in -lposix4" >&5
2904 < ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'`
2905 < if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2906 <  echo $ac_n "(cached) $ac_c" 1>&6
2907 < else
2908 <  ac_save_LIBS="$LIBS"
2909 < LIBS="-lposix4  $LIBS"
2910 < cat > conftest.$ac_ext <<EOF
2911 < #line 2541 "configure"
2901 >       CFLAGS="$ac_save_CFLAGS"
2902 >       LIBS="$ac_save_LIBS"
2903 >     fi
2904 >  fi
2905 >  if test "x$no_esd" = x ; then
2906 >     echo "$ac_t""yes" 1>&6
2907 >    
2908 >    DEFINES="$DEFINES -DENABLE_ESD=1"
2909 >    CFLAGS="$CFLAGS $ESD_CFLAGS"
2910 >    CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
2911 >    LIBS="$LIBS $ESD_LIBS"
2912 >      
2913 >  else
2914 >     echo "$ac_t""no" 1>&6
2915 >     if test "$ESD_CONFIG" = "no" ; then
2916 >       echo "*** The esd-config script installed by ESD could not be found"
2917 >       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
2918 >       echo "*** your path, or set the ESD_CONFIG environment variable to the"
2919 >       echo "*** full path to esd-config."
2920 >     else
2921 >       if test -f conf.esdtest ; then
2922 >        :
2923 >       else
2924 >          echo "*** Could not run ESD test program, checking why..."
2925 >          CFLAGS="$CFLAGS $ESD_CFLAGS"
2926 >          LIBS="$LIBS $ESD_LIBS"
2927 >          cat > conftest.$ac_ext <<EOF
2928 > #line 2929 "configure"
2929   #include "confdefs.h"
2930 < /* Override any gcc2 internal prototype to avoid an error.  */
2931 < /* We use char because int might match the return type of a gcc2
2932 <    builtin and then its argument prototype would still apply.  */
2545 < char sem_init();
2930 >
2931 > #include <stdio.h>
2932 > #include <esd.h>
2933  
2934   int main() {
2935 < sem_init()
2935 > return 0;
2936   ; return 0; }
2937   EOF
2938 < if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2938 > if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2939    rm -rf conftest*
2940 <  eval "ac_cv_lib_$ac_lib_var=yes"
2940 >   echo "*** The test program compiled, but did not run. This usually means"
2941 >          echo "*** that the run-time linker is not finding ESD or finding the wrong"
2942 >          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
2943 >          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2944 >          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
2945 >          echo "*** is required on your system"
2946 >          echo "***"
2947 >          echo "*** If you have an old version installed, it is best to remove it, although"
2948 >          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
2949   else
2950    echo "configure: failed program was:" >&5
2951    cat conftest.$ac_ext >&5
2952    rm -rf conftest*
2953 <  eval "ac_cv_lib_$ac_lib_var=no"
2953 >   echo "*** The test program failed to compile or link. See the file config.log for the"
2954 >          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
2955 >          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
2956 >          echo "*** may want to edit the esd-config script: $ESD_CONFIG"
2957   fi
2958   rm -f conftest*
2959 < LIBS="$ac_save_LIBS"
2960 <
2961 < fi
2962 < if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
2963 <  echo "$ac_t""yes" 1>&6
2964 <  HAVE_LIBPOSIX4=yes
2965 < else
2966 <  echo "$ac_t""no" 1>&6
2967 < HAVE_LIBPOSIX4=no
2968 < fi
2969 <
2572 <  if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then
2573 <        SEMSRCS="posix_sem.cpp"
2574 <  else
2575 <    LIBS="$LIBS -lposix4"
2959 >          CFLAGS="$ac_save_CFLAGS"
2960 >          LIBS="$ac_save_LIBS"
2961 >       fi
2962 >     fi
2963 >     ESD_CFLAGS=""
2964 >     ESD_LIBS=""
2965 >    
2966 >    echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2
2967 >    WANT_ESD=no
2968 >    DEFINES="$DEFINES -DENABLE_ESD=0"
2969 >  
2970    fi
2971 +  
2972 +  
2973 +  rm -f conf.esdtest
2974 +
2975   fi
2976  
2977   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2978 < echo "configure:2581: checking for ANSI C header files" >&5
2978 > echo "configure:2979: checking for ANSI C header files" >&5
2979   if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2980    echo $ac_n "(cached) $ac_c" 1>&6
2981   else
2982    cat > conftest.$ac_ext <<EOF
2983 < #line 2586 "configure"
2983 > #line 2984 "configure"
2984   #include "confdefs.h"
2985   #include <stdlib.h>
2986   #include <stdarg.h>
# Line 2590 | Line 2988 | else
2988   #include <float.h>
2989   EOF
2990   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2991 < { (eval echo configure:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2991 > { (eval echo configure:2992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2992   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2993   if test -z "$ac_err"; then
2994    rm -rf conftest*
# Line 2607 | Line 3005 | rm -f conftest*
3005   if test $ac_cv_header_stdc = yes; then
3006    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3007   cat > conftest.$ac_ext <<EOF
3008 < #line 2611 "configure"
3008 > #line 3009 "configure"
3009   #include "confdefs.h"
3010   #include <string.h>
3011   EOF
# Line 2625 | Line 3023 | fi
3023   if test $ac_cv_header_stdc = yes; then
3024    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3025   cat > conftest.$ac_ext <<EOF
3026 < #line 2629 "configure"
3026 > #line 3027 "configure"
3027   #include "confdefs.h"
3028   #include <stdlib.h>
3029   EOF
# Line 2646 | Line 3044 | if test "$cross_compiling" = yes; then
3044    :
3045   else
3046    cat > conftest.$ac_ext <<EOF
3047 < #line 2650 "configure"
3047 > #line 3048 "configure"
3048   #include "confdefs.h"
3049   #include <ctype.h>
3050   #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# Line 2657 | Line 3055 | if (XOR (islower (i), ISLOWER (i)) || to
3055   exit (0); }
3056  
3057   EOF
3058 < if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3058 > if { (eval echo configure:3059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3059   then
3060    :
3061   else
# Line 2684 | Line 3082 | for ac_hdr in unistd.h fcntl.h sys/time.
3082   do
3083   ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3084   echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3085 < echo "configure:2688: checking for $ac_hdr" >&5
3085 > echo "configure:3086: checking for $ac_hdr" >&5
3086   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3087    echo $ac_n "(cached) $ac_c" 1>&6
3088   else
3089    cat > conftest.$ac_ext <<EOF
3090 < #line 2693 "configure"
3090 > #line 3091 "configure"
3091   #include "confdefs.h"
3092   #include <$ac_hdr>
3093   EOF
3094   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3095 < { (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3095 > { (eval echo configure:3096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3096   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3097   if test -z "$ac_err"; then
3098    rm -rf conftest*
# Line 2722 | Line 3120 | done
3120  
3121  
3122   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
3123 < echo "configure:2726: checking whether byte ordering is bigendian" >&5
3123 > echo "configure:3124: checking whether byte ordering is bigendian" >&5
3124   if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
3125    echo $ac_n "(cached) $ac_c" 1>&6
3126   else
3127    ac_cv_c_bigendian=unknown
3128   # See if sys/param.h defines the BYTE_ORDER macro.
3129   cat > conftest.$ac_ext <<EOF
3130 < #line 2733 "configure"
3130 > #line 3131 "configure"
3131   #include "confdefs.h"
3132   #include <sys/types.h>
3133   #include <sys/param.h>
# Line 2740 | Line 3138 | int main() {
3138   #endif
3139   ; return 0; }
3140   EOF
3141 < if { (eval echo configure:2744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3141 > if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3142    rm -rf conftest*
3143    # It does; now see whether it defined to BIG_ENDIAN or not.
3144   cat > conftest.$ac_ext <<EOF
3145 < #line 2748 "configure"
3145 > #line 3146 "configure"
3146   #include "confdefs.h"
3147   #include <sys/types.h>
3148   #include <sys/param.h>
# Line 2755 | Line 3153 | int main() {
3153   #endif
3154   ; return 0; }
3155   EOF
3156 < if { (eval echo configure:2759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3156 > if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3157    rm -rf conftest*
3158    ac_cv_c_bigendian=yes
3159   else
# Line 2775 | Line 3173 | if test "$cross_compiling" = yes; then
3173      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
3174   else
3175    cat > conftest.$ac_ext <<EOF
3176 < #line 2779 "configure"
3176 > #line 3177 "configure"
3177   #include "confdefs.h"
3178   main () {
3179    /* Are we little or big endian?  From Harbison&Steele.  */
# Line 2788 | Line 3186 | main () {
3186    exit (u.c[sizeof (long) - 1] == 1);
3187   }
3188   EOF
3189 < if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3189 > if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3190   then
3191    ac_cv_c_bigendian=no
3192   else
# Line 2812 | Line 3210 | EOF
3210   fi
3211  
3212   echo $ac_n "checking for working const""... $ac_c" 1>&6
3213 < echo "configure:2816: checking for working const" >&5
3213 > echo "configure:3214: checking for working const" >&5
3214   if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3215    echo $ac_n "(cached) $ac_c" 1>&6
3216   else
3217    cat > conftest.$ac_ext <<EOF
3218 < #line 2821 "configure"
3218 > #line 3219 "configure"
3219   #include "confdefs.h"
3220  
3221   int main() {
# Line 2866 | Line 3264 | ccp = (char const *const *) p;
3264  
3265   ; return 0; }
3266   EOF
3267 < if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3267 > if { (eval echo configure:3268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3268    rm -rf conftest*
3269    ac_cv_c_const=yes
3270   else
# Line 2887 | Line 3285 | EOF
3285   fi
3286  
3287   echo $ac_n "checking for inline""... $ac_c" 1>&6
3288 < echo "configure:2891: checking for inline" >&5
3288 > echo "configure:3289: checking for inline" >&5
3289   if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3290    echo $ac_n "(cached) $ac_c" 1>&6
3291   else
3292    ac_cv_c_inline=no
3293   for ac_kw in inline __inline__ __inline; do
3294    cat > conftest.$ac_ext <<EOF
3295 < #line 2898 "configure"
3295 > #line 3296 "configure"
3296   #include "confdefs.h"
3297  
3298   int main() {
3299   } $ac_kw foo() {
3300   ; return 0; }
3301   EOF
3302 < if { (eval echo configure:2905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3302 > if { (eval echo configure:3303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3303    rm -rf conftest*
3304    ac_cv_c_inline=$ac_kw; break
3305   else
# Line 2927 | Line 3325 | EOF
3325   esac
3326  
3327   echo $ac_n "checking size of short""... $ac_c" 1>&6
3328 < echo "configure:2931: checking size of short" >&5
3328 > echo "configure:3329: checking size of short" >&5
3329   if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
3330    echo $ac_n "(cached) $ac_c" 1>&6
3331   else
# Line 2935 | Line 3333 | else
3333    ac_cv_sizeof_short=2
3334   else
3335    cat > conftest.$ac_ext <<EOF
3336 < #line 2939 "configure"
3336 > #line 3337 "configure"
3337   #include "confdefs.h"
3338   #include <stdio.h>
3339   main()
# Line 2946 | Line 3344 | main()
3344    exit(0);
3345   }
3346   EOF
3347 < if { (eval echo configure:2950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3347 > if { (eval echo configure:3348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3348   then
3349    ac_cv_sizeof_short=`cat conftestval`
3350   else
# Line 2966 | Line 3364 | EOF
3364  
3365  
3366   echo $ac_n "checking size of int""... $ac_c" 1>&6
3367 < echo "configure:2970: checking size of int" >&5
3367 > echo "configure:3368: checking size of int" >&5
3368   if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3369    echo $ac_n "(cached) $ac_c" 1>&6
3370   else
# Line 2974 | Line 3372 | else
3372    ac_cv_sizeof_int=4
3373   else
3374    cat > conftest.$ac_ext <<EOF
3375 < #line 2978 "configure"
3375 > #line 3376 "configure"
3376   #include "confdefs.h"
3377   #include <stdio.h>
3378   main()
# Line 2985 | Line 3383 | main()
3383    exit(0);
3384   }
3385   EOF
3386 < if { (eval echo configure:2989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3386 > if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3387   then
3388    ac_cv_sizeof_int=`cat conftestval`
3389   else
# Line 3005 | Line 3403 | EOF
3403  
3404  
3405   echo $ac_n "checking size of long""... $ac_c" 1>&6
3406 < echo "configure:3009: checking size of long" >&5
3406 > echo "configure:3407: checking size of long" >&5
3407   if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3408    echo $ac_n "(cached) $ac_c" 1>&6
3409   else
# Line 3013 | Line 3411 | else
3411    ac_cv_sizeof_long=4
3412   else
3413    cat > conftest.$ac_ext <<EOF
3414 < #line 3017 "configure"
3414 > #line 3415 "configure"
3415   #include "confdefs.h"
3416   #include <stdio.h>
3417   main()
# Line 3024 | Line 3422 | main()
3422    exit(0);
3423   }
3424   EOF
3425 < if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3425 > if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3426   then
3427    ac_cv_sizeof_long=`cat conftestval`
3428   else
# Line 3044 | Line 3442 | EOF
3442  
3443  
3444   echo $ac_n "checking size of long long""... $ac_c" 1>&6
3445 < echo "configure:3048: checking size of long long" >&5
3445 > echo "configure:3446: checking size of long long" >&5
3446   if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3447    echo $ac_n "(cached) $ac_c" 1>&6
3448   else
# Line 3052 | Line 3450 | else
3450    ac_cv_sizeof_long_long=8
3451   else
3452    cat > conftest.$ac_ext <<EOF
3453 < #line 3056 "configure"
3453 > #line 3454 "configure"
3454   #include "confdefs.h"
3455   #include <stdio.h>
3456   main()
# Line 3063 | Line 3461 | main()
3461    exit(0);
3462   }
3463   EOF
3464 < if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3464 > if { (eval echo configure:3465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3465   then
3466    ac_cv_sizeof_long_long=`cat conftestval`
3467   else
# Line 3083 | Line 3481 | EOF
3481  
3482  
3483   echo $ac_n "checking for off_t""... $ac_c" 1>&6
3484 < echo "configure:3087: checking for off_t" >&5
3484 > echo "configure:3485: checking for off_t" >&5
3485   if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3486    echo $ac_n "(cached) $ac_c" 1>&6
3487   else
3488    cat > conftest.$ac_ext <<EOF
3489 < #line 3092 "configure"
3489 > #line 3490 "configure"
3490   #include "confdefs.h"
3491   #include <sys/types.h>
3492   #if STDC_HEADERS
# Line 3116 | Line 3514 | EOF
3514   fi
3515  
3516   echo $ac_n "checking for loff_t""... $ac_c" 1>&6
3517 < echo "configure:3120: checking for loff_t" >&5
3517 > echo "configure:3518: checking for loff_t" >&5
3518   if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
3519    echo $ac_n "(cached) $ac_c" 1>&6
3520   else
3521    cat > conftest.$ac_ext <<EOF
3522 < #line 3125 "configure"
3522 > #line 3523 "configure"
3523   #include "confdefs.h"
3524   #include <sys/types.h>
3525   #if STDC_HEADERS
# Line 3149 | Line 3547 | EOF
3547   fi
3548  
3549   echo $ac_n "checking for size_t""... $ac_c" 1>&6
3550 < echo "configure:3153: checking for size_t" >&5
3550 > echo "configure:3551: checking for size_t" >&5
3551   if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3552    echo $ac_n "(cached) $ac_c" 1>&6
3553   else
3554    cat > conftest.$ac_ext <<EOF
3555 < #line 3158 "configure"
3555 > #line 3556 "configure"
3556   #include "confdefs.h"
3557   #include <sys/types.h>
3558   #if STDC_HEADERS
# Line 3182 | Line 3580 | EOF
3580   fi
3581  
3582   echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
3583 < echo "configure:3186: checking whether time.h and sys/time.h may both be included" >&5
3583 > echo "configure:3584: checking whether time.h and sys/time.h may both be included" >&5
3584   if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
3585    echo $ac_n "(cached) $ac_c" 1>&6
3586   else
3587    cat > conftest.$ac_ext <<EOF
3588 < #line 3191 "configure"
3588 > #line 3589 "configure"
3589   #include "confdefs.h"
3590   #include <sys/types.h>
3591   #include <sys/time.h>
# Line 3196 | Line 3594 | int main() {
3594   struct tm *tp;
3595   ; return 0; }
3596   EOF
3597 < if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3597 > if { (eval echo configure:3598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3598    rm -rf conftest*
3599    ac_cv_header_time=yes
3600   else
# Line 3217 | Line 3615 | EOF
3615   fi
3616  
3617   echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3618 < echo "configure:3221: checking whether struct tm is in sys/time.h or time.h" >&5
3618 > echo "configure:3619: checking whether struct tm is in sys/time.h or time.h" >&5
3619   if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3620    echo $ac_n "(cached) $ac_c" 1>&6
3621   else
3622    cat > conftest.$ac_ext <<EOF
3623 < #line 3226 "configure"
3623 > #line 3624 "configure"
3624   #include "confdefs.h"
3625   #include <sys/types.h>
3626   #include <time.h>
# Line 3230 | Line 3628 | int main() {
3628   struct tm *tp; tp->tm_sec;
3629   ; return 0; }
3630   EOF
3631 < if { (eval echo configure:3234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3631 > if { (eval echo configure:3632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3632    rm -rf conftest*
3633    ac_cv_struct_tm=time.h
3634   else
# Line 3254 | Line 3652 | fi
3652   for ac_func in strdup cfmakeraw
3653   do
3654   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3655 < echo "configure:3258: checking for $ac_func" >&5
3655 > echo "configure:3656: checking for $ac_func" >&5
3656   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3657    echo $ac_n "(cached) $ac_c" 1>&6
3658   else
3659    cat > conftest.$ac_ext <<EOF
3660 < #line 3263 "configure"
3660 > #line 3661 "configure"
3661   #include "confdefs.h"
3662   /* System header to define __stub macros and hopefully few prototypes,
3663      which can conflict with char $ac_func(); below.  */
# Line 3282 | Line 3680 | $ac_func();
3680  
3681   ; return 0; }
3682   EOF
3683 < if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3683 > if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3684    rm -rf conftest*
3685    eval "ac_cv_func_$ac_func=yes"
3686   else
# Line 3309 | Line 3707 | done
3707   for ac_func in nanosleep clock_gettime timer_create
3708   do
3709   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3710 < echo "configure:3313: checking for $ac_func" >&5
3710 > echo "configure:3711: checking for $ac_func" >&5
3711   if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3712    echo $ac_n "(cached) $ac_c" 1>&6
3713   else
3714    cat > conftest.$ac_ext <<EOF
3715 < #line 3318 "configure"
3715 > #line 3716 "configure"
3716   #include "confdefs.h"
3717   /* System header to define __stub macros and hopefully few prototypes,
3718      which can conflict with char $ac_func(); below.  */
# Line 3337 | Line 3735 | $ac_func();
3735  
3736   ; return 0; }
3737   EOF
3738 < if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3738 > if { (eval echo configure:3739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3739 >  rm -rf conftest*
3740 >  eval "ac_cv_func_$ac_func=yes"
3741 > else
3742 >  echo "configure: failed program was:" >&5
3743 >  cat conftest.$ac_ext >&5
3744 >  rm -rf conftest*
3745 >  eval "ac_cv_func_$ac_func=no"
3746 > fi
3747 > rm -f conftest*
3748 > fi
3749 >
3750 > if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
3751 >  echo "$ac_t""yes" 1>&6
3752 >    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
3753 >  cat >> confdefs.h <<EOF
3754 > #define $ac_tr_func 1
3755 > EOF
3756 >
3757 > else
3758 >  echo "$ac_t""no" 1>&6
3759 > fi
3760 > done
3761 >
3762 > for ac_func in pthread_cancel
3763 > do
3764 > echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3765 > echo "configure:3766: checking for $ac_func" >&5
3766 > if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3767 >  echo $ac_n "(cached) $ac_c" 1>&6
3768 > else
3769 >  cat > conftest.$ac_ext <<EOF
3770 > #line 3771 "configure"
3771 > #include "confdefs.h"
3772 > /* System header to define __stub macros and hopefully few prototypes,
3773 >    which can conflict with char $ac_func(); below.  */
3774 > #include <assert.h>
3775 > /* Override any gcc2 internal prototype to avoid an error.  */
3776 > /* We use char because int might match the return type of a gcc2
3777 >    builtin and then its argument prototype would still apply.  */
3778 > char $ac_func();
3779 >
3780 > int main() {
3781 >
3782 > /* The GNU C library defines this for functions which it implements
3783 >    to always fail with ENOSYS.  Some functions are actually named
3784 >    something starting with __ and the normal name is an alias.  */
3785 > #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
3786 > choke me
3787 > #else
3788 > $ac_func();
3789 > #endif
3790 >
3791 > ; return 0; }
3792 > EOF
3793 > if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3794    rm -rf conftest*
3795    eval "ac_cv_func_$ac_func=yes"
3796   else
# Line 3366 | Line 3819 | SYSSRCS="../dummy/ether_dummy.cpp ../dum
3819   if MACHINE=`uname -a 2>/dev/null`; then
3820    case "$MACHINE" in
3821    Linux*)
3822 <    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp"
3822 >    SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp"
3823      ;;
3824    FreeBSD*3.*)
3825          echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6
3826 < echo "configure:3374: checking for cam_open_btl in -lcam" >&5
3826 > echo "configure:3827: checking for cam_open_btl in -lcam" >&5
3827   ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'`
3828   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3829    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3378 | Line 3831 | else
3831    ac_save_LIBS="$LIBS"
3832   LIBS="-lcam  $LIBS"
3833   cat > conftest.$ac_ext <<EOF
3834 < #line 3382 "configure"
3834 > #line 3835 "configure"
3835   #include "confdefs.h"
3836   /* Override any gcc2 internal prototype to avoid an error.  */
3837   /* We use char because int might match the return type of a gcc2
# Line 3389 | Line 3842 | int main() {
3842   cam_open_btl()
3843   ; return 0; }
3844   EOF
3845 < if { (eval echo configure:3393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3845 > if { (eval echo configure:3846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3846    rm -rf conftest*
3847    eval "ac_cv_lib_$ac_lib_var=yes"
3848   else
# Line 3415 | Line 3868 | fi
3868      else
3869              ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'`
3870   echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6
3871 < echo "configure:3419: checking for /sys/cam/cam.h" >&5
3871 > echo "configure:3872: checking for /sys/cam/cam.h" >&5
3872   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3873    echo $ac_n "(cached) $ac_c" 1>&6
3874   else
3875    cat > conftest.$ac_ext <<EOF
3876 < #line 3424 "configure"
3876 > #line 3877 "configure"
3877   #include "confdefs.h"
3878   #include </sys/cam/cam.h>
3879   EOF
3880   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3881 < { (eval echo configure:3429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3881 > { (eval echo configure:3882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3882   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3883   if test -z "$ac_err"; then
3884    rm -rf conftest*
# Line 3449 | Line 3902 | fi
3902        if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then
3903                          { echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; }
3904        fi
3905 <      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp"
3905 >      SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp"
3906        CXXFLAGS="$CXXFLAGS -I/sys"
3907        CFLAGS="$CFLAGS -I/sys"
3908        LIBS="$LIBS -lcam"
# Line 3458 | Line 3911 | fi
3911      ;;
3912    FreeBSD*)
3913          echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6
3914 < echo "configure:3462: checking for scsi_open in -lscsi" >&5
3914 > echo "configure:3915: checking for scsi_open in -lscsi" >&5
3915   ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'`
3916   if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3917    echo $ac_n "(cached) $ac_c" 1>&6
# Line 3466 | Line 3919 | else
3919    ac_save_LIBS="$LIBS"
3920   LIBS="-lscsi  $LIBS"
3921   cat > conftest.$ac_ext <<EOF
3922 < #line 3470 "configure"
3922 > #line 3923 "configure"
3923   #include "confdefs.h"
3924   /* Override any gcc2 internal prototype to avoid an error.  */
3925   /* We use char because int might match the return type of a gcc2
# Line 3477 | Line 3930 | int main() {
3930   scsi_open()
3931   ; return 0; }
3932   EOF
3933 < if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3933 > if { (eval echo configure:3934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3934    rm -rf conftest*
3935    eval "ac_cv_lib_$ac_lib_var=yes"
3936   else
# Line 3503 | Line 3956 | fi
3956      else
3957              ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'`
3958   echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6
3959 < echo "configure:3507: checking for scsi.h sys/scsiio.h" >&5
3959 > echo "configure:3960: checking for scsi.h sys/scsiio.h" >&5
3960   if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3961    echo $ac_n "(cached) $ac_c" 1>&6
3962   else
3963    cat > conftest.$ac_ext <<EOF
3964 < #line 3512 "configure"
3964 > #line 3965 "configure"
3965   #include "confdefs.h"
3966   #include <scsi.h sys/scsiio.h>
3967   EOF
3968   ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3969 < { (eval echo configure:3517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3969 > { (eval echo configure:3970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3970   ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3971   if test -z "$ac_err"; then
3972    rm -rf conftest*
# Line 3553 | Line 4006 | fi
4006      ;;
4007    esac
4008   fi
4009 < if [ "x$WANT_UI" = "xyes" ]; then
3557 <  SYSSRCS="$SYSSRCS prefs_editor_gtk.cpp"
3558 < else
3559 <  SYSSRCS="$SYSSRCS ../dummy/prefs_editor_dummy.cpp"
3560 < fi
3561 < if [ "x$SEMSRCS" != "x" ]; then
3562 <  SYSSRCS="$SYSSRCS $SEMSRCS"
3563 < fi
4009 > SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS $MONSRCS"
4010  
4011   HAVE_I386=no
4012   echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6
4013 < echo "configure:3568: checking for x86 target CPU" >&5
4013 > echo "configure:4014: checking for x86 target CPU" >&5
4014   cat > conftest.$ac_ext <<EOF
4015 < #line 3570 "configure"
4015 > #line 4016 "configure"
4016   #include "confdefs.h"
4017  
4018   #ifdef __i386__
# Line 3587 | Line 4033 | rm -f conftest*
4033  
4034   HAVE_SPARC=no
4035   echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6
4036 < echo "configure:3591: checking for SPARC target CPU" >&5
4036 > echo "configure:4037: checking for SPARC target CPU" >&5
4037   cat > conftest.$ac_ext <<EOF
4038 < #line 3593 "configure"
4038 > #line 4039 "configure"
4039   #include "confdefs.h"
4040  
4041   #ifdef __sparc__
# Line 3610 | Line 4056 | rm -f conftest*
4056  
4057   HAVE_GAS=no
4058   echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6
4059 < echo "configure:3614: checking for GAS .p2align feature" >&5
4059 > echo "configure:4060: checking for GAS .p2align feature" >&5
4060   cat >conftest.S << EOF
4061          .text
4062          .p2align 5
# Line 3620 | Line 4066 | echo "$ac_t""$HAVE_GAS" 1>&6
4066  
4067   HAVE_GCC27=no
4068   echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6
4069 < echo "configure:3624: checking for GCC 2.7 or higher" >&5
4069 > echo "configure:4070: checking for GCC 2.7 or higher" >&5
4070   cat > conftest.$ac_ext <<EOF
4071 < #line 3626 "configure"
4071 > #line 4072 "configure"
4072   #include "confdefs.h"
4073   #if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
4074    yes
# Line 3645 | Line 4091 | if [ "x$HAVE_GCC27" = "xyes" ]; then
4091    CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
4092   fi
4093  
4094 + WANT_X86_ASSEMBLY=no
4095 + WANT_SPARC_V8_ASSEMBLY=no
4096 + WANT_SPARC_V9_ASSEMBLY=no
4097   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
4098   if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then
4099      DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
4100    if [ "x$HAVE_GAS" = "xyes" ]; then
4101 +    WANT_X86_ASSEMBLY=yes
4102      DEFINES="$DEFINES -DX86_ASSEMBLY"
4103 <    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4103 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
4104    fi
4105   elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then
4106      case "$MACHINE" in
4107    SunOS*)
4108      echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6
4109 < echo "configure:3660: checking SPARC CPU architecture" >&5
4109 > echo "configure:4110: checking SPARC CPU architecture" >&5
4110      SPARC_TYPE=`Solaris/which_sparc`
4111      echo "$ac_t""$SPARC_TYPE" 1>&6
4112      case "$SPARC_TYPE" in
4113      SPARC_V8)
4114 +      WANT_SPARC_V8_ASSEMBLY=yes
4115        DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
4116        CFLAGS="$CFLAGS -Wa,-Av8"
4117        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
4118        ;;
4119      SPARC_V9)
4120 +      WANT_SPARC_V9_ASSEMBLY=yes
4121        DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
4122        CFLAGS="$CFLAGS -Wa,-Av9"
4123        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
# Line 3682 | Line 4134 | CPUSRCS="../uae_cpu/basilisk_glue.cpp ..
4134  
4135  
4136  
3685 –
4137   trap '' 1 2 15
4138   cat > confcache <<\EOF
4139   # This file is a shell script that caches the results of configure
# Line 3830 | Line 4281 | s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
4281   s%@GTK_CONFIG@%$GTK_CONFIG%g
4282   s%@GTK_CFLAGS@%$GTK_CFLAGS%g
4283   s%@GTK_LIBS@%$GTK_LIBS%g
4284 + s%@ESD_CONFIG@%$ESD_CONFIG%g
4285 + s%@ESD_CFLAGS@%$ESD_CFLAGS%g
4286 + s%@ESD_LIBS@%$ESD_LIBS%g
4287   s%@DEFINES@%$DEFINES%g
3834 – s%@STATICLIBS@%$STATICLIBS%g
4288   s%@SYSSRCS@%$SYSSRCS%g
4289   s%@CPUINCLUDES@%$CPUINCLUDES%g
4290   s%@CPUSRCS@%$CPUSRCS%g
# Line 4054 | Line 4507 | chmod +x $CONFIG_STATUS
4507   rm -fr confdefs* $ac_clean_files
4508   test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
4509  
4510 +
4511 + echo
4512 + echo Basilisk II configuration summary:
4513 + echo
4514 + echo XFree86 DGA support .............. : $WANT_XF86_DGA
4515 + echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
4516 + echo fbdev DGA support ................ : $WANT_FBDEV_DGA
4517 + echo ESD sound support ................ : $WANT_ESD
4518 + echo GTK user interface ............... : $WANT_GTK
4519 + echo mon debugger support ............. : $WANT_MON
4520 + echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
4521 + echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
4522 + echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
4523 + echo
4524   echo "Configuration done. Now type \"make\"."

Diff Legend

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