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-fbdev-dga use direct frame buffer access via /dev/fb [default=yes]" |
18 |
|
ac_help="$ac_help |
19 |
< |
--enable-ui use GTK user interface (default)" |
19 |
> |
--enable-esd Enlightened Sound Daemon support [default=yes]" |
20 |
> |
ac_help="$ac_help |
21 |
> |
--enable-ui use GTK user interface [default=yes]" |
22 |
|
ac_help="$ac_help |
23 |
|
--with-x use the X Window System" |
24 |
|
ac_help="$ac_help |
27 |
|
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" |
28 |
|
ac_help="$ac_help |
29 |
|
--disable-gtktest Do not try to compile and run a test GTK program" |
30 |
+ |
ac_help="$ac_help |
31 |
+ |
--with-esd-prefix=PFX Prefix where ESD is installed (optional)" |
32 |
+ |
ac_help="$ac_help |
33 |
+ |
--with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)" |
34 |
+ |
ac_help="$ac_help |
35 |
+ |
--disable-esdtest Do not try to compile and run a test ESD program" |
36 |
|
|
37 |
|
# Initialize some variables set by options. |
38 |
|
# The variables have the same names as the options, with |
548 |
|
|
549 |
|
WANT_XF86_DGA=yes |
550 |
|
WANT_FBDEV_DGA=yes |
551 |
+ |
WANT_ESD=yes |
552 |
|
WANT_UI=yes |
553 |
|
# Check whether --enable-xf86-dga or --disable-xf86-dga was given. |
554 |
|
if test "${enable_xf86_dga+set}" = set; then |
562 |
|
WANT_FBDEV_DGA=$enableval |
563 |
|
fi |
564 |
|
|
565 |
+ |
# Check whether --enable-esd or --disable-esd was given. |
566 |
+ |
if test "${enable_esd+set}" = set; then |
567 |
+ |
enableval="$enable_esd" |
568 |
+ |
WANT_ESD=$enableval |
569 |
+ |
fi |
570 |
+ |
|
571 |
|
# Check whether --enable-ui or --disable-ui was given. |
572 |
|
if test "${enable_ui+set}" = set; then |
573 |
|
enableval="$enable_ui" |
578 |
|
# Extract the first word of "gcc", so it can be a program name with args. |
579 |
|
set dummy gcc; ac_word=$2 |
580 |
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
581 |
< |
echo "configure:567: checking for $ac_word" >&5 |
581 |
> |
echo "configure:582: checking for $ac_word" >&5 |
582 |
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then |
583 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
584 |
|
else |
608 |
|
# Extract the first word of "cc", so it can be a program name with args. |
609 |
|
set dummy cc; ac_word=$2 |
610 |
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
611 |
< |
echo "configure:597: checking for $ac_word" >&5 |
611 |
> |
echo "configure:612: checking for $ac_word" >&5 |
612 |
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then |
613 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
614 |
|
else |
659 |
|
# Extract the first word of "cl", so it can be a program name with args. |
660 |
|
set dummy cl; ac_word=$2 |
661 |
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
662 |
< |
echo "configure:648: checking for $ac_word" >&5 |
662 |
> |
echo "configure:663: checking for $ac_word" >&5 |
663 |
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then |
664 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
665 |
|
else |
691 |
|
fi |
692 |
|
|
693 |
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 |
694 |
< |
echo "configure:680: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 |
694 |
> |
echo "configure:695: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 |
695 |
|
|
696 |
|
ac_ext=c |
697 |
|
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. |
702 |
|
|
703 |
|
cat > conftest.$ac_ext << EOF |
704 |
|
|
705 |
< |
#line 691 "configure" |
705 |
> |
#line 706 "configure" |
706 |
|
#include "confdefs.h" |
707 |
|
|
708 |
|
main(){return(0);} |
709 |
|
EOF |
710 |
< |
if { (eval echo configure:696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
710 |
> |
if { (eval echo configure:711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
711 |
|
ac_cv_prog_cc_works=yes |
712 |
|
# If we can't run a trivial program, we are probably using a cross compiler. |
713 |
|
if (./conftest; exit) 2>/dev/null; then |
733 |
|
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } |
734 |
|
fi |
735 |
|
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 |
736 |
< |
echo "configure:722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 |
736 |
> |
echo "configure:737: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 |
737 |
|
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 |
738 |
|
cross_compiling=$ac_cv_prog_cc_cross |
739 |
|
|
740 |
|
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 |
741 |
< |
echo "configure:727: checking whether we are using GNU C" >&5 |
741 |
> |
echo "configure:742: checking whether we are using GNU C" >&5 |
742 |
|
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then |
743 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
744 |
|
else |
747 |
|
yes; |
748 |
|
#endif |
749 |
|
EOF |
750 |
< |
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 |
750 |
> |
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then |
751 |
|
ac_cv_prog_gcc=yes |
752 |
|
else |
753 |
|
ac_cv_prog_gcc=no |
766 |
|
ac_save_CFLAGS="$CFLAGS" |
767 |
|
CFLAGS= |
768 |
|
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 |
769 |
< |
echo "configure:755: checking whether ${CC-cc} accepts -g" >&5 |
769 |
> |
echo "configure:770: checking whether ${CC-cc} accepts -g" >&5 |
770 |
|
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then |
771 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
772 |
|
else |
798 |
|
fi |
799 |
|
|
800 |
|
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 |
801 |
< |
echo "configure:787: checking how to run the C preprocessor" >&5 |
801 |
> |
echo "configure:802: checking how to run the C preprocessor" >&5 |
802 |
|
# On Suns, sometimes $CPP names a directory. |
803 |
|
if test -n "$CPP" && test -d "$CPP"; then |
804 |
|
CPP= |
813 |
|
# On the NeXT, cc -E runs the code through the compiler's parser, |
814 |
|
# not just through cpp. |
815 |
|
cat > conftest.$ac_ext <<EOF |
816 |
< |
#line 802 "configure" |
816 |
> |
#line 817 "configure" |
817 |
|
#include "confdefs.h" |
818 |
|
#include <assert.h> |
819 |
|
Syntax Error |
820 |
|
EOF |
821 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
822 |
< |
{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
822 |
> |
{ (eval echo configure:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
823 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
824 |
|
if test -z "$ac_err"; then |
825 |
|
: |
830 |
|
rm -rf conftest* |
831 |
|
CPP="${CC-cc} -E -traditional-cpp" |
832 |
|
cat > conftest.$ac_ext <<EOF |
833 |
< |
#line 819 "configure" |
833 |
> |
#line 834 "configure" |
834 |
|
#include "confdefs.h" |
835 |
|
#include <assert.h> |
836 |
|
Syntax Error |
837 |
|
EOF |
838 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
839 |
< |
{ (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
839 |
> |
{ (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
840 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
841 |
|
if test -z "$ac_err"; then |
842 |
|
: |
847 |
|
rm -rf conftest* |
848 |
|
CPP="${CC-cc} -nologo -E" |
849 |
|
cat > conftest.$ac_ext <<EOF |
850 |
< |
#line 836 "configure" |
850 |
> |
#line 851 "configure" |
851 |
|
#include "confdefs.h" |
852 |
|
#include <assert.h> |
853 |
|
Syntax Error |
854 |
|
EOF |
855 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
856 |
< |
{ (eval echo configure:842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
856 |
> |
{ (eval echo configure:857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
857 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
858 |
|
if test -z "$ac_err"; then |
859 |
|
: |
882 |
|
# Extract the first word of "$ac_prog", so it can be a program name with args. |
883 |
|
set dummy $ac_prog; ac_word=$2 |
884 |
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
885 |
< |
echo "configure:871: checking for $ac_word" >&5 |
885 |
> |
echo "configure:886: checking for $ac_word" >&5 |
886 |
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then |
887 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
888 |
|
else |
914 |
|
|
915 |
|
|
916 |
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 |
917 |
< |
echo "configure:903: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 |
917 |
> |
echo "configure:918: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 |
918 |
|
|
919 |
|
ac_ext=C |
920 |
|
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. |
925 |
|
|
926 |
|
cat > conftest.$ac_ext << EOF |
927 |
|
|
928 |
< |
#line 914 "configure" |
928 |
> |
#line 929 "configure" |
929 |
|
#include "confdefs.h" |
930 |
|
|
931 |
|
int main(){return(0);} |
932 |
|
EOF |
933 |
< |
if { (eval echo configure:919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
933 |
> |
if { (eval echo configure:934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
934 |
|
ac_cv_prog_cxx_works=yes |
935 |
|
# If we can't run a trivial program, we are probably using a cross compiler. |
936 |
|
if (./conftest; exit) 2>/dev/null; then |
956 |
|
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } |
957 |
|
fi |
958 |
|
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 |
959 |
< |
echo "configure:945: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 |
959 |
> |
echo "configure:960: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 |
960 |
|
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 |
961 |
|
cross_compiling=$ac_cv_prog_cxx_cross |
962 |
|
|
963 |
|
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 |
964 |
< |
echo "configure:950: checking whether we are using GNU C++" >&5 |
964 |
> |
echo "configure:965: checking whether we are using GNU C++" >&5 |
965 |
|
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then |
966 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
967 |
|
else |
970 |
|
yes; |
971 |
|
#endif |
972 |
|
EOF |
973 |
< |
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 |
973 |
> |
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then |
974 |
|
ac_cv_prog_gxx=yes |
975 |
|
else |
976 |
|
ac_cv_prog_gxx=no |
989 |
|
ac_save_CXXFLAGS="$CXXFLAGS" |
990 |
|
CXXFLAGS= |
991 |
|
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 |
992 |
< |
echo "configure:978: checking whether ${CXX-g++} accepts -g" >&5 |
992 |
> |
echo "configure:993: checking whether ${CXX-g++} accepts -g" >&5 |
993 |
|
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then |
994 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
995 |
|
else |
1021 |
|
fi |
1022 |
|
|
1023 |
|
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 |
1024 |
< |
echo "configure:1010: checking whether ${MAKE-make} sets \${MAKE}" >&5 |
1024 |
> |
echo "configure:1025: checking whether ${MAKE-make} sets \${MAKE}" >&5 |
1025 |
|
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` |
1026 |
|
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then |
1027 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1078 |
|
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
1079 |
|
# ./install, which can be erroneously created by make from ./install.sh. |
1080 |
|
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 |
1081 |
< |
echo "configure:1067: checking for a BSD compatible install" >&5 |
1081 |
> |
echo "configure:1082: checking for a BSD compatible install" >&5 |
1082 |
|
if test -z "$INSTALL"; then |
1083 |
|
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then |
1084 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1131 |
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
1132 |
|
|
1133 |
|
|
1134 |
+ |
echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6 |
1135 |
+ |
echo "configure:1136: checking for sem_init in -lposix4" >&5 |
1136 |
+ |
ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'` |
1137 |
+ |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1138 |
+ |
echo $ac_n "(cached) $ac_c" 1>&6 |
1139 |
+ |
else |
1140 |
+ |
ac_save_LIBS="$LIBS" |
1141 |
+ |
LIBS="-lposix4 $LIBS" |
1142 |
+ |
cat > conftest.$ac_ext <<EOF |
1143 |
+ |
#line 1144 "configure" |
1144 |
+ |
#include "confdefs.h" |
1145 |
+ |
/* Override any gcc2 internal prototype to avoid an error. */ |
1146 |
+ |
/* We use char because int might match the return type of a gcc2 |
1147 |
+ |
builtin and then its argument prototype would still apply. */ |
1148 |
+ |
char sem_init(); |
1149 |
+ |
|
1150 |
+ |
int main() { |
1151 |
+ |
sem_init() |
1152 |
+ |
; return 0; } |
1153 |
+ |
EOF |
1154 |
+ |
if { (eval echo configure:1155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1155 |
+ |
rm -rf conftest* |
1156 |
+ |
eval "ac_cv_lib_$ac_lib_var=yes" |
1157 |
+ |
else |
1158 |
+ |
echo "configure: failed program was:" >&5 |
1159 |
+ |
cat conftest.$ac_ext >&5 |
1160 |
+ |
rm -rf conftest* |
1161 |
+ |
eval "ac_cv_lib_$ac_lib_var=no" |
1162 |
+ |
fi |
1163 |
+ |
rm -f conftest* |
1164 |
+ |
LIBS="$ac_save_LIBS" |
1165 |
+ |
|
1166 |
+ |
fi |
1167 |
+ |
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then |
1168 |
+ |
echo "$ac_t""yes" 1>&6 |
1169 |
+ |
ac_tr_lib=HAVE_LIB`echo posix4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ |
1170 |
+ |
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` |
1171 |
+ |
cat >> confdefs.h <<EOF |
1172 |
+ |
#define $ac_tr_lib 1 |
1173 |
+ |
EOF |
1174 |
+ |
|
1175 |
+ |
LIBS="-lposix4 $LIBS" |
1176 |
+ |
|
1177 |
+ |
else |
1178 |
+ |
echo "$ac_t""no" 1>&6 |
1179 |
+ |
fi |
1180 |
+ |
|
1181 |
+ |
|
1182 |
|
# If we find X, set shell vars x_includes and x_libraries to the |
1183 |
|
# paths, otherwise set no_x=yes. |
1184 |
|
# Uses ac_ vars as temps to allow command line to override cache and checks. |
1185 |
|
# --without-x overrides everything else, but does not touch the cache. |
1186 |
|
echo $ac_n "checking for X""... $ac_c" 1>&6 |
1187 |
< |
echo "configure:1125: checking for X" >&5 |
1187 |
> |
echo "configure:1188: checking for X" >&5 |
1188 |
|
|
1189 |
|
# Check whether --with-x or --without-x was given. |
1190 |
|
if test "${with_x+set}" = set; then |
1246 |
|
|
1247 |
|
# First, try using that file with no special directory specified. |
1248 |
|
cat > conftest.$ac_ext <<EOF |
1249 |
< |
#line 1187 "configure" |
1249 |
> |
#line 1250 "configure" |
1250 |
|
#include "confdefs.h" |
1251 |
|
#include <$x_direct_test_include> |
1252 |
|
EOF |
1253 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
1254 |
< |
{ (eval echo configure:1192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
1254 |
> |
{ (eval echo configure:1255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
1255 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
1256 |
|
if test -z "$ac_err"; then |
1257 |
|
rm -rf conftest* |
1320 |
|
ac_save_LIBS="$LIBS" |
1321 |
|
LIBS="-l$x_direct_test_library $LIBS" |
1322 |
|
cat > conftest.$ac_ext <<EOF |
1323 |
< |
#line 1261 "configure" |
1323 |
> |
#line 1324 "configure" |
1324 |
|
#include "confdefs.h" |
1325 |
|
|
1326 |
|
int main() { |
1327 |
|
${x_direct_test_function}() |
1328 |
|
; return 0; } |
1329 |
|
EOF |
1330 |
< |
if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1330 |
> |
if { (eval echo configure:1331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1331 |
|
rm -rf conftest* |
1332 |
|
LIBS="$ac_save_LIBS" |
1333 |
|
# We can link X programs with no special library path. |
1433 |
|
case "`(uname -sr) 2>/dev/null`" in |
1434 |
|
"SunOS 5"*) |
1435 |
|
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 |
1436 |
< |
echo "configure:1374: checking whether -R must be followed by a space" >&5 |
1436 |
> |
echo "configure:1437: checking whether -R must be followed by a space" >&5 |
1437 |
|
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" |
1438 |
|
cat > conftest.$ac_ext <<EOF |
1439 |
< |
#line 1377 "configure" |
1439 |
> |
#line 1440 "configure" |
1440 |
|
#include "confdefs.h" |
1441 |
|
|
1442 |
|
int main() { |
1443 |
|
|
1444 |
|
; return 0; } |
1445 |
|
EOF |
1446 |
< |
if { (eval echo configure:1384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1446 |
> |
if { (eval echo configure:1447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1447 |
|
rm -rf conftest* |
1448 |
|
ac_R_nospace=yes |
1449 |
|
else |
1459 |
|
else |
1460 |
|
LIBS="$ac_xsave_LIBS -R $x_libraries" |
1461 |
|
cat > conftest.$ac_ext <<EOF |
1462 |
< |
#line 1400 "configure" |
1462 |
> |
#line 1463 "configure" |
1463 |
|
#include "confdefs.h" |
1464 |
|
|
1465 |
|
int main() { |
1466 |
|
|
1467 |
|
; return 0; } |
1468 |
|
EOF |
1469 |
< |
if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1469 |
> |
if { (eval echo configure:1470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1470 |
|
rm -rf conftest* |
1471 |
|
ac_R_space=yes |
1472 |
|
else |
1498 |
|
# libraries were built with DECnet support. And karl@cs.umb.edu says |
1499 |
|
# the Alpha needs dnet_stub (dnet does not exist). |
1500 |
|
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 |
1501 |
< |
echo "configure:1439: checking for dnet_ntoa in -ldnet" >&5 |
1501 |
> |
echo "configure:1502: checking for dnet_ntoa in -ldnet" >&5 |
1502 |
|
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` |
1503 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1504 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1506 |
|
ac_save_LIBS="$LIBS" |
1507 |
|
LIBS="-ldnet $LIBS" |
1508 |
|
cat > conftest.$ac_ext <<EOF |
1509 |
< |
#line 1447 "configure" |
1509 |
> |
#line 1510 "configure" |
1510 |
|
#include "confdefs.h" |
1511 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
1512 |
|
/* We use char because int might match the return type of a gcc2 |
1517 |
|
dnet_ntoa() |
1518 |
|
; return 0; } |
1519 |
|
EOF |
1520 |
< |
if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1520 |
> |
if { (eval echo configure:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1521 |
|
rm -rf conftest* |
1522 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
1523 |
|
else |
1539 |
|
|
1540 |
|
if test $ac_cv_lib_dnet_dnet_ntoa = no; then |
1541 |
|
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 |
1542 |
< |
echo "configure:1480: checking for dnet_ntoa in -ldnet_stub" >&5 |
1542 |
> |
echo "configure:1543: checking for dnet_ntoa in -ldnet_stub" >&5 |
1543 |
|
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` |
1544 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1545 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1547 |
|
ac_save_LIBS="$LIBS" |
1548 |
|
LIBS="-ldnet_stub $LIBS" |
1549 |
|
cat > conftest.$ac_ext <<EOF |
1550 |
< |
#line 1488 "configure" |
1550 |
> |
#line 1551 "configure" |
1551 |
|
#include "confdefs.h" |
1552 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
1553 |
|
/* We use char because int might match the return type of a gcc2 |
1558 |
|
dnet_ntoa() |
1559 |
|
; return 0; } |
1560 |
|
EOF |
1561 |
< |
if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1561 |
> |
if { (eval echo configure:1562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1562 |
|
rm -rf conftest* |
1563 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
1564 |
|
else |
1587 |
|
# The nsl library prevents programs from opening the X display |
1588 |
|
# on Irix 5.2, according to dickey@clark.net. |
1589 |
|
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 |
1590 |
< |
echo "configure:1528: checking for gethostbyname" >&5 |
1590 |
> |
echo "configure:1591: checking for gethostbyname" >&5 |
1591 |
|
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then |
1592 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1593 |
|
else |
1594 |
|
cat > conftest.$ac_ext <<EOF |
1595 |
< |
#line 1533 "configure" |
1595 |
> |
#line 1596 "configure" |
1596 |
|
#include "confdefs.h" |
1597 |
|
/* System header to define __stub macros and hopefully few prototypes, |
1598 |
|
which can conflict with char gethostbyname(); below. */ |
1615 |
|
|
1616 |
|
; return 0; } |
1617 |
|
EOF |
1618 |
< |
if { (eval echo configure:1556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1618 |
> |
if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1619 |
|
rm -rf conftest* |
1620 |
|
eval "ac_cv_func_gethostbyname=yes" |
1621 |
|
else |
1636 |
|
|
1637 |
|
if test $ac_cv_func_gethostbyname = no; then |
1638 |
|
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 |
1639 |
< |
echo "configure:1577: checking for gethostbyname in -lnsl" >&5 |
1639 |
> |
echo "configure:1640: checking for gethostbyname in -lnsl" >&5 |
1640 |
|
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` |
1641 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1642 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1644 |
|
ac_save_LIBS="$LIBS" |
1645 |
|
LIBS="-lnsl $LIBS" |
1646 |
|
cat > conftest.$ac_ext <<EOF |
1647 |
< |
#line 1585 "configure" |
1647 |
> |
#line 1648 "configure" |
1648 |
|
#include "confdefs.h" |
1649 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
1650 |
|
/* We use char because int might match the return type of a gcc2 |
1655 |
|
gethostbyname() |
1656 |
|
; return 0; } |
1657 |
|
EOF |
1658 |
< |
if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1658 |
> |
if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1659 |
|
rm -rf conftest* |
1660 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
1661 |
|
else |
1685 |
|
# -lsocket must be given before -lnsl if both are needed. |
1686 |
|
# We assume that if connect needs -lnsl, so does gethostbyname. |
1687 |
|
echo $ac_n "checking for connect""... $ac_c" 1>&6 |
1688 |
< |
echo "configure:1626: checking for connect" >&5 |
1688 |
> |
echo "configure:1689: checking for connect" >&5 |
1689 |
|
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then |
1690 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1691 |
|
else |
1692 |
|
cat > conftest.$ac_ext <<EOF |
1693 |
< |
#line 1631 "configure" |
1693 |
> |
#line 1694 "configure" |
1694 |
|
#include "confdefs.h" |
1695 |
|
/* System header to define __stub macros and hopefully few prototypes, |
1696 |
|
which can conflict with char connect(); below. */ |
1713 |
|
|
1714 |
|
; return 0; } |
1715 |
|
EOF |
1716 |
< |
if { (eval echo configure:1654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1716 |
> |
if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1717 |
|
rm -rf conftest* |
1718 |
|
eval "ac_cv_func_connect=yes" |
1719 |
|
else |
1734 |
|
|
1735 |
|
if test $ac_cv_func_connect = no; then |
1736 |
|
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 |
1737 |
< |
echo "configure:1675: checking for connect in -lsocket" >&5 |
1737 |
> |
echo "configure:1738: checking for connect in -lsocket" >&5 |
1738 |
|
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` |
1739 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1740 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1742 |
|
ac_save_LIBS="$LIBS" |
1743 |
|
LIBS="-lsocket $X_EXTRA_LIBS $LIBS" |
1744 |
|
cat > conftest.$ac_ext <<EOF |
1745 |
< |
#line 1683 "configure" |
1745 |
> |
#line 1746 "configure" |
1746 |
|
#include "confdefs.h" |
1747 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
1748 |
|
/* We use char because int might match the return type of a gcc2 |
1753 |
|
connect() |
1754 |
|
; return 0; } |
1755 |
|
EOF |
1756 |
< |
if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1756 |
> |
if { (eval echo configure:1757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1757 |
|
rm -rf conftest* |
1758 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
1759 |
|
else |
1777 |
|
|
1778 |
|
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. |
1779 |
|
echo $ac_n "checking for remove""... $ac_c" 1>&6 |
1780 |
< |
echo "configure:1718: checking for remove" >&5 |
1780 |
> |
echo "configure:1781: checking for remove" >&5 |
1781 |
|
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then |
1782 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1783 |
|
else |
1784 |
|
cat > conftest.$ac_ext <<EOF |
1785 |
< |
#line 1723 "configure" |
1785 |
> |
#line 1786 "configure" |
1786 |
|
#include "confdefs.h" |
1787 |
|
/* System header to define __stub macros and hopefully few prototypes, |
1788 |
|
which can conflict with char remove(); below. */ |
1805 |
|
|
1806 |
|
; return 0; } |
1807 |
|
EOF |
1808 |
< |
if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1808 |
> |
if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1809 |
|
rm -rf conftest* |
1810 |
|
eval "ac_cv_func_remove=yes" |
1811 |
|
else |
1826 |
|
|
1827 |
|
if test $ac_cv_func_remove = no; then |
1828 |
|
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 |
1829 |
< |
echo "configure:1767: checking for remove in -lposix" >&5 |
1829 |
> |
echo "configure:1830: checking for remove in -lposix" >&5 |
1830 |
|
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` |
1831 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1832 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1834 |
|
ac_save_LIBS="$LIBS" |
1835 |
|
LIBS="-lposix $LIBS" |
1836 |
|
cat > conftest.$ac_ext <<EOF |
1837 |
< |
#line 1775 "configure" |
1837 |
> |
#line 1838 "configure" |
1838 |
|
#include "confdefs.h" |
1839 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
1840 |
|
/* We use char because int might match the return type of a gcc2 |
1845 |
|
remove() |
1846 |
|
; return 0; } |
1847 |
|
EOF |
1848 |
< |
if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1848 |
> |
if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1849 |
|
rm -rf conftest* |
1850 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
1851 |
|
else |
1869 |
|
|
1870 |
|
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. |
1871 |
|
echo $ac_n "checking for shmat""... $ac_c" 1>&6 |
1872 |
< |
echo "configure:1810: checking for shmat" >&5 |
1872 |
> |
echo "configure:1873: checking for shmat" >&5 |
1873 |
|
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then |
1874 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1875 |
|
else |
1876 |
|
cat > conftest.$ac_ext <<EOF |
1877 |
< |
#line 1815 "configure" |
1877 |
> |
#line 1878 "configure" |
1878 |
|
#include "confdefs.h" |
1879 |
|
/* System header to define __stub macros and hopefully few prototypes, |
1880 |
|
which can conflict with char shmat(); below. */ |
1897 |
|
|
1898 |
|
; return 0; } |
1899 |
|
EOF |
1900 |
< |
if { (eval echo configure:1838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1900 |
> |
if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1901 |
|
rm -rf conftest* |
1902 |
|
eval "ac_cv_func_shmat=yes" |
1903 |
|
else |
1918 |
|
|
1919 |
|
if test $ac_cv_func_shmat = no; then |
1920 |
|
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 |
1921 |
< |
echo "configure:1859: checking for shmat in -lipc" >&5 |
1921 |
> |
echo "configure:1922: checking for shmat in -lipc" >&5 |
1922 |
|
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` |
1923 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1924 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1926 |
|
ac_save_LIBS="$LIBS" |
1927 |
|
LIBS="-lipc $LIBS" |
1928 |
|
cat > conftest.$ac_ext <<EOF |
1929 |
< |
#line 1867 "configure" |
1929 |
> |
#line 1930 "configure" |
1930 |
|
#include "confdefs.h" |
1931 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
1932 |
|
/* We use char because int might match the return type of a gcc2 |
1937 |
|
shmat() |
1938 |
|
; return 0; } |
1939 |
|
EOF |
1940 |
< |
if { (eval echo configure:1878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1940 |
> |
if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1941 |
|
rm -rf conftest* |
1942 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
1943 |
|
else |
1970 |
|
# libraries we check for below, so use a different variable. |
1971 |
|
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu. |
1972 |
|
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 |
1973 |
< |
echo "configure:1911: checking for IceConnectionNumber in -lICE" >&5 |
1973 |
> |
echo "configure:1974: checking for IceConnectionNumber in -lICE" >&5 |
1974 |
|
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` |
1975 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
1976 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
1978 |
|
ac_save_LIBS="$LIBS" |
1979 |
|
LIBS="-lICE $X_EXTRA_LIBS $LIBS" |
1980 |
|
cat > conftest.$ac_ext <<EOF |
1981 |
< |
#line 1919 "configure" |
1981 |
> |
#line 1982 "configure" |
1982 |
|
#include "confdefs.h" |
1983 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
1984 |
|
/* We use char because int might match the return type of a gcc2 |
1989 |
|
IceConnectionNumber() |
1990 |
|
; return 0; } |
1991 |
|
EOF |
1992 |
< |
if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1992 |
> |
if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
1993 |
|
rm -rf conftest* |
1994 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
1995 |
|
else |
2016 |
|
if [ "x$no_x" = "xyes" ]; then |
2017 |
|
{ echo "configure: error: You need X11 to run Basilisk II." 1>&2; exit 1; } |
2018 |
|
fi |
1956 |
– |
|
2019 |
|
CFLAGS="$CFLAGS $X_CFLAGS" |
2020 |
|
CXXFLAGS="$CXXFLAGS $X_CFLAGS" |
2021 |
|
LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS" |
1960 |
– |
STATICLIBS= |
2022 |
|
|
2023 |
|
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 |
2024 |
< |
echo "configure:1964: checking for pthread_create in -lpthread" >&5 |
2024 |
> |
echo "configure:2025: checking for pthread_create in -lpthread" >&5 |
2025 |
|
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` |
2026 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
2027 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2029 |
|
ac_save_LIBS="$LIBS" |
2030 |
|
LIBS="-lpthread $LIBS" |
2031 |
|
cat > conftest.$ac_ext <<EOF |
2032 |
< |
#line 1972 "configure" |
2032 |
> |
#line 2033 "configure" |
2033 |
|
#include "confdefs.h" |
2034 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
2035 |
|
/* We use char because int might match the return type of a gcc2 |
2040 |
|
pthread_create() |
2041 |
|
; return 0; } |
2042 |
|
EOF |
2043 |
< |
if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2043 |
> |
if { (eval echo configure:2044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2044 |
|
rm -rf conftest* |
2045 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
2046 |
|
else |
2055 |
|
fi |
2056 |
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then |
2057 |
|
echo "$ac_t""yes" 1>&6 |
2058 |
< |
HAVE_PTHREADS=yes |
2058 |
> |
ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \ |
2059 |
> |
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` |
2060 |
> |
cat >> confdefs.h <<EOF |
2061 |
> |
#define $ac_tr_lib 1 |
2062 |
> |
EOF |
2063 |
> |
|
2064 |
> |
LIBS="-lpthread $LIBS" |
2065 |
> |
|
2066 |
|
else |
2067 |
|
echo "$ac_t""no" 1>&6 |
2000 |
– |
HAVE_PTHREADS=no |
2001 |
– |
fi |
2068 |
|
|
2069 |
< |
if [ "x$HAVE_PTHREADS" = "xno" ]; then |
2070 |
< |
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 |
2069 |
> |
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 |
2070 |
> |
echo "configure:2071: checking for pthread_create in -lc_r" >&5 |
2071 |
|
ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` |
2072 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
2073 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2075 |
|
ac_save_LIBS="$LIBS" |
2076 |
|
LIBS="-lc_r $LIBS" |
2077 |
|
cat > conftest.$ac_ext <<EOF |
2078 |
< |
#line 2014 "configure" |
2078 |
> |
#line 2079 "configure" |
2079 |
|
#include "confdefs.h" |
2080 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
2081 |
|
/* We use char because int might match the return type of a gcc2 |
2086 |
|
pthread_create() |
2087 |
|
; return 0; } |
2088 |
|
EOF |
2089 |
< |
if { (eval echo configure:2025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2089 |
> |
if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2090 |
|
rm -rf conftest* |
2091 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
2092 |
|
else |
2101 |
|
fi |
2102 |
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then |
2103 |
|
echo "$ac_t""yes" 1>&6 |
2104 |
< |
HAVE_PTHREADS=yes |
2104 |
> |
ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \ |
2105 |
> |
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` |
2106 |
> |
cat >> confdefs.h <<EOF |
2107 |
> |
#define $ac_tr_lib 1 |
2108 |
> |
EOF |
2109 |
> |
|
2110 |
> |
LIBS="-lc_r $LIBS" |
2111 |
> |
|
2112 |
|
else |
2113 |
|
echo "$ac_t""no" 1>&6 |
2042 |
– |
HAVE_PTHREADS=no |
2043 |
– |
fi |
2114 |
|
|
2115 |
< |
if [ "x$HAVE_PTHREADS" = "xno" ]; then |
2116 |
< |
echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6 |
2047 |
< |
echo "configure:2048: checking for pthread_create in -lPTL" >&5 |
2115 |
> |
echo $ac_n "checking for pthread_create in -lPTL""... $ac_c" 1>&6 |
2116 |
> |
echo "configure:2117: checking for pthread_create in -lPTL" >&5 |
2117 |
|
ac_lib_var=`echo PTL'_'pthread_create | sed 'y%./+-%__p_%'` |
2118 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
2119 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2121 |
|
ac_save_LIBS="$LIBS" |
2122 |
|
LIBS="-lPTL $LIBS" |
2123 |
|
cat > conftest.$ac_ext <<EOF |
2124 |
< |
#line 2056 "configure" |
2124 |
> |
#line 2125 "configure" |
2125 |
|
#include "confdefs.h" |
2126 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
2127 |
|
/* We use char because int might match the return type of a gcc2 |
2132 |
|
pthread_create() |
2133 |
|
; return 0; } |
2134 |
|
EOF |
2135 |
< |
if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2135 |
> |
if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2136 |
|
rm -rf conftest* |
2137 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
2138 |
|
else |
2147 |
|
fi |
2148 |
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then |
2149 |
|
echo "$ac_t""yes" 1>&6 |
2150 |
< |
HAVE_PTHREADS=yes |
2150 |
> |
ac_tr_lib=HAVE_LIB`echo PTL | sed -e 's/[^a-zA-Z0-9_]/_/g' \ |
2151 |
> |
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` |
2152 |
> |
cat >> confdefs.h <<EOF |
2153 |
> |
#define $ac_tr_lib 1 |
2154 |
> |
EOF |
2155 |
> |
|
2156 |
> |
LIBS="-lPTL $LIBS" |
2157 |
> |
|
2158 |
|
else |
2159 |
|
echo "$ac_t""no" 1>&6 |
2084 |
– |
HAVE_PTHREADS=no |
2085 |
– |
fi |
2160 |
|
|
2087 |
– |
if [ "x$HAVE_PTHREADS" = "xno" ]; then |
2161 |
|
{ echo "configure: error: You need pthreads to run Basilisk II." 1>&2; exit 1; } |
2162 |
< |
else |
2090 |
< |
LIBS="$LIBS -lPTL" |
2091 |
< |
fi |
2092 |
< |
else |
2093 |
< |
LIBS="$LIBS -lc_r" |
2094 |
< |
fi |
2095 |
< |
else |
2096 |
< |
LIBS="$LIBS -lpthread" |
2162 |
> |
|
2163 |
|
fi |
2164 |
< |
for ac_func in pthread_cancel |
2164 |
> |
|
2165 |
> |
|
2166 |
> |
fi |
2167 |
> |
|
2168 |
> |
|
2169 |
> |
fi |
2170 |
> |
|
2171 |
> |
|
2172 |
> |
SEMSRCS= |
2173 |
> |
for ac_func in sem_init |
2174 |
|
do |
2175 |
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
2176 |
< |
echo "configure:2102: checking for $ac_func" >&5 |
2176 |
> |
echo "configure:2177: checking for $ac_func" >&5 |
2177 |
|
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
2178 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2179 |
|
else |
2180 |
|
cat > conftest.$ac_ext <<EOF |
2181 |
< |
#line 2107 "configure" |
2181 |
> |
#line 2182 "configure" |
2182 |
|
#include "confdefs.h" |
2183 |
|
/* System header to define __stub macros and hopefully few prototypes, |
2184 |
|
which can conflict with char $ac_func(); below. */ |
2201 |
|
|
2202 |
|
; return 0; } |
2203 |
|
EOF |
2204 |
< |
if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2204 |
> |
if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2205 |
|
rm -rf conftest* |
2206 |
|
eval "ac_cv_func_$ac_func=yes" |
2207 |
|
else |
2222 |
|
|
2223 |
|
else |
2224 |
|
echo "$ac_t""no" 1>&6 |
2225 |
+ |
SEMSRCS=posix_sem.cpp |
2226 |
+ |
|
2227 |
|
fi |
2228 |
|
done |
2229 |
|
|
2230 |
|
|
2231 |
|
if [ "x$WANT_XF86_DGA" = "xyes" ]; then |
2232 |
|
echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 |
2233 |
< |
echo "configure:2157: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 |
2233 |
> |
echo "configure:2234: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 |
2234 |
|
ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'` |
2235 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
2236 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2238 |
|
ac_save_LIBS="$LIBS" |
2239 |
|
LIBS="-lXxf86dga $LIBS" |
2240 |
|
cat > conftest.$ac_ext <<EOF |
2241 |
< |
#line 2165 "configure" |
2241 |
> |
#line 2242 "configure" |
2242 |
|
#include "confdefs.h" |
2243 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
2244 |
|
/* We use char because int might match the return type of a gcc2 |
2249 |
|
XF86DGAQueryExtension() |
2250 |
|
; return 0; } |
2251 |
|
EOF |
2252 |
< |
if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2252 |
> |
if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2253 |
|
rm -rf conftest* |
2254 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
2255 |
|
else |
2264 |
|
fi |
2265 |
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then |
2266 |
|
echo "$ac_t""yes" 1>&6 |
2267 |
< |
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 |
2267 |
> |
|
2268 |
|
DEFINES="$DEFINES -DENABLE_XF86_DGA=1" |
2269 |
|
LIBS="$LIBS -lXxf86dga" |
2270 |
|
if [ "x$WANT_FBDEV_DGA" = "xyes" ]; then |
2271 |
|
echo "configure: warning: Cannot have both --enable-xf86-dga and --enable-fbdev-dga, ignoring --enable-fbdev-dga." 1>&2 |
2272 |
|
WANT_FBDEV_DGA=no |
2273 |
|
fi |
2274 |
< |
fi |
2274 |
> |
|
2275 |
> |
else |
2276 |
> |
echo "$ac_t""no" 1>&6 |
2277 |
> |
|
2278 |
> |
echo "configure: warning: Could not find XFree86 DGA extension, ignoring --enable-xf86-dga." 1>&2 |
2279 |
> |
DEFINES="$DEFINES -DENABLE_XF86_DGA=0" |
2280 |
> |
|
2281 |
> |
fi |
2282 |
> |
|
2283 |
|
else |
2284 |
|
DEFINES="$DEFINES -DENABLE_XF86_DGA=0" |
2285 |
|
fi |
2289 |
|
DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0" |
2290 |
|
fi |
2291 |
|
|
2292 |
+ |
UISRCS=../dummy/prefs_editor_dummy.cpp |
2293 |
|
if [ "x$WANT_UI" = "xyes" ]; then |
2294 |
|
# Check whether --with-gtk-prefix or --without-gtk-prefix was given. |
2295 |
|
if test "${with_gtk_prefix+set}" = set; then |
2332 |
|
# Extract the first word of "gtk-config", so it can be a program name with args. |
2333 |
|
set dummy gtk-config; ac_word=$2 |
2334 |
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
2335 |
< |
echo "configure:2259: checking for $ac_word" >&5 |
2335 |
> |
echo "configure:2336: checking for $ac_word" >&5 |
2336 |
|
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then |
2337 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2338 |
|
else |
2367 |
|
|
2368 |
|
min_gtk_version=1.2.0 |
2369 |
|
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 |
2370 |
< |
echo "configure:2294: checking for GTK - version >= $min_gtk_version" >&5 |
2370 |
> |
echo "configure:2371: checking for GTK - version >= $min_gtk_version" >&5 |
2371 |
|
no_gtk="" |
2372 |
|
if test "$GTK_CONFIG" = "no" ; then |
2373 |
|
no_gtk=yes |
2390 |
|
echo $ac_n "cross compiling; assumed OK... $ac_c" |
2391 |
|
else |
2392 |
|
cat > conftest.$ac_ext <<EOF |
2393 |
< |
#line 2317 "configure" |
2393 |
> |
#line 2394 "configure" |
2394 |
|
#include "confdefs.h" |
2395 |
|
|
2396 |
|
#include <gtk/gtk.h> |
2453 |
|
} |
2454 |
|
|
2455 |
|
EOF |
2456 |
< |
if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
2456 |
> |
if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
2457 |
|
then |
2458 |
|
: |
2459 |
|
else |
2471 |
|
fi |
2472 |
|
if test "x$no_gtk" = x ; then |
2473 |
|
echo "$ac_t""yes" 1>&6 |
2474 |
< |
: |
2474 |
> |
|
2475 |
> |
DEFINES="$DEFINES -DENABLE_GTK=1" |
2476 |
> |
CFLAGS="$CFLAGS $GTK_CFLAGS" |
2477 |
> |
CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" |
2478 |
> |
LIBS="$LIBS $GTK_LIBS" |
2479 |
> |
UISRCS=prefs_editor_gtk.cpp |
2480 |
> |
|
2481 |
|
else |
2482 |
|
echo "$ac_t""no" 1>&6 |
2483 |
|
if test "$GTK_CONFIG" = "no" ; then |
2493 |
|
CFLAGS="$CFLAGS $GTK_CFLAGS" |
2494 |
|
LIBS="$LIBS $GTK_LIBS" |
2495 |
|
cat > conftest.$ac_ext <<EOF |
2496 |
< |
#line 2414 "configure" |
2496 |
> |
#line 2497 "configure" |
2497 |
|
#include "confdefs.h" |
2498 |
|
|
2499 |
|
#include <gtk/gtk.h> |
2503 |
|
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); |
2504 |
|
; return 0; } |
2505 |
|
EOF |
2506 |
< |
if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2506 |
> |
if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2507 |
|
rm -rf conftest* |
2508 |
|
echo "*** The test program compiled, but did not run. This usually means" |
2509 |
|
echo "*** that the run-time linker is not finding GTK or finding the wrong" |
2535 |
|
fi |
2536 |
|
GTK_CFLAGS="" |
2537 |
|
GTK_LIBS="" |
2538 |
< |
: |
2538 |
> |
|
2539 |
> |
echo "configure: warning: Could not find GTK+, disabling user interface." 1>&2 |
2540 |
> |
WANT_UI=no |
2541 |
> |
|
2542 |
|
fi |
2543 |
|
|
2544 |
|
|
2545 |
|
rm -f conf.gtktest |
2546 |
|
|
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" |
2547 |
|
fi |
2548 |
|
|
2549 |
< |
SEMSRCS= |
2550 |
< |
for ac_func in sem_init |
2551 |
< |
do |
2552 |
< |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
2553 |
< |
echo "configure:2479: checking for $ac_func" >&5 |
2554 |
< |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
2549 |
> |
if [ "x$WANT_ESD" = "xyes" ]; then |
2550 |
> |
# Check whether --with-esd-prefix or --without-esd-prefix was given. |
2551 |
> |
if test "${with_esd_prefix+set}" = set; then |
2552 |
> |
withval="$with_esd_prefix" |
2553 |
> |
esd_prefix="$withval" |
2554 |
> |
else |
2555 |
> |
esd_prefix="" |
2556 |
> |
fi |
2557 |
> |
|
2558 |
> |
# Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given. |
2559 |
> |
if test "${with_esd_exec_prefix+set}" = set; then |
2560 |
> |
withval="$with_esd_exec_prefix" |
2561 |
> |
esd_exec_prefix="$withval" |
2562 |
> |
else |
2563 |
> |
esd_exec_prefix="" |
2564 |
> |
fi |
2565 |
> |
|
2566 |
> |
# Check whether --enable-esdtest or --disable-esdtest was given. |
2567 |
> |
if test "${enable_esdtest+set}" = set; then |
2568 |
> |
enableval="$enable_esdtest" |
2569 |
> |
: |
2570 |
> |
else |
2571 |
> |
enable_esdtest=yes |
2572 |
> |
fi |
2573 |
> |
|
2574 |
> |
|
2575 |
> |
if test x$esd_exec_prefix != x ; then |
2576 |
> |
esd_args="$esd_args --exec-prefix=$esd_exec_prefix" |
2577 |
> |
if test x${ESD_CONFIG+set} != xset ; then |
2578 |
> |
ESD_CONFIG=$esd_exec_prefix/bin/esd-config |
2579 |
> |
fi |
2580 |
> |
fi |
2581 |
> |
if test x$esd_prefix != x ; then |
2582 |
> |
esd_args="$esd_args --prefix=$esd_prefix" |
2583 |
> |
if test x${ESD_CONFIG+set} != xset ; then |
2584 |
> |
ESD_CONFIG=$esd_prefix/bin/esd-config |
2585 |
> |
fi |
2586 |
> |
fi |
2587 |
> |
|
2588 |
> |
# Extract the first word of "esd-config", so it can be a program name with args. |
2589 |
> |
set dummy esd-config; ac_word=$2 |
2590 |
> |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
2591 |
> |
echo "configure:2592: checking for $ac_word" >&5 |
2592 |
> |
if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then |
2593 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2594 |
|
else |
2595 |
+ |
case "$ESD_CONFIG" in |
2596 |
+ |
/*) |
2597 |
+ |
ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a path. |
2598 |
+ |
;; |
2599 |
+ |
?:/*) |
2600 |
+ |
ac_cv_path_ESD_CONFIG="$ESD_CONFIG" # Let the user override the test with a dos path. |
2601 |
+ |
;; |
2602 |
+ |
*) |
2603 |
+ |
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" |
2604 |
+ |
ac_dummy="$PATH" |
2605 |
+ |
for ac_dir in $ac_dummy; do |
2606 |
+ |
test -z "$ac_dir" && ac_dir=. |
2607 |
+ |
if test -f $ac_dir/$ac_word; then |
2608 |
+ |
ac_cv_path_ESD_CONFIG="$ac_dir/$ac_word" |
2609 |
+ |
break |
2610 |
+ |
fi |
2611 |
+ |
done |
2612 |
+ |
IFS="$ac_save_ifs" |
2613 |
+ |
test -z "$ac_cv_path_ESD_CONFIG" && ac_cv_path_ESD_CONFIG="no" |
2614 |
+ |
;; |
2615 |
+ |
esac |
2616 |
+ |
fi |
2617 |
+ |
ESD_CONFIG="$ac_cv_path_ESD_CONFIG" |
2618 |
+ |
if test -n "$ESD_CONFIG"; then |
2619 |
+ |
echo "$ac_t""$ESD_CONFIG" 1>&6 |
2620 |
+ |
else |
2621 |
+ |
echo "$ac_t""no" 1>&6 |
2622 |
+ |
fi |
2623 |
+ |
|
2624 |
+ |
min_esd_version=0.2.8 |
2625 |
+ |
echo $ac_n "checking for ESD - version >= $min_esd_version""... $ac_c" 1>&6 |
2626 |
+ |
echo "configure:2627: checking for ESD - version >= $min_esd_version" >&5 |
2627 |
+ |
no_esd="" |
2628 |
+ |
if test "$ESD_CONFIG" = "no" ; then |
2629 |
+ |
no_esd=yes |
2630 |
+ |
else |
2631 |
+ |
ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` |
2632 |
+ |
ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` |
2633 |
+ |
|
2634 |
+ |
esd_major_version=`$ESD_CONFIG $esd_args --version | \ |
2635 |
+ |
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` |
2636 |
+ |
esd_minor_version=`$ESD_CONFIG $esd_args --version | \ |
2637 |
+ |
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` |
2638 |
+ |
esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ |
2639 |
+ |
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` |
2640 |
+ |
if test "x$enable_esdtest" = "xyes" ; then |
2641 |
+ |
ac_save_CFLAGS="$CFLAGS" |
2642 |
+ |
ac_save_LIBS="$LIBS" |
2643 |
+ |
CFLAGS="$CFLAGS $ESD_CFLAGS" |
2644 |
+ |
LIBS="$LIBS $ESD_LIBS" |
2645 |
+ |
rm -f conf.esdtest |
2646 |
+ |
if test "$cross_compiling" = yes; then |
2647 |
+ |
echo $ac_n "cross compiling; assumed OK... $ac_c" |
2648 |
+ |
else |
2649 |
|
cat > conftest.$ac_ext <<EOF |
2650 |
< |
#line 2484 "configure" |
2650 |
> |
#line 2651 "configure" |
2651 |
|
#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(); |
2652 |
|
|
2653 |
< |
int main() { |
2653 |
> |
#include <stdio.h> |
2654 |
> |
#include <stdlib.h> |
2655 |
> |
#include <string.h> |
2656 |
> |
#include <esd.h> |
2657 |
> |
|
2658 |
> |
char* |
2659 |
> |
my_strdup (char *str) |
2660 |
> |
{ |
2661 |
> |
char *new_str; |
2662 |
> |
|
2663 |
> |
if (str) |
2664 |
> |
{ |
2665 |
> |
new_str = malloc ((strlen (str) + 1) * sizeof(char)); |
2666 |
> |
strcpy (new_str, str); |
2667 |
> |
} |
2668 |
> |
else |
2669 |
> |
new_str = NULL; |
2670 |
> |
|
2671 |
> |
return new_str; |
2672 |
> |
} |
2673 |
> |
|
2674 |
> |
int main () |
2675 |
> |
{ |
2676 |
> |
int major, minor, micro; |
2677 |
> |
char *tmp_version; |
2678 |
> |
|
2679 |
> |
system ("touch conf.esdtest"); |
2680 |
> |
|
2681 |
> |
/* HP/UX 9 (%@#!) writes to sscanf strings */ |
2682 |
> |
tmp_version = my_strdup("$min_esd_version"); |
2683 |
> |
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { |
2684 |
> |
printf("%s, bad version string\n", "$min_esd_version"); |
2685 |
> |
exit(1); |
2686 |
> |
} |
2687 |
> |
|
2688 |
> |
if (($esd_major_version > major) || |
2689 |
> |
(($esd_major_version == major) && ($esd_minor_version > minor)) || |
2690 |
> |
(($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) |
2691 |
> |
{ |
2692 |
> |
return 0; |
2693 |
> |
} |
2694 |
> |
else |
2695 |
> |
{ |
2696 |
> |
printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); |
2697 |
> |
printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); |
2698 |
> |
printf("*** best to upgrade to the required version.\n"); |
2699 |
> |
printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); |
2700 |
> |
printf("*** to point to the correct copy of esd-config, and remove the file\n"); |
2701 |
> |
printf("*** config.cache before re-running configure\n"); |
2702 |
> |
return 1; |
2703 |
> |
} |
2704 |
> |
} |
2705 |
|
|
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 |
2706 |
|
|
2504 |
– |
; return 0; } |
2707 |
|
EOF |
2708 |
< |
if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2709 |
< |
rm -rf conftest* |
2710 |
< |
eval "ac_cv_func_$ac_func=yes" |
2708 |
> |
if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
2709 |
> |
then |
2710 |
> |
: |
2711 |
|
else |
2712 |
|
echo "configure: failed program was:" >&5 |
2713 |
|
cat conftest.$ac_ext >&5 |
2714 |
< |
rm -rf conftest* |
2715 |
< |
eval "ac_cv_func_$ac_func=no" |
2514 |
< |
fi |
2515 |
< |
rm -f conftest* |
2714 |
> |
rm -fr conftest* |
2715 |
> |
no_esd=yes |
2716 |
|
fi |
2717 |
< |
|
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 |
2717 |
> |
rm -fr conftest* |
2718 |
|
fi |
2528 |
– |
done |
2719 |
|
|
2720 |
< |
if [ "x$ac_cv_func_sem_init" = "xno" ]; then |
2721 |
< |
echo $ac_n "checking for sem_init in -lposix4""... $ac_c" 1>&6 |
2722 |
< |
echo "configure:2533: checking for sem_init in -lposix4" >&5 |
2723 |
< |
ac_lib_var=`echo posix4'_'sem_init | sed 'y%./+-%__p_%'` |
2724 |
< |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
2725 |
< |
echo $ac_n "(cached) $ac_c" 1>&6 |
2726 |
< |
else |
2727 |
< |
ac_save_LIBS="$LIBS" |
2728 |
< |
LIBS="-lposix4 $LIBS" |
2729 |
< |
cat > conftest.$ac_ext <<EOF |
2730 |
< |
#line 2541 "configure" |
2720 |
> |
CFLAGS="$ac_save_CFLAGS" |
2721 |
> |
LIBS="$ac_save_LIBS" |
2722 |
> |
fi |
2723 |
> |
fi |
2724 |
> |
if test "x$no_esd" = x ; then |
2725 |
> |
echo "$ac_t""yes" 1>&6 |
2726 |
> |
|
2727 |
> |
DEFINES="$DEFINES -DENABLE_ESD=1" |
2728 |
> |
CFLAGS="$CFLAGS $ESD_CFLAGS" |
2729 |
> |
CXXFLAGS="$CXXFLAGS $ESD_CFLAGS" |
2730 |
> |
LIBS="$LIBS $ESD_LIBS" |
2731 |
> |
|
2732 |
> |
else |
2733 |
> |
echo "$ac_t""no" 1>&6 |
2734 |
> |
if test "$ESD_CONFIG" = "no" ; then |
2735 |
> |
echo "*** The esd-config script installed by ESD could not be found" |
2736 |
> |
echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" |
2737 |
> |
echo "*** your path, or set the ESD_CONFIG environment variable to the" |
2738 |
> |
echo "*** full path to esd-config." |
2739 |
> |
else |
2740 |
> |
if test -f conf.esdtest ; then |
2741 |
> |
: |
2742 |
> |
else |
2743 |
> |
echo "*** Could not run ESD test program, checking why..." |
2744 |
> |
CFLAGS="$CFLAGS $ESD_CFLAGS" |
2745 |
> |
LIBS="$LIBS $ESD_LIBS" |
2746 |
> |
cat > conftest.$ac_ext <<EOF |
2747 |
> |
#line 2748 "configure" |
2748 |
|
#include "confdefs.h" |
2749 |
< |
/* Override any gcc2 internal prototype to avoid an error. */ |
2750 |
< |
/* We use char because int might match the return type of a gcc2 |
2751 |
< |
builtin and then its argument prototype would still apply. */ |
2545 |
< |
char sem_init(); |
2749 |
> |
|
2750 |
> |
#include <stdio.h> |
2751 |
> |
#include <esd.h> |
2752 |
|
|
2753 |
|
int main() { |
2754 |
< |
sem_init() |
2754 |
> |
return 0; |
2755 |
|
; return 0; } |
2756 |
|
EOF |
2757 |
< |
if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2757 |
> |
if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
2758 |
|
rm -rf conftest* |
2759 |
< |
eval "ac_cv_lib_$ac_lib_var=yes" |
2759 |
> |
echo "*** The test program compiled, but did not run. This usually means" |
2760 |
> |
echo "*** that the run-time linker is not finding ESD or finding the wrong" |
2761 |
> |
echo "*** version of ESD. If it is not finding ESD, you'll need to set your" |
2762 |
> |
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" |
2763 |
> |
echo "*** to the installed location Also, make sure you have run ldconfig if that" |
2764 |
> |
echo "*** is required on your system" |
2765 |
> |
echo "***" |
2766 |
> |
echo "*** If you have an old version installed, it is best to remove it, although" |
2767 |
> |
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" |
2768 |
|
else |
2769 |
|
echo "configure: failed program was:" >&5 |
2770 |
|
cat conftest.$ac_ext >&5 |
2771 |
|
rm -rf conftest* |
2772 |
< |
eval "ac_cv_lib_$ac_lib_var=no" |
2772 |
> |
echo "*** The test program failed to compile or link. See the file config.log for the" |
2773 |
> |
echo "*** exact error that occured. This usually means ESD was incorrectly installed" |
2774 |
> |
echo "*** or that you have moved ESD since it was installed. In the latter case, you" |
2775 |
> |
echo "*** may want to edit the esd-config script: $ESD_CONFIG" |
2776 |
|
fi |
2777 |
|
rm -f conftest* |
2778 |
< |
LIBS="$ac_save_LIBS" |
2779 |
< |
|
2780 |
< |
fi |
2781 |
< |
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then |
2782 |
< |
echo "$ac_t""yes" 1>&6 |
2783 |
< |
HAVE_LIBPOSIX4=yes |
2784 |
< |
else |
2785 |
< |
echo "$ac_t""no" 1>&6 |
2786 |
< |
HAVE_LIBPOSIX4=no |
2787 |
< |
fi |
2571 |
< |
|
2572 |
< |
if [ "x$HAVE_LIBPOSIX4" = "xno" ]; then |
2573 |
< |
SEMSRCS="posix_sem.cpp" |
2574 |
< |
else |
2575 |
< |
LIBS="$LIBS -lposix4" |
2778 |
> |
CFLAGS="$ac_save_CFLAGS" |
2779 |
> |
LIBS="$ac_save_LIBS" |
2780 |
> |
fi |
2781 |
> |
fi |
2782 |
> |
ESD_CFLAGS="" |
2783 |
> |
ESD_LIBS="" |
2784 |
> |
|
2785 |
> |
echo "configure: warning: Could not find ESD, disabling ESD support." 1>&2 |
2786 |
> |
WANT_ESD=no |
2787 |
> |
|
2788 |
|
fi |
2789 |
+ |
|
2790 |
+ |
|
2791 |
+ |
rm -f conf.esdtest |
2792 |
+ |
|
2793 |
|
fi |
2794 |
|
|
2795 |
|
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 |
2796 |
< |
echo "configure:2581: checking for ANSI C header files" >&5 |
2796 |
> |
echo "configure:2797: checking for ANSI C header files" >&5 |
2797 |
|
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then |
2798 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2799 |
|
else |
2800 |
|
cat > conftest.$ac_ext <<EOF |
2801 |
< |
#line 2586 "configure" |
2801 |
> |
#line 2802 "configure" |
2802 |
|
#include "confdefs.h" |
2803 |
|
#include <stdlib.h> |
2804 |
|
#include <stdarg.h> |
2806 |
|
#include <float.h> |
2807 |
|
EOF |
2808 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
2809 |
< |
{ (eval echo configure:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
2809 |
> |
{ (eval echo configure:2810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
2810 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
2811 |
|
if test -z "$ac_err"; then |
2812 |
|
rm -rf conftest* |
2823 |
|
if test $ac_cv_header_stdc = yes; then |
2824 |
|
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. |
2825 |
|
cat > conftest.$ac_ext <<EOF |
2826 |
< |
#line 2611 "configure" |
2826 |
> |
#line 2827 "configure" |
2827 |
|
#include "confdefs.h" |
2828 |
|
#include <string.h> |
2829 |
|
EOF |
2841 |
|
if test $ac_cv_header_stdc = yes; then |
2842 |
|
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. |
2843 |
|
cat > conftest.$ac_ext <<EOF |
2844 |
< |
#line 2629 "configure" |
2844 |
> |
#line 2845 "configure" |
2845 |
|
#include "confdefs.h" |
2846 |
|
#include <stdlib.h> |
2847 |
|
EOF |
2862 |
|
: |
2863 |
|
else |
2864 |
|
cat > conftest.$ac_ext <<EOF |
2865 |
< |
#line 2650 "configure" |
2865 |
> |
#line 2866 "configure" |
2866 |
|
#include "confdefs.h" |
2867 |
|
#include <ctype.h> |
2868 |
|
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') |
2873 |
|
exit (0); } |
2874 |
|
|
2875 |
|
EOF |
2876 |
< |
if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
2876 |
> |
if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
2877 |
|
then |
2878 |
|
: |
2879 |
|
else |
2900 |
|
do |
2901 |
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
2902 |
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
2903 |
< |
echo "configure:2688: checking for $ac_hdr" >&5 |
2903 |
> |
echo "configure:2904: checking for $ac_hdr" >&5 |
2904 |
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
2905 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2906 |
|
else |
2907 |
|
cat > conftest.$ac_ext <<EOF |
2908 |
< |
#line 2693 "configure" |
2908 |
> |
#line 2909 "configure" |
2909 |
|
#include "confdefs.h" |
2910 |
|
#include <$ac_hdr> |
2911 |
|
EOF |
2912 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
2913 |
< |
{ (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
2913 |
> |
{ (eval echo configure:2914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
2914 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
2915 |
|
if test -z "$ac_err"; then |
2916 |
|
rm -rf conftest* |
2938 |
|
|
2939 |
|
|
2940 |
|
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 |
2941 |
< |
echo "configure:2726: checking whether byte ordering is bigendian" >&5 |
2941 |
> |
echo "configure:2942: checking whether byte ordering is bigendian" >&5 |
2942 |
|
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then |
2943 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
2944 |
|
else |
2945 |
|
ac_cv_c_bigendian=unknown |
2946 |
|
# See if sys/param.h defines the BYTE_ORDER macro. |
2947 |
|
cat > conftest.$ac_ext <<EOF |
2948 |
< |
#line 2733 "configure" |
2948 |
> |
#line 2949 "configure" |
2949 |
|
#include "confdefs.h" |
2950 |
|
#include <sys/types.h> |
2951 |
|
#include <sys/param.h> |
2956 |
|
#endif |
2957 |
|
; return 0; } |
2958 |
|
EOF |
2959 |
< |
if { (eval echo configure:2744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
2959 |
> |
if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
2960 |
|
rm -rf conftest* |
2961 |
|
# It does; now see whether it defined to BIG_ENDIAN or not. |
2962 |
|
cat > conftest.$ac_ext <<EOF |
2963 |
< |
#line 2748 "configure" |
2963 |
> |
#line 2964 "configure" |
2964 |
|
#include "confdefs.h" |
2965 |
|
#include <sys/types.h> |
2966 |
|
#include <sys/param.h> |
2971 |
|
#endif |
2972 |
|
; return 0; } |
2973 |
|
EOF |
2974 |
< |
if { (eval echo configure:2759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
2974 |
> |
if { (eval echo configure:2975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
2975 |
|
rm -rf conftest* |
2976 |
|
ac_cv_c_bigendian=yes |
2977 |
|
else |
2991 |
|
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } |
2992 |
|
else |
2993 |
|
cat > conftest.$ac_ext <<EOF |
2994 |
< |
#line 2779 "configure" |
2994 |
> |
#line 2995 "configure" |
2995 |
|
#include "confdefs.h" |
2996 |
|
main () { |
2997 |
|
/* Are we little or big endian? From Harbison&Steele. */ |
3004 |
|
exit (u.c[sizeof (long) - 1] == 1); |
3005 |
|
} |
3006 |
|
EOF |
3007 |
< |
if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3007 |
> |
if { (eval echo configure:3008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3008 |
|
then |
3009 |
|
ac_cv_c_bigendian=no |
3010 |
|
else |
3028 |
|
fi |
3029 |
|
|
3030 |
|
echo $ac_n "checking for working const""... $ac_c" 1>&6 |
3031 |
< |
echo "configure:2816: checking for working const" >&5 |
3031 |
> |
echo "configure:3032: checking for working const" >&5 |
3032 |
|
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then |
3033 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3034 |
|
else |
3035 |
|
cat > conftest.$ac_ext <<EOF |
3036 |
< |
#line 2821 "configure" |
3036 |
> |
#line 3037 "configure" |
3037 |
|
#include "confdefs.h" |
3038 |
|
|
3039 |
|
int main() { |
3082 |
|
|
3083 |
|
; return 0; } |
3084 |
|
EOF |
3085 |
< |
if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3085 |
> |
if { (eval echo configure:3086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3086 |
|
rm -rf conftest* |
3087 |
|
ac_cv_c_const=yes |
3088 |
|
else |
3103 |
|
fi |
3104 |
|
|
3105 |
|
echo $ac_n "checking for inline""... $ac_c" 1>&6 |
3106 |
< |
echo "configure:2891: checking for inline" >&5 |
3106 |
> |
echo "configure:3107: checking for inline" >&5 |
3107 |
|
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then |
3108 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3109 |
|
else |
3110 |
|
ac_cv_c_inline=no |
3111 |
|
for ac_kw in inline __inline__ __inline; do |
3112 |
|
cat > conftest.$ac_ext <<EOF |
3113 |
< |
#line 2898 "configure" |
3113 |
> |
#line 3114 "configure" |
3114 |
|
#include "confdefs.h" |
3115 |
|
|
3116 |
|
int main() { |
3117 |
|
} $ac_kw foo() { |
3118 |
|
; return 0; } |
3119 |
|
EOF |
3120 |
< |
if { (eval echo configure:2905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3120 |
> |
if { (eval echo configure:3121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3121 |
|
rm -rf conftest* |
3122 |
|
ac_cv_c_inline=$ac_kw; break |
3123 |
|
else |
3143 |
|
esac |
3144 |
|
|
3145 |
|
echo $ac_n "checking size of short""... $ac_c" 1>&6 |
3146 |
< |
echo "configure:2931: checking size of short" >&5 |
3146 |
> |
echo "configure:3147: checking size of short" >&5 |
3147 |
|
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then |
3148 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3149 |
|
else |
3151 |
|
ac_cv_sizeof_short=2 |
3152 |
|
else |
3153 |
|
cat > conftest.$ac_ext <<EOF |
3154 |
< |
#line 2939 "configure" |
3154 |
> |
#line 3155 "configure" |
3155 |
|
#include "confdefs.h" |
3156 |
|
#include <stdio.h> |
3157 |
|
main() |
3162 |
|
exit(0); |
3163 |
|
} |
3164 |
|
EOF |
3165 |
< |
if { (eval echo configure:2950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3165 |
> |
if { (eval echo configure:3166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3166 |
|
then |
3167 |
|
ac_cv_sizeof_short=`cat conftestval` |
3168 |
|
else |
3182 |
|
|
3183 |
|
|
3184 |
|
echo $ac_n "checking size of int""... $ac_c" 1>&6 |
3185 |
< |
echo "configure:2970: checking size of int" >&5 |
3185 |
> |
echo "configure:3186: checking size of int" >&5 |
3186 |
|
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then |
3187 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3188 |
|
else |
3190 |
|
ac_cv_sizeof_int=4 |
3191 |
|
else |
3192 |
|
cat > conftest.$ac_ext <<EOF |
3193 |
< |
#line 2978 "configure" |
3193 |
> |
#line 3194 "configure" |
3194 |
|
#include "confdefs.h" |
3195 |
|
#include <stdio.h> |
3196 |
|
main() |
3201 |
|
exit(0); |
3202 |
|
} |
3203 |
|
EOF |
3204 |
< |
if { (eval echo configure:2989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3204 |
> |
if { (eval echo configure:3205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3205 |
|
then |
3206 |
|
ac_cv_sizeof_int=`cat conftestval` |
3207 |
|
else |
3221 |
|
|
3222 |
|
|
3223 |
|
echo $ac_n "checking size of long""... $ac_c" 1>&6 |
3224 |
< |
echo "configure:3009: checking size of long" >&5 |
3224 |
> |
echo "configure:3225: checking size of long" >&5 |
3225 |
|
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then |
3226 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3227 |
|
else |
3229 |
|
ac_cv_sizeof_long=4 |
3230 |
|
else |
3231 |
|
cat > conftest.$ac_ext <<EOF |
3232 |
< |
#line 3017 "configure" |
3232 |
> |
#line 3233 "configure" |
3233 |
|
#include "confdefs.h" |
3234 |
|
#include <stdio.h> |
3235 |
|
main() |
3240 |
|
exit(0); |
3241 |
|
} |
3242 |
|
EOF |
3243 |
< |
if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3243 |
> |
if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3244 |
|
then |
3245 |
|
ac_cv_sizeof_long=`cat conftestval` |
3246 |
|
else |
3260 |
|
|
3261 |
|
|
3262 |
|
echo $ac_n "checking size of long long""... $ac_c" 1>&6 |
3263 |
< |
echo "configure:3048: checking size of long long" >&5 |
3263 |
> |
echo "configure:3264: checking size of long long" >&5 |
3264 |
|
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then |
3265 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3266 |
|
else |
3268 |
|
ac_cv_sizeof_long_long=8 |
3269 |
|
else |
3270 |
|
cat > conftest.$ac_ext <<EOF |
3271 |
< |
#line 3056 "configure" |
3271 |
> |
#line 3272 "configure" |
3272 |
|
#include "confdefs.h" |
3273 |
|
#include <stdio.h> |
3274 |
|
main() |
3279 |
|
exit(0); |
3280 |
|
} |
3281 |
|
EOF |
3282 |
< |
if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3282 |
> |
if { (eval echo configure:3283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
3283 |
|
then |
3284 |
|
ac_cv_sizeof_long_long=`cat conftestval` |
3285 |
|
else |
3299 |
|
|
3300 |
|
|
3301 |
|
echo $ac_n "checking for off_t""... $ac_c" 1>&6 |
3302 |
< |
echo "configure:3087: checking for off_t" >&5 |
3302 |
> |
echo "configure:3303: checking for off_t" >&5 |
3303 |
|
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then |
3304 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3305 |
|
else |
3306 |
|
cat > conftest.$ac_ext <<EOF |
3307 |
< |
#line 3092 "configure" |
3307 |
> |
#line 3308 "configure" |
3308 |
|
#include "confdefs.h" |
3309 |
|
#include <sys/types.h> |
3310 |
|
#if STDC_HEADERS |
3332 |
|
fi |
3333 |
|
|
3334 |
|
echo $ac_n "checking for loff_t""... $ac_c" 1>&6 |
3335 |
< |
echo "configure:3120: checking for loff_t" >&5 |
3335 |
> |
echo "configure:3336: checking for loff_t" >&5 |
3336 |
|
if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then |
3337 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3338 |
|
else |
3339 |
|
cat > conftest.$ac_ext <<EOF |
3340 |
< |
#line 3125 "configure" |
3340 |
> |
#line 3341 "configure" |
3341 |
|
#include "confdefs.h" |
3342 |
|
#include <sys/types.h> |
3343 |
|
#if STDC_HEADERS |
3365 |
|
fi |
3366 |
|
|
3367 |
|
echo $ac_n "checking for size_t""... $ac_c" 1>&6 |
3368 |
< |
echo "configure:3153: checking for size_t" >&5 |
3368 |
> |
echo "configure:3369: checking for size_t" >&5 |
3369 |
|
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then |
3370 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3371 |
|
else |
3372 |
|
cat > conftest.$ac_ext <<EOF |
3373 |
< |
#line 3158 "configure" |
3373 |
> |
#line 3374 "configure" |
3374 |
|
#include "confdefs.h" |
3375 |
|
#include <sys/types.h> |
3376 |
|
#if STDC_HEADERS |
3398 |
|
fi |
3399 |
|
|
3400 |
|
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 |
3401 |
< |
echo "configure:3186: checking whether time.h and sys/time.h may both be included" >&5 |
3401 |
> |
echo "configure:3402: checking whether time.h and sys/time.h may both be included" >&5 |
3402 |
|
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then |
3403 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3404 |
|
else |
3405 |
|
cat > conftest.$ac_ext <<EOF |
3406 |
< |
#line 3191 "configure" |
3406 |
> |
#line 3407 "configure" |
3407 |
|
#include "confdefs.h" |
3408 |
|
#include <sys/types.h> |
3409 |
|
#include <sys/time.h> |
3412 |
|
struct tm *tp; |
3413 |
|
; return 0; } |
3414 |
|
EOF |
3415 |
< |
if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3415 |
> |
if { (eval echo configure:3416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3416 |
|
rm -rf conftest* |
3417 |
|
ac_cv_header_time=yes |
3418 |
|
else |
3433 |
|
fi |
3434 |
|
|
3435 |
|
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 |
3436 |
< |
echo "configure:3221: checking whether struct tm is in sys/time.h or time.h" >&5 |
3436 |
> |
echo "configure:3437: checking whether struct tm is in sys/time.h or time.h" >&5 |
3437 |
|
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then |
3438 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3439 |
|
else |
3440 |
|
cat > conftest.$ac_ext <<EOF |
3441 |
< |
#line 3226 "configure" |
3441 |
> |
#line 3442 "configure" |
3442 |
|
#include "confdefs.h" |
3443 |
|
#include <sys/types.h> |
3444 |
|
#include <time.h> |
3446 |
|
struct tm *tp; tp->tm_sec; |
3447 |
|
; return 0; } |
3448 |
|
EOF |
3449 |
< |
if { (eval echo configure:3234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3449 |
> |
if { (eval echo configure:3450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then |
3450 |
|
rm -rf conftest* |
3451 |
|
ac_cv_struct_tm=time.h |
3452 |
|
else |
3470 |
|
for ac_func in strdup cfmakeraw |
3471 |
|
do |
3472 |
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
3473 |
< |
echo "configure:3258: checking for $ac_func" >&5 |
3473 |
> |
echo "configure:3474: checking for $ac_func" >&5 |
3474 |
|
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
3475 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3476 |
|
else |
3477 |
|
cat > conftest.$ac_ext <<EOF |
3478 |
< |
#line 3263 "configure" |
3478 |
> |
#line 3479 "configure" |
3479 |
|
#include "confdefs.h" |
3480 |
|
/* System header to define __stub macros and hopefully few prototypes, |
3481 |
|
which can conflict with char $ac_func(); below. */ |
3498 |
|
|
3499 |
|
; return 0; } |
3500 |
|
EOF |
3501 |
< |
if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3501 |
> |
if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3502 |
|
rm -rf conftest* |
3503 |
|
eval "ac_cv_func_$ac_func=yes" |
3504 |
|
else |
3525 |
|
for ac_func in nanosleep clock_gettime timer_create |
3526 |
|
do |
3527 |
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
3528 |
< |
echo "configure:3313: checking for $ac_func" >&5 |
3528 |
> |
echo "configure:3529: checking for $ac_func" >&5 |
3529 |
> |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
3530 |
> |
echo $ac_n "(cached) $ac_c" 1>&6 |
3531 |
> |
else |
3532 |
> |
cat > conftest.$ac_ext <<EOF |
3533 |
> |
#line 3534 "configure" |
3534 |
> |
#include "confdefs.h" |
3535 |
> |
/* System header to define __stub macros and hopefully few prototypes, |
3536 |
> |
which can conflict with char $ac_func(); below. */ |
3537 |
> |
#include <assert.h> |
3538 |
> |
/* Override any gcc2 internal prototype to avoid an error. */ |
3539 |
> |
/* We use char because int might match the return type of a gcc2 |
3540 |
> |
builtin and then its argument prototype would still apply. */ |
3541 |
> |
char $ac_func(); |
3542 |
> |
|
3543 |
> |
int main() { |
3544 |
> |
|
3545 |
> |
/* The GNU C library defines this for functions which it implements |
3546 |
> |
to always fail with ENOSYS. Some functions are actually named |
3547 |
> |
something starting with __ and the normal name is an alias. */ |
3548 |
> |
#if defined (__stub_$ac_func) || defined (__stub___$ac_func) |
3549 |
> |
choke me |
3550 |
> |
#else |
3551 |
> |
$ac_func(); |
3552 |
> |
#endif |
3553 |
> |
|
3554 |
> |
; return 0; } |
3555 |
> |
EOF |
3556 |
> |
if { (eval echo configure:3557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3557 |
> |
rm -rf conftest* |
3558 |
> |
eval "ac_cv_func_$ac_func=yes" |
3559 |
> |
else |
3560 |
> |
echo "configure: failed program was:" >&5 |
3561 |
> |
cat conftest.$ac_ext >&5 |
3562 |
> |
rm -rf conftest* |
3563 |
> |
eval "ac_cv_func_$ac_func=no" |
3564 |
> |
fi |
3565 |
> |
rm -f conftest* |
3566 |
> |
fi |
3567 |
> |
|
3568 |
> |
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then |
3569 |
> |
echo "$ac_t""yes" 1>&6 |
3570 |
> |
ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` |
3571 |
> |
cat >> confdefs.h <<EOF |
3572 |
> |
#define $ac_tr_func 1 |
3573 |
> |
EOF |
3574 |
> |
|
3575 |
> |
else |
3576 |
> |
echo "$ac_t""no" 1>&6 |
3577 |
> |
fi |
3578 |
> |
done |
3579 |
> |
|
3580 |
> |
for ac_func in pthread_cancel |
3581 |
> |
do |
3582 |
> |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
3583 |
> |
echo "configure:3584: checking for $ac_func" >&5 |
3584 |
|
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
3585 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3586 |
|
else |
3587 |
|
cat > conftest.$ac_ext <<EOF |
3588 |
< |
#line 3318 "configure" |
3588 |
> |
#line 3589 "configure" |
3589 |
|
#include "confdefs.h" |
3590 |
|
/* System header to define __stub macros and hopefully few prototypes, |
3591 |
|
which can conflict with char $ac_func(); below. */ |
3608 |
|
|
3609 |
|
; return 0; } |
3610 |
|
EOF |
3611 |
< |
if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3611 |
> |
if { (eval echo configure:3612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3612 |
|
rm -rf conftest* |
3613 |
|
eval "ac_cv_func_$ac_func=yes" |
3614 |
|
else |
3637 |
|
if MACHINE=`uname -a 2>/dev/null`; then |
3638 |
|
case "$MACHINE" in |
3639 |
|
Linux*) |
3640 |
< |
SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp Linux/audio_linux.cpp" |
3640 |
> |
SYSSRCS="Linux/ether_linux.cpp Linux/scsi_linux.cpp audio_oss_esd.cpp" |
3641 |
|
;; |
3642 |
|
FreeBSD*3.*) |
3643 |
|
echo $ac_n "checking for cam_open_btl in -lcam""... $ac_c" 1>&6 |
3644 |
< |
echo "configure:3374: checking for cam_open_btl in -lcam" >&5 |
3644 |
> |
echo "configure:3645: checking for cam_open_btl in -lcam" >&5 |
3645 |
|
ac_lib_var=`echo cam'_'cam_open_btl | sed 'y%./+-%__p_%'` |
3646 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3647 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3649 |
|
ac_save_LIBS="$LIBS" |
3650 |
|
LIBS="-lcam $LIBS" |
3651 |
|
cat > conftest.$ac_ext <<EOF |
3652 |
< |
#line 3382 "configure" |
3652 |
> |
#line 3653 "configure" |
3653 |
|
#include "confdefs.h" |
3654 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
3655 |
|
/* We use char because int might match the return type of a gcc2 |
3660 |
|
cam_open_btl() |
3661 |
|
; return 0; } |
3662 |
|
EOF |
3663 |
< |
if { (eval echo configure:3393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3663 |
> |
if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3664 |
|
rm -rf conftest* |
3665 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
3666 |
|
else |
3686 |
|
else |
3687 |
|
ac_safe=`echo "/sys/cam/cam.h" | sed 'y%./+-%__p_%'` |
3688 |
|
echo $ac_n "checking for /sys/cam/cam.h""... $ac_c" 1>&6 |
3689 |
< |
echo "configure:3419: checking for /sys/cam/cam.h" >&5 |
3689 |
> |
echo "configure:3690: checking for /sys/cam/cam.h" >&5 |
3690 |
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
3691 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3692 |
|
else |
3693 |
|
cat > conftest.$ac_ext <<EOF |
3694 |
< |
#line 3424 "configure" |
3694 |
> |
#line 3695 "configure" |
3695 |
|
#include "confdefs.h" |
3696 |
|
#include </sys/cam/cam.h> |
3697 |
|
EOF |
3698 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
3699 |
< |
{ (eval echo configure:3429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
3699 |
> |
{ (eval echo configure:3700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
3700 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
3701 |
|
if test -z "$ac_err"; then |
3702 |
|
rm -rf conftest* |
3720 |
|
if [ "x$ac_cv_header__sys_cam_cam_h" = "xno" ]; then |
3721 |
|
{ echo "configure: error: Cannot find kernel includes for CAM library." 1>&2; exit 1; } |
3722 |
|
fi |
3723 |
< |
SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp ../dummy/audio_dummy.cpp" |
3723 |
> |
SYSSRCS="../dummy/ether_dummy.cpp FreeBSD/scsi_freebsd.cpp audio_oss_esd.cpp" |
3724 |
|
CXXFLAGS="$CXXFLAGS -I/sys" |
3725 |
|
CFLAGS="$CFLAGS -I/sys" |
3726 |
|
LIBS="$LIBS -lcam" |
3729 |
|
;; |
3730 |
|
FreeBSD*) |
3731 |
|
echo $ac_n "checking for scsi_open in -lscsi""... $ac_c" 1>&6 |
3732 |
< |
echo "configure:3462: checking for scsi_open in -lscsi" >&5 |
3732 |
> |
echo "configure:3733: checking for scsi_open in -lscsi" >&5 |
3733 |
|
ac_lib_var=`echo scsi'_'scsi_open | sed 'y%./+-%__p_%'` |
3734 |
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3735 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3737 |
|
ac_save_LIBS="$LIBS" |
3738 |
|
LIBS="-lscsi $LIBS" |
3739 |
|
cat > conftest.$ac_ext <<EOF |
3740 |
< |
#line 3470 "configure" |
3740 |
> |
#line 3741 "configure" |
3741 |
|
#include "confdefs.h" |
3742 |
|
/* Override any gcc2 internal prototype to avoid an error. */ |
3743 |
|
/* We use char because int might match the return type of a gcc2 |
3748 |
|
scsi_open() |
3749 |
|
; return 0; } |
3750 |
|
EOF |
3751 |
< |
if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3751 |
> |
if { (eval echo configure:3752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
3752 |
|
rm -rf conftest* |
3753 |
|
eval "ac_cv_lib_$ac_lib_var=yes" |
3754 |
|
else |
3774 |
|
else |
3775 |
|
ac_safe=`echo "scsi.h sys/scsiio.h" | sed 'y%./+-%__p_%'` |
3776 |
|
echo $ac_n "checking for scsi.h sys/scsiio.h""... $ac_c" 1>&6 |
3777 |
< |
echo "configure:3507: checking for scsi.h sys/scsiio.h" >&5 |
3777 |
> |
echo "configure:3778: checking for scsi.h sys/scsiio.h" >&5 |
3778 |
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
3779 |
|
echo $ac_n "(cached) $ac_c" 1>&6 |
3780 |
|
else |
3781 |
|
cat > conftest.$ac_ext <<EOF |
3782 |
< |
#line 3512 "configure" |
3782 |
> |
#line 3783 "configure" |
3783 |
|
#include "confdefs.h" |
3784 |
|
#include <scsi.h sys/scsiio.h> |
3785 |
|
EOF |
3786 |
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
3787 |
< |
{ (eval echo configure:3517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
3787 |
> |
{ (eval echo configure:3788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
3788 |
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
3789 |
|
if test -z "$ac_err"; then |
3790 |
|
rm -rf conftest* |
3824 |
|
;; |
3825 |
|
esac |
3826 |
|
fi |
3827 |
< |
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 |
3564 |
< |
|
3565 |
< |
CPUINCLUDES="-I../uae_cpu" |
3566 |
< |
CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp" |
3827 |
> |
SYSSRCS="$SYSSRCS $SEMSRCS $UISRCS" |
3828 |
|
|
3829 |
|
HAVE_I386=no |
3830 |
|
echo $ac_n "checking for x86 target CPU""... $ac_c" 1>&6 |
3831 |
< |
echo "configure:3571: checking for x86 target CPU" >&5 |
3831 |
> |
echo "configure:3832: checking for x86 target CPU" >&5 |
3832 |
|
cat > conftest.$ac_ext <<EOF |
3833 |
< |
#line 3573 "configure" |
3833 |
> |
#line 3834 "configure" |
3834 |
|
#include "confdefs.h" |
3835 |
|
|
3836 |
|
#ifdef __i386__ |
3849 |
|
rm -f conftest* |
3850 |
|
|
3851 |
|
|
3852 |
+ |
HAVE_SPARC=no |
3853 |
+ |
echo $ac_n "checking for SPARC target CPU""... $ac_c" 1>&6 |
3854 |
+ |
echo "configure:3855: checking for SPARC target CPU" >&5 |
3855 |
+ |
cat > conftest.$ac_ext <<EOF |
3856 |
+ |
#line 3857 "configure" |
3857 |
+ |
#include "confdefs.h" |
3858 |
+ |
|
3859 |
+ |
#ifdef __sparc__ |
3860 |
+ |
yes |
3861 |
+ |
#endif |
3862 |
+ |
|
3863 |
+ |
EOF |
3864 |
+ |
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
3865 |
+ |
egrep "yes" >/dev/null 2>&1; then |
3866 |
+ |
rm -rf conftest* |
3867 |
+ |
echo "$ac_t""yes" 1>&6; HAVE_SPARC=yes |
3868 |
+ |
else |
3869 |
+ |
rm -rf conftest* |
3870 |
+ |
echo "$ac_t""no" 1>&6 |
3871 |
+ |
fi |
3872 |
+ |
rm -f conftest* |
3873 |
+ |
|
3874 |
+ |
|
3875 |
|
HAVE_GAS=no |
3876 |
|
echo $ac_n "checking for GAS .p2align feature""... $ac_c" 1>&6 |
3877 |
< |
echo "configure:3594: checking for GAS .p2align feature" >&5 |
3877 |
> |
echo "configure:3878: checking for GAS .p2align feature" >&5 |
3878 |
|
cat >conftest.S << EOF |
3879 |
|
.text |
3880 |
|
.p2align 5 |
3884 |
|
|
3885 |
|
HAVE_GCC27=no |
3886 |
|
echo $ac_n "checking for GCC 2.7 or higher""... $ac_c" 1>&6 |
3887 |
< |
echo "configure:3604: checking for GCC 2.7 or higher" >&5 |
3887 |
> |
echo "configure:3888: checking for GCC 2.7 or higher" >&5 |
3888 |
|
cat > conftest.$ac_ext <<EOF |
3889 |
< |
#line 3606 "configure" |
3889 |
> |
#line 3890 "configure" |
3890 |
|
#include "confdefs.h" |
3891 |
|
#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5 |
3892 |
|
yes |
3909 |
|
CXXFLAGS="$CXXFLAGS -fomit-frame-pointer" |
3910 |
|
fi |
3911 |
|
|
3912 |
+ |
CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp" |
3913 |
|
if [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]; then |
3914 |
< |
DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\"" |
3914 |
> |
DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\"" |
3915 |
|
if [ "x$HAVE_GAS" = "xyes" ]; then |
3916 |
|
DEFINES="$DEFINES -DX86_ASSEMBLY" |
3917 |
< |
CPUSRCS="$CPUSRCS cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s" |
3633 |
< |
else |
3634 |
< |
CPUSRCS="$CPUSRCS cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp" |
3917 |
> |
CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s" |
3918 |
|
fi |
3919 |
< |
else |
3920 |
< |
CPUSRCS="$CPUSRCS cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp" |
3919 |
> |
elif [ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]; then |
3920 |
> |
case "$MACHINE" in |
3921 |
> |
SunOS*) |
3922 |
> |
echo $ac_n "checking SPARC CPU architecture""... $ac_c" 1>&6 |
3923 |
> |
echo "configure:3924: checking SPARC CPU architecture" >&5 |
3924 |
> |
SPARC_TYPE=`Solaris/which_sparc` |
3925 |
> |
echo "$ac_t""$SPARC_TYPE" 1>&6 |
3926 |
> |
case "$SPARC_TYPE" in |
3927 |
> |
SPARC_V8) |
3928 |
> |
DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY" |
3929 |
> |
CFLAGS="$CFLAGS -Wa,-Av8" |
3930 |
> |
CXXFLAGS="$CXXFLAGS -Wa,-Av8" |
3931 |
> |
;; |
3932 |
> |
SPARC_V9) |
3933 |
> |
DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY" |
3934 |
> |
CFLAGS="$CFLAGS -Wa,-Av9" |
3935 |
> |
CXXFLAGS="$CXXFLAGS -Wa,-Av9" |
3936 |
> |
;; |
3937 |
> |
esac |
3938 |
> |
;; |
3939 |
> |
esac |
3940 |
|
fi |
3941 |
|
|
3942 |
+ |
CPUINCLUDES="-I../uae_cpu" |
3943 |
+ |
CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp $CPUSRCS" |
3944 |
|
|
3945 |
|
|
3946 |
|
|
4093 |
|
s%@GTK_CONFIG@%$GTK_CONFIG%g |
4094 |
|
s%@GTK_CFLAGS@%$GTK_CFLAGS%g |
4095 |
|
s%@GTK_LIBS@%$GTK_LIBS%g |
4096 |
+ |
s%@ESD_CONFIG@%$ESD_CONFIG%g |
4097 |
+ |
s%@ESD_CFLAGS@%$ESD_CFLAGS%g |
4098 |
+ |
s%@ESD_LIBS@%$ESD_LIBS%g |
4099 |
|
s%@DEFINES@%$DEFINES%g |
3793 |
– |
s%@STATICLIBS@%$STATICLIBS%g |
4100 |
|
s%@SYSSRCS@%$SYSSRCS%g |
4101 |
|
s%@CPUINCLUDES@%$CPUINCLUDES%g |
4102 |
|
s%@CPUSRCS@%$CPUSRCS%g |