Put AC_DEFINE symbols definitions directly in the configure script so that we no longer need an acconfig.h. Cleaned up dlopen() tests a bit.
diff --git a/Makefile.in b/Makefile.in index 19c7c17..b0ae133 100644 --- a/Makefile.in +++ b/Makefile.in
@@ -150,11 +150,4 @@ $(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h documentation/wine.man documentation/wine.conf.man tools/winelauncher $(RM) `find . \( -name Makefile -o -size 0 \) -print` -# We depend on configure above for checks, so we better don't use this rule. -#configure: configure.in -# autoconf - -include/config.h.in: configure.in include/acconfig.h - autoheader -l include - ### Dependencies:
diff --git a/configure b/configure index 115c7f9..651f308 100755 --- a/configure +++ b/configure
@@ -605,23 +605,19 @@ #define NO_DEBUG_MSGS 1 EOF +fi + +if test "$TRACE_MSGS" = "no" -o "$DEBUG_MSGS" = "no" +then cat >> confdefs.h <<\EOF #define NO_TRACE_MSGS 1 EOF -else - if test "$TRACE_MSGS" = "no" - then - cat >> confdefs.h <<\EOF -#define NO_TRACE_MSGS 1 -EOF - - fi fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:625: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:621: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -650,7 +646,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:654: checking for $ac_word" >&5 +echo "configure:650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -680,7 +676,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:684: checking for $ac_word" >&5 +echo "configure:680: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -731,7 +727,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:735: checking for $ac_word" >&5 +echo "configure:731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -763,7 +759,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:767: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -774,12 +770,12 @@ cat > conftest.$ac_ext << EOF -#line 778 "configure" +#line 774 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -805,12 +801,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:809: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:805: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:814: checking whether we are using GNU C" >&5 +echo "configure:810: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -819,7 +815,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -838,7 +834,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:842: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:838: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -870,7 +866,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:874: checking how to run the C preprocessor" >&5 +echo "configure:870: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -885,13 +881,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 889 "configure" +#line 885 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -902,13 +898,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 906 "configure" +#line 902 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -919,13 +915,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 923 "configure" +#line 919 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -954,7 +950,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:958: checking for X" >&5 +echo "configure:954: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1016,12 +1012,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 1020 "configure" +#line 1016 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1090,14 +1086,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 1094 "configure" +#line 1090 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:1101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1203,17 +1199,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1207: checking whether -R must be followed by a space" >&5 +echo "configure:1203: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 1210 "configure" +#line 1206 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1229,14 +1225,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 1233 "configure" +#line 1229 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1268,7 +1264,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1272: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1268: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1276,7 +1272,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 1280 "configure" +#line 1276 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1287,7 +1283,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1309,7 +1305,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1313: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1309: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1317,7 +1313,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 1321 "configure" +#line 1317 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1328,7 +1324,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1357,12 +1353,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1361: checking for gethostbyname" >&5 +echo "configure:1357: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1366 "configure" +#line 1362 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -1385,7 +1381,7 @@ ; return 0; } EOF -if { (eval echo configure:1389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1406,7 +1402,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1410: checking for gethostbyname in -lnsl" >&5 +echo "configure:1406: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1414,7 +1410,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1418 "configure" +#line 1414 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1425,7 +1421,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1455,12 +1451,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1459: checking for connect" >&5 +echo "configure:1455: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1464 "configure" +#line 1460 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -1483,7 +1479,7 @@ ; return 0; } EOF -if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1504,7 +1500,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1508: checking for connect in -lsocket" >&5 +echo "configure:1504: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1512,7 +1508,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 1516 "configure" +#line 1512 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1523,7 +1519,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:1527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1547,12 +1543,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1551: checking for remove" >&5 +echo "configure:1547: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1556 "configure" +#line 1552 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -1575,7 +1571,7 @@ ; return 0; } EOF -if { (eval echo configure:1579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1596,7 +1592,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1600: checking for remove in -lposix" >&5 +echo "configure:1596: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1604,7 +1600,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 1608 "configure" +#line 1604 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1615,7 +1611,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1639,12 +1635,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1643: checking for shmat" >&5 +echo "configure:1639: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1648 "configure" +#line 1644 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -1667,7 +1663,7 @@ ; return 0; } EOF -if { (eval echo configure:1671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -1688,7 +1684,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:1692: checking for shmat in -lipc" >&5 +echo "configure:1688: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1696,7 +1692,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 1700 "configure" +#line 1696 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1707,7 +1703,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1740,7 +1736,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:1744: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:1740: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1748,7 +1744,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 1752 "configure" +#line 1748 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1759,7 +1755,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:1763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1788,7 +1784,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1792: checking for $ac_word" >&5 +echo "configure:1788: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1821,7 +1817,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1825: checking for $ac_word" >&5 +echo "configure:1821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1855,7 +1851,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1859: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1855: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1863,7 +1859,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 1867 "configure" +#line 1863 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1874,7 +1870,7 @@ yywrap() ; return 0; } EOF -if { (eval echo configure:1878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1901,7 +1897,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1905: checking for $ac_word" >&5 +echo "configure:1901: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1940,7 +1936,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1944: checking for $ac_word" >&5 +echo "configure:1940: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1979,7 +1975,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1983: checking for a BSD compatible install" >&5 +echo "configure:1979: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2032,7 +2028,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2036: checking whether ln -s works" >&5 +echo "configure:2032: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2055,7 +2051,7 @@ # Extract the first word of "c2man", so it can be a program name with args. set dummy c2man; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2059: checking for $ac_word" >&5 +echo "configure:2055: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_C2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2085,7 +2081,7 @@ # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2089: checking for $ac_word" >&5 +echo "configure:2085: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LDCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2119,12 +2115,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2123: checking for Cygwin environment" >&5 +echo "configure:2119: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2128 "configure" +#line 2124 "configure" #include "confdefs.h" int main() { @@ -2135,7 +2131,7 @@ return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:2139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2154,7 +2150,7 @@ # Extract the first word of "dllwrap", so it can be a program name with args. set dummy dllwrap; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2158: checking for $ac_word" >&5 +echo "configure:2154: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLWRAP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2187,7 +2183,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2191: checking for $ac_word" >&5 +echo "configure:2187: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2233,7 +2229,7 @@ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:2237: checking for sqrt in -lm" >&5 +echo "configure:2233: checking for sqrt in -lm" >&5 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2241,7 +2237,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 2245 "configure" +#line 2241 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2252,7 +2248,7 @@ sqrt() ; return 0; } EOF -if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2280,7 +2276,7 @@ fi echo $ac_n "checking for i386_set_ldt in -li386""... $ac_c" 1>&6 -echo "configure:2284: checking for i386_set_ldt in -li386" >&5 +echo "configure:2280: checking for i386_set_ldt in -li386" >&5 ac_lib_var=`echo i386'_'i386_set_ldt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2288,7 +2284,7 @@ ac_save_LIBS="$LIBS" LIBS="-li386 $LIBS" cat > conftest.$ac_ext <<EOF -#line 2292 "configure" +#line 2288 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2299,7 +2295,7 @@ i386_set_ldt() ; return 0; } EOF -if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2327,7 +2323,7 @@ fi echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6 -echo "configure:2331: checking for _oss_ioctl in -lossaudio" >&5 +echo "configure:2327: checking for _oss_ioctl in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2335,7 +2331,7 @@ ac_save_LIBS="$LIBS" LIBS="-lossaudio $LIBS" cat > conftest.$ac_ext <<EOF -#line 2339 "configure" +#line 2335 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2346,7 +2342,7 @@ _oss_ioctl() ; return 0; } EOF -if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2376,12 +2372,12 @@ for ac_func in iswalnum do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2380: checking for $ac_func" >&5 +echo "configure:2376: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2385 "configure" +#line 2381 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2404,7 +2400,7 @@ ; return 0; } EOF -if { (eval echo configure:2408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2426,7 +2422,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6 -echo "configure:2430: checking for iswalnum in -lw" >&5 +echo "configure:2426: checking for iswalnum in -lw" >&5 ac_lib_var=`echo w'_'iswalnum | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2434,7 +2430,7 @@ ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <<EOF -#line 2438 "configure" +#line 2434 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2445,7 +2441,7 @@ iswalnum() ; return 0; } EOF -if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2478,12 +2474,12 @@ for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2482: checking for $ac_func" >&5 +echo "configure:2478: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2487 "configure" +#line 2483 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2506,7 +2502,7 @@ ; return 0; } EOF -if { (eval echo configure:2510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2528,7 +2524,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2532: checking for gethostbyname in -lnsl" >&5 +echo "configure:2528: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2536,7 +2532,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2540 "configure" +#line 2536 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2547,7 +2543,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:2551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2580,12 +2576,12 @@ for ac_func in connect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2584: checking for $ac_func" >&5 +echo "configure:2580: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2589 "configure" +#line 2585 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2608,7 +2604,7 @@ ; return 0; } EOF -if { (eval echo configure:2612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2630,7 +2626,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2634: checking for connect in -lsocket" >&5 +echo "configure:2630: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2638,7 +2634,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 2642 "configure" +#line 2638 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2649,7 +2645,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2680,7 +2676,7 @@ done echo $ac_n "checking for _xpg4_setrunelocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:2684: checking for _xpg4_setrunelocale in -lxpg4" >&5 +echo "configure:2680: checking for _xpg4_setrunelocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'_xpg4_setrunelocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2688,7 +2684,7 @@ ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <<EOF -#line 2692 "configure" +#line 2688 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2699,7 +2695,7 @@ _xpg4_setrunelocale() ; return 0; } EOF -if { (eval echo configure:2703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2727,7 +2723,7 @@ fi echo $ac_n "checking for mmap in -lmmap""... $ac_c" 1>&6 -echo "configure:2731: checking for mmap in -lmmap" >&5 +echo "configure:2727: checking for mmap in -lmmap" >&5 ac_lib_var=`echo mmap'_'mmap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2735,7 +2731,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmmap $LIBS" cat > conftest.$ac_ext <<EOF -#line 2739 "configure" +#line 2735 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2746,7 +2742,7 @@ mmap() ; return 0; } EOF -if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2776,12 +2772,12 @@ for ac_func in openpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2780: checking for $ac_func" >&5 +echo "configure:2776: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2785 "configure" +#line 2781 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2804,7 +2800,7 @@ ; return 0; } EOF -if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2826,7 +2822,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:2830: checking for openpty in -lutil" >&5 +echo "configure:2826: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2834,7 +2830,7 @@ ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 2838 "configure" +#line 2834 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2845,7 +2841,7 @@ openpty() ; return 0; } EOF -if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2878,17 +2874,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2882: checking for $ac_hdr" >&5 +echo "configure:2878: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2887 "configure" +#line 2883 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2911,12 +2907,12 @@ for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2915: checking for $ac_func" >&5 +echo "configure:2911: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2920 "configure" +#line 2916 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2939,7 +2935,7 @@ ; return 0; } EOF -if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2957,14 +2953,11 @@ cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF - cat >> confdefs.h <<\EOF -#define HAVE_DL_API 1 -EOF - + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2968: checking for dlopen in -ldl" >&5 +echo "configure:2961: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2972,7 +2965,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2976 "configure" +#line 2969 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2983,7 +2976,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:2987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2999,29 +2992,29 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define HAVE_DL_API 1 +#define HAVE_DLOPEN 1 EOF - LIBS="$LIBS -ldl" + LIBS="$LIBS -ldl" else echo "$ac_t""no" 1>&6 LIBEXT="a" - fi - + fi done else echo "$ac_t""no" 1>&6 LIBEXT="a" - + fi done + X_DLLS="" XFILES="" @@ -3043,17 +3036,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3047: checking for $ac_hdr" >&5 +echo "configure:3040: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3052 "configure" +#line 3045 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3074,7 +3067,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:3078: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:3071: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3083,7 +3076,7 @@ LIBS="-lXpm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3087 "configure" +#line 3080 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3094,7 +3087,7 @@ XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3112,7 +3105,8 @@ cat >> confdefs.h <<\EOF #define HAVE_LIBXXPM 1 EOF - X_PRE_LIBS="$X_PRE_LIBS -lXpm" + + X_PRE_LIBS="$X_PRE_LIBS -lXpm" else echo "$ac_t""no" 1>&6 fi @@ -3139,17 +3133,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3143: checking for $ac_hdr" >&5 +echo "configure:3137: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3148 "configure" +#line 3142 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3174,17 +3168,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3178: checking for $ac_hdr" >&5 +echo "configure:3172: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3183 "configure" +#line 3177 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3205,7 +3199,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for XkbQueryExtension in -lX11""... $ac_c" 1>&6 -echo "configure:3209: checking for XkbQueryExtension in -lX11" >&5 +echo "configure:3203: checking for XkbQueryExtension in -lX11" >&5 ac_lib_var=`echo X11'_'XkbQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3213,7 +3207,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3217 "configure" +#line 3211 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3224,7 +3218,7 @@ XkbQueryExtension() ; return 0; } EOF -if { (eval echo configure:3228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3260,17 +3254,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3264: checking for $ac_hdr" >&5 +echo "configure:3258: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3269 "configure" +#line 3263 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3291,7 +3285,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for XShmQueryExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3295: checking for XShmQueryExtension in -lXext" >&5 +echo "configure:3289: checking for XShmQueryExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3299,7 +3293,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3303 "configure" +#line 3297 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3310,7 +3304,7 @@ XShmQueryExtension() ; return 0; } EOF -if { (eval echo configure:3314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3346,17 +3340,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3350: checking for $ac_hdr" >&5 +echo "configure:3344: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3355 "configure" +#line 3349 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3377,7 +3371,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3381: checking for XShapeQueryExtension in -lXext" >&5 +echo "configure:3375: checking for XShapeQueryExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3385,7 +3379,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3389 "configure" +#line 3383 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3396,7 +3390,7 @@ XShapeQueryExtension() ; return 0; } EOF -if { (eval echo configure:3400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3432,17 +3426,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3436: checking for $ac_hdr" >&5 +echo "configure:3430: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3441 "configure" +#line 3435 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3463,7 +3457,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for XDGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 -echo "configure:3467: checking for XDGAQueryExtension in -lXxf86dga" >&5 +echo "configure:3461: checking for XDGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XDGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3472,7 +3466,7 @@ LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3476 "configure" +#line 3470 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3483,7 +3477,7 @@ XDGAQueryExtension() ; return 0; } EOF -if { (eval echo configure:3487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3502,16 +3496,12 @@ #define HAVE_LIBXXF86DGA2 1 EOF - cat >> confdefs.h <<\EOF -#define HAVE_LIBXXF86DGA 1 -EOF - X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 -echo "configure:3515: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 +echo "configure:3505: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3520,7 +3510,7 @@ LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3524 "configure" +#line 3514 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3531,7 +3521,7 @@ XF86DGAQueryExtension() ; return 0; } EOF -if { (eval echo configure:3535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3572,17 +3562,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3576: checking for $ac_hdr" >&5 +echo "configure:3566: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3581 "configure" +#line 3571 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3603,7 +3593,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6 -echo "configure:3607: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo "configure:3597: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3612,7 +3602,7 @@ LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3616 "configure" +#line 3606 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3623,7 +3613,7 @@ XF86VidModeQueryExtension() ; return 0; } EOF -if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3661,17 +3651,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3665: checking for $ac_hdr" >&5 +echo "configure:3655: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3670 "configure" +#line 3660 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3692,7 +3682,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for XvShmCreateImage in -lXv""... $ac_c" 1>&6 -echo "configure:3696: checking for XvShmCreateImage in -lXv" >&5 +echo "configure:3686: checking for XvShmCreateImage in -lXv" >&5 ac_lib_var=`echo Xv'_'XvShmCreateImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3701,7 +3691,7 @@ LIBS="-lXv $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3705 "configure" +#line 3695 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3712,7 +3702,7 @@ XvShmCreateImage() ; return 0; } EOF -if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3759,17 +3749,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3763: checking for $ac_hdr" >&5 +echo "configure:3753: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3768 "configure" +#line 3758 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3798,19 +3788,19 @@ if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes" then echo $ac_n "checking "for up-to-date OpenGL version"""... $ac_c" 1>&6 -echo "configure:3802: checking "for up-to-date OpenGL version"" >&5 +echo "configure:3792: checking "for up-to-date OpenGL version"" >&5 if eval "test \"`echo '$''{'wine_cv_opengl_version_OK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3807 "configure" +#line 3797 "configure" #include "confdefs.h" #include <GL/gl.h> int main() { GLenum test = GL_UNSIGNED_SHORT_5_6_5; ; return 0; } EOF -if { (eval echo configure:3814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_opengl_version_OK="yes" else @@ -3827,21 +3817,21 @@ echo "$ac_t""$wine_cv_opengl_version_OK" 1>&6 echo $ac_n "checking "for thread-safe OpenGL version"""... $ac_c" 1>&6 -echo "configure:3831: checking "for thread-safe OpenGL version"" >&5 +echo "configure:3821: checking "for thread-safe OpenGL version"" >&5 if eval "test \"`echo '$''{'wine_cv_opengl_version_threadsafe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_libs=$LIBS LIBS="$X_LIBS -lGL" cat > conftest.$ac_ext <<EOF -#line 3838 "configure" +#line 3828 "configure" #include "confdefs.h" int main() { pthread_getspecific(); ; return 0; } EOF -if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wine_cv_opengl_version_threadsafe="yes" else @@ -3860,7 +3850,7 @@ if test "$wine_cv_opengl_version_OK" = "yes" -a \( "$wine_cv_opengl_version_threadsafe" = "no" -o $OPENGL = "yes" \) then echo $ac_n "checking for glXCreateContext in -lGL""... $ac_c" 1>&6 -echo "configure:3864: checking for glXCreateContext in -lGL" >&5 +echo "configure:3854: checking for glXCreateContext in -lGL" >&5 ac_lib_var=`echo GL'_'glXCreateContext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3868,7 +3858,7 @@ ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3872 "configure" +#line 3862 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3879,7 +3869,7 @@ glXCreateContext() ; return 0; } EOF -if { (eval echo configure:3883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3911,7 +3901,7 @@ echo $ac_n "checking for glXGetProcAddressARB in -lGL""... $ac_c" 1>&6 -echo "configure:3915: checking for glXGetProcAddressARB in -lGL" >&5 +echo "configure:3905: checking for glXGetProcAddressARB in -lGL" >&5 ac_lib_var=`echo GL'_'glXGetProcAddressARB | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3919,7 +3909,7 @@ ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3923 "configure" +#line 3913 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3930,7 +3920,7 @@ glXGetProcAddressARB() ; return 0; } EOF -if { (eval echo configure:3934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3957,12 +3947,12 @@ if test $ac_cv_lib_GL_glXGetProcAddressARB = "yes" then echo $ac_n "checking "for OpenGL extension functions prototypes"""... $ac_c" 1>&6 -echo "configure:3961: checking "for OpenGL extension functions prototypes"" >&5 +echo "configure:3951: checking "for OpenGL extension functions prototypes"" >&5 if eval "test \"`echo '$''{'wine_cv_extension_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3966 "configure" +#line 3956 "configure" #include "confdefs.h" #include <GL/gl.h> #ifdef HAVE_GL_GLEXT_H @@ -3973,7 +3963,7 @@ PFNGLCOLORTABLEEXTPROC test_proc; ; return 0; } EOF -if { (eval echo configure:3977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_extension_prototypes="yes" else @@ -3990,7 +3980,7 @@ echo "$ac_t""$wine_cv_extension_prototypes" 1>&6 if test $wine_cv_extension_prototypes = "yes" then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_GLEXT_PROTOTYPES 1 EOF @@ -4003,17 +3993,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4007: checking for $ac_hdr" >&5 +echo "configure:3997: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4012 "configure" +#line 4002 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4034,7 +4024,7 @@ #define $ac_tr_hdr 1 EOF echo $ac_n "checking for OSMesaCreateContext in -lGL""... $ac_c" 1>&6 -echo "configure:4038: checking for OSMesaCreateContext in -lGL" >&5 +echo "configure:4028: checking for OSMesaCreateContext in -lGL" >&5 ac_lib_var=`echo GL'_'OSMesaCreateContext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4043,7 +4033,7 @@ LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4047 "configure" +#line 4037 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4054,7 +4044,7 @@ OSMesaCreateContext() ; return 0; } EOF -if { (eval echo configure:4058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4069,14 +4059,18 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_OSMESA 1 + ac_tr_lib=HAVE_LIB`echo GL | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 EOF + LIBS="-lGL $LIBS" + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for OSMesaCreateContext in -lOSMesa""... $ac_c" 1>&6 -echo "configure:4080: checking for OSMesaCreateContext in -lOSMesa" >&5 +echo "configure:4074: checking for OSMesaCreateContext in -lOSMesa" >&5 ac_lib_var=`echo OSMesa'_'OSMesaCreateContext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4084,7 +4078,7 @@ ac_save_LIBS="$LIBS" LIBS="-lOSMesa -lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4088 "configure" +#line 4082 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4095,7 +4089,7 @@ OSMesaCreateContext() ; return 0; } EOF -if { (eval echo configure:4099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4110,12 +4104,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_OSMESA 1 -EOF - - X_PRE_LIBS="$X_PRE_LIBS -lOSMesa" - + X_PRE_LIBS="$X_PRE_LIBS -lOSMesa" else echo "$ac_t""no" 1>&6 fi @@ -4131,7 +4120,7 @@ fi echo $ac_n "checking for glBegin in -lGLU""... $ac_c" 1>&6 -echo "configure:4135: checking for glBegin in -lGLU" >&5 +echo "configure:4124: checking for glBegin in -lGLU" >&5 ac_lib_var=`echo GLU'_'glBegin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4140,7 +4129,7 @@ LIBS="-lGLU $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4144 "configure" +#line 4133 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4151,7 +4140,7 @@ glBegin() ; return 0; } EOF -if { (eval echo configure:4155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4193,17 +4182,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4197: checking for $ac_hdr" >&5 +echo "configure:4186: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4202 "configure" +#line 4191 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4223,16 +4212,8 @@ cat >> confdefs.h <<EOF #define $ac_tr_hdr 1 EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - if test "$ac_cv_header_ncurses_h" = "yes" - then - echo $ac_n "checking for waddch in -lncurses""... $ac_c" 1>&6 -echo "configure:4236: checking for waddch in -lncurses" >&5 + echo $ac_n "checking for waddch in -lncurses""... $ac_c" 1>&6 +echo "configure:4217: checking for waddch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'waddch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4240,7 +4221,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4244 "configure" +#line 4225 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4251,7 +4232,7 @@ waddch() ; return 0; } EOF -if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4266,7 +4247,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/^a-zA-Z0-9_/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <<EOF #define $ac_tr_lib 1 @@ -4278,111 +4259,23 @@ echo "$ac_t""no" 1>&6 fi - fi - if test "$ac_cv_lib_ncurses_waddch" = "yes" - then - echo $ac_n "checking for resizeterm in -lncurses""... $ac_c" 1>&6 -echo "configure:4286: checking for resizeterm in -lncurses" >&5 -ac_lib_var=`echo ncurses'_'resizeterm | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lncurses $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4294 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char resizeterm(); - -int main() { -resizeterm() -; return 0; } -EOF -if { (eval echo configure:4305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_RESIZETERM 1 -EOF - else echo "$ac_t""no" 1>&6 -fi - - echo $ac_n "checking for getbkgd in -lncurses""... $ac_c" 1>&6 -echo "configure:4329: checking for getbkgd in -lncurses" >&5 -ac_lib_var=`echo ncurses'_'getbkgd | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lncurses $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4337 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getbkgd(); - -int main() { -getbkgd() -; return 0; } -EOF -if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_GETBKGD 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi - - else - for ac_hdr in curses.h +for ac_hdr in curses.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4376: checking for $ac_hdr" >&5 +echo "configure:4269: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4381 "configure" +#line 4274 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4402,16 +4295,8 @@ cat >> confdefs.h <<EOF #define $ac_tr_hdr 1 EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - if test "$ac_cv_header_curses_h" = "yes" - then - echo $ac_n "checking for waddch in -lcurses""... $ac_c" 1>&6 -echo "configure:4415: checking for waddch in -lcurses" >&5 + echo $ac_n "checking for waddch in -lcurses""... $ac_c" 1>&6 +echo "configure:4300: checking for waddch in -lcurses" >&5 ac_lib_var=`echo curses'_'waddch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4419,7 +4304,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4423 "configure" +#line 4308 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4430,7 +4315,7 @@ waddch() ; return 0; } EOF -if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4445,7 +4330,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/^a-zA-Z0-9_/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <<EOF #define $ac_tr_lib 1 @@ -4457,103 +4342,75 @@ echo "$ac_t""no" 1>&6 fi - if test "$ac_cv_lib_curses_waddch" = "yes" - then - echo $ac_n "checking for resizeterm in -lcurses""... $ac_c" 1>&6 -echo "configure:4464: checking for resizeterm in -lcurses" >&5 -ac_lib_var=`echo curses'_'resizeterm | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +else + echo "$ac_t""no" 1>&6 +fi +done + +fi +done + + for ac_func in getbkgd resizeterm +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:4357: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lcurses $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4472 "configure" + cat > conftest.$ac_ext <<EOF +#line 4362 "configure" #include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char resizeterm(); +char $ac_func(); int main() { -resizeterm() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + ; return 0; } EOF -if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_RESIZETERM 1 -EOF +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + else echo "$ac_t""no" 1>&6 fi +done - echo $ac_n "checking for getbkgd in -lcurses""... $ac_c" 1>&6 -echo "configure:4507: checking for getbkgd in -lcurses" >&5 -ac_lib_var=`echo curses'_'getbkgd | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lcurses $LIBS" -cat > conftest.$ac_ext <<EOF -#line 4515 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getbkgd(); - -int main() { -getbkgd() -; return 0; } -EOF -if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_GETBKGD 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi - - fi - fi - fi fi CUPSLIBS="" wine_cv_warn_cups_h=no echo $ac_n "checking for cupsGetPPD in -lcups""... $ac_c" 1>&6 -echo "configure:4557: checking for cupsGetPPD in -lcups" >&5 +echo "configure:4414: checking for cupsGetPPD in -lcups" >&5 ac_lib_var=`echo cups'_'cupsGetPPD | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4561,7 +4418,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcups $LIBS" cat > conftest.$ac_ext <<EOF -#line 4565 "configure" +#line 4422 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4572,7 +4429,7 @@ cupsGetPPD() ; return 0; } EOF -if { (eval echo configure:4576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4589,17 +4446,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "cups/cups.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for cups/cups.h""... $ac_c" 1>&6 -echo "configure:4593: checking for cups/cups.h" >&5 +echo "configure:4450: checking for cups/cups.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4598 "configure" +#line 4455 "configure" #include "confdefs.h" #include <cups/cups.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4633,7 +4490,7 @@ echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6 -echo "configure:4637: checking for FT_Init_FreeType in -lfreetype" >&5 +echo "configure:4494: checking for FT_Init_FreeType in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4641,7 +4498,7 @@ ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <<EOF -#line 4645 "configure" +#line 4502 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4652,7 +4509,7 @@ FT_Init_FreeType() ; return 0; } EOF -if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4682,7 +4539,7 @@ # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4686: checking for $ac_word" >&5 +echo "configure:4543: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ft_devel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4714,7 +4571,7 @@ # Extract the first word of "freetype2-config", so it can be a program name with args. set dummy freetype2-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4718: checking for $ac_word" >&5 +echo "configure:4575: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ft_devel2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4769,17 +4626,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4773: checking for $ac_hdr" >&5 +echo "configure:4630: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4778 "configure" +#line 4635 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4813,19 +4670,19 @@ echo $ac_n "checking "for parport header/ppdev.h"""... $ac_c" 1>&6 -echo "configure:4817: checking "for parport header/ppdev.h"" >&5 +echo "configure:4674: checking "for parport header/ppdev.h"" >&5 if eval "test \"`echo '$''{'ac_cv_c_ppdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4822 "configure" +#line 4679 "configure" #include "confdefs.h" #include <linux/ppdev.h> int main() { ioctl (1,PPCLAIM,0) ; return 0; } EOF -if { (eval echo configure:4829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ppdev="yes" else @@ -4848,12 +4705,12 @@ fi echo $ac_n "checking "for GNU style IPX support"""... $ac_c" 1>&6 -echo "configure:4852: checking "for GNU style IPX support"" >&5 +echo "configure:4709: checking "for GNU style IPX support"" >&5 if eval "test \"`echo '$''{'ac_cv_c_ipx_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4857 "configure" +#line 4714 "configure" #include "confdefs.h" #include <sys/socket.h> #include <netipx/ipx.h> @@ -4861,7 +4718,7 @@ ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:4865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_gnu="yes" else @@ -4886,12 +4743,12 @@ if test "$ac_cv_c_ipx_gnu" = "no" then echo $ac_n "checking "for linux style IPX support"""... $ac_c" 1>&6 -echo "configure:4890: checking "for linux style IPX support"" >&5 +echo "configure:4747: checking "for linux style IPX support"" >&5 if eval "test \"`echo '$''{'ac_cv_c_ipx_linux'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4895 "configure" +#line 4752 "configure" #include "confdefs.h" #include <sys/socket.h> #include <asm/types.h> @@ -4900,7 +4757,7 @@ ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:4904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_linux="yes" else @@ -4927,17 +4784,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4931: checking for $ac_hdr" >&5 +echo "configure:4788: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4936 "configure" +#line 4793 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4965,12 +4822,12 @@ echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6 -echo "configure:4969: checking "for Open Sound System"" >&5 +echo "configure:4826: checking "for Open Sound System"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4974 "configure" +#line 4831 "configure" #include "confdefs.h" #if defined(HAVE_SYS_SOUNDCARD_H) @@ -4991,7 +4848,7 @@ ; return 0; } EOF -if { (eval echo configure:4995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem="yes" else @@ -5014,12 +4871,12 @@ fi echo $ac_n "checking "for Open Sound System/MIDI interface"""... $ac_c" 1>&6 -echo "configure:5018: checking "for Open Sound System/MIDI interface"" >&5 +echo "configure:4875: checking "for Open Sound System/MIDI interface"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem_midi'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5023 "configure" +#line 4880 "configure" #include "confdefs.h" #if defined(HAVE_SYS_SOUNDCARD_H) @@ -5040,7 +4897,7 @@ ; return 0; } EOF -if { (eval echo configure:5044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem_midi="yes" else @@ -5066,7 +4923,7 @@ echo $ac_n "checking "whether mmap64 works defined as mmap"""... $ac_c" 1>&6 -echo "configure:5070: checking "whether mmap64 works defined as mmap"" >&5 +echo "configure:4927: checking "whether mmap64 works defined as mmap"" >&5 if eval "test \"`echo '$''{'ac_cv_mmap64_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5074,7 +4931,7 @@ ac_cv_mmap64_works="no" else cat > conftest.$ac_ext <<EOF -#line 5078 "configure" +#line 4935 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 @@ -5104,7 +4961,7 @@ EOF -if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_mmap64_works="yes" else @@ -5133,7 +4990,7 @@ then CFLAGS="$CFLAGS -Wall" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 -echo "configure:5137: checking "for gcc strength-reduce bug"" >&5 +echo "configure:4994: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5141,7 +4998,7 @@ ac_cv_c_gcc_strength_bug="yes" else cat > conftest.$ac_ext <<EOF -#line 5145 "configure" +#line 5002 "configure" #include "confdefs.h" int L[4] = {0,1,2,3}; @@ -5156,7 +5013,7 @@ exit( Array[1] != -2 || L[2] != 3); } EOF -if { (eval echo configure:5160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" else @@ -5177,21 +5034,21 @@ fi echo $ac_n "checking "for gcc -mpreferred-stack-boundary=2 support"""... $ac_c" 1>&6 -echo "configure:5181: checking "for gcc -mpreferred-stack-boundary=2 support"" >&5 +echo "configure:5038: checking "for gcc -mpreferred-stack-boundary=2 support"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_stack_boundary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -mpreferred-stack-boundary=2" cat > conftest.$ac_ext <<EOF -#line 5188 "configure" +#line 5045 "configure" #include "confdefs.h" int main() { return 0 ; return 0; } EOF -if { (eval echo configure:5195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_gcc_stack_boundary="yes" else @@ -5214,7 +5071,7 @@ echo $ac_n "checking "whether .type must sit inside a .def directive"""... $ac_c" 1>&6 -echo "configure:5218: checking "whether .type must sit inside a .def directive"" >&5 +echo "configure:5075: checking "whether .type must sit inside a .def directive"" >&5 if eval "test \"`echo '$''{'ac_cv_c_type_in_def'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5227,14 +5084,14 @@ .long 0 EOF cat > conftest.$ac_ext <<EOF -#line 5231 "configure" +#line 5088 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_type_in_def="yes" else @@ -5258,7 +5115,7 @@ echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6 -echo "configure:5262: checking "whether external symbols need an underscore prefix"" >&5 +echo "configure:5119: checking "whether external symbols need an underscore prefix"" >&5 if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5270,14 +5127,14 @@ .long 0 EOF cat > conftest.$ac_ext <<EOF -#line 5274 "configure" +#line 5131 "configure" #include "confdefs.h" extern int ac_test; int main() { if (ac_test) return 1 ; return 0; } EOF -if { (eval echo configure:5281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_extern_prefix="yes" else @@ -5301,7 +5158,7 @@ echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6 -echo "configure:5305: checking "whether assembler accepts .string"" >&5 +echo "configure:5162: checking "whether assembler accepts .string"" >&5 if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5311,14 +5168,14 @@ .string "test" EOF cat > conftest.$ac_ext <<EOF -#line 5315 "configure" +#line 5172 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_asm_string="yes" else @@ -5346,21 +5203,21 @@ if test "$LIBEXT" = "so" then echo $ac_n "checking "whether we can build a GNU style ELF dll"""... $ac_c" 1>&6 -echo "configure:5350: checking "whether we can build a GNU style ELF dll"" >&5 +echo "configure:5207: checking "whether we can build a GNU style ELF dll"" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_gnuelf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0,-Bsymbolic" cat > conftest.$ac_ext <<EOF -#line 5357 "configure" +#line 5214 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:5364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_gnuelf="yes" else @@ -5381,21 +5238,21 @@ LDDLLFLAGS="-Wl,-Bsymbolic" else echo $ac_n "checking whether we can build a UnixWare (Solaris) dll""... $ac_c" 1>&6 -echo "configure:5385: checking whether we can build a UnixWare (Solaris) dll" >&5 +echo "configure:5242: checking whether we can build a UnixWare (Solaris) dll" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_unixware'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic" cat > conftest.$ac_ext <<EOF -#line 5392 "configure" +#line 5249 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:5399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_unixware="yes" else @@ -5450,21 +5307,21 @@ else DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) \$(LIBWINE) \$(LIBUNICODE) \$(X_LIBS) \$(XLIB)" echo $ac_n "checking whether the linker supports --[no]-whole-archive (Linux)""... $ac_c" 1>&6 -echo "configure:5454: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 +echo "configure:5311: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 if eval "test \"`echo '$''{'ac_cv_c_whole_archive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -Wl,--whole-archive -Wl,--no-whole-archive" cat > conftest.$ac_ext <<EOF -#line 5461 "configure" +#line 5318 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_whole_archive="yes" else @@ -5484,21 +5341,21 @@ DLL_LINK="-Wl,--whole-archive $DLL_LINK -Wl,--no-whole-archive" else echo $ac_n "checking whether the linker supports -z {all,default}extract (Linux)""... $ac_c" 1>&6 -echo "configure:5488: checking whether the linker supports -z {all,default}extract (Linux)" >&5 +echo "configure:5345: checking whether the linker supports -z {all,default}extract (Linux)" >&5 if eval "test \"`echo '$''{'ac_cv_c_allextract'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -Wl,-z,allextract -Wl,-z,defaultextract" cat > conftest.$ac_ext <<EOF -#line 5495 "configure" +#line 5352 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:5502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_allextract="yes" else @@ -5533,7 +5390,7 @@ wine_cv_libc_reentrant=no echo $ac_n "checking for reentrant libc: __errno_location""... $ac_c" 1>&6 -echo "configure:5537: checking for reentrant libc: __errno_location" >&5 +echo "configure:5394: checking for reentrant libc: __errno_location" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r___errno_location'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5541,14 +5398,14 @@ wine_cv_libc_r___errno_location=yes else cat > conftest.$ac_ext <<EOF -#line 5545 "configure" +#line 5402 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__errno_location(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r___errno_location=yes else @@ -5571,7 +5428,7 @@ echo $ac_n "checking for reentrant libc: __error""... $ac_c" 1>&6 -echo "configure:5575: checking for reentrant libc: __error" >&5 +echo "configure:5432: checking for reentrant libc: __error" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r___error'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5579,14 +5436,14 @@ wine_cv_libc_r___error=yes else cat > conftest.$ac_ext <<EOF -#line 5583 "configure" +#line 5440 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__error(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:5590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r___error=yes else @@ -5609,7 +5466,7 @@ echo $ac_n "checking for reentrant libc: ___errno""... $ac_c" 1>&6 -echo "configure:5613: checking for reentrant libc: ___errno" >&5 +echo "configure:5470: checking for reentrant libc: ___errno" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r____errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5617,14 +5474,14 @@ wine_cv_libc_r____errno=yes else cat > conftest.$ac_ext <<EOF -#line 5621 "configure" +#line 5478 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *___errno(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r____errno=yes else @@ -5647,7 +5504,7 @@ echo $ac_n "checking for reentrant libc: __thr_errno""... $ac_c" 1>&6 -echo "configure:5651: checking for reentrant libc: __thr_errno" >&5 +echo "configure:5508: checking for reentrant libc: __thr_errno" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r___thr_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5655,14 +5512,14 @@ wine_cv_libc_r___thr_errno=yes else cat > conftest.$ac_ext <<EOF -#line 5659 "configure" +#line 5516 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__thr_errno(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r___thr_errno=yes else @@ -5685,7 +5542,7 @@ echo $ac_n "checking for reentrant libc: __errno""... $ac_c" 1>&6 -echo "configure:5689: checking for reentrant libc: __errno" >&5 +echo "configure:5546: checking for reentrant libc: __errno" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r___errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5693,14 +5550,14 @@ wine_cv_libc_r___errno=yes else cat > conftest.$ac_ext <<EOF -#line 5697 "configure" +#line 5554 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__errno(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:5704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r___errno=yes else @@ -5734,7 +5591,7 @@ if test "$have_x" = "yes" -a "$wine_cv_libc_reentrant" != "no" then echo $ac_n "checking "for reentrant X libraries"""... $ac_c" 1>&6 -echo "configure:5738: checking "for reentrant X libraries"" >&5 +echo "configure:5595: checking "for reentrant X libraries"" >&5 if eval "test \"`echo '$''{'wine_cv_x_reentrant'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5783,19 +5640,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:5787: checking for working alloca.h" >&5 +echo "configure:5644: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5792 "configure" +#line 5649 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:5799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -5816,12 +5673,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:5820: checking for alloca" >&5 +echo "configure:5677: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5825 "configure" +#line 5682 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -5849,7 +5706,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:5853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -5881,12 +5738,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:5885: checking whether alloca needs Cray hooks" >&5 +echo "configure:5742: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5890 "configure" +#line 5747 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -5911,12 +5768,12 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5915: checking for $ac_func" >&5 +echo "configure:5772: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5920 "configure" +#line 5777 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5939,7 +5796,7 @@ ; return 0; } EOF -if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5966,7 +5823,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5970: checking stack direction for C alloca" >&5 +echo "configure:5827: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5974,7 +5831,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 5978 "configure" +#line 5835 "configure" #include "confdefs.h" find_stack_direction () { @@ -5993,7 +5850,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:5997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -6053,12 +5910,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6057: checking for $ac_func" >&5 +echo "configure:5914: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6062 "configure" +#line 5919 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6081,7 +5938,7 @@ ; return 0; } EOF -if { (eval echo configure:6085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6163,17 +6020,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6167: checking for $ac_hdr" >&5 +echo "configure:6024: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6172 "configure" +#line 6029 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6200,12 +6057,12 @@ done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:6204: checking whether stat file-mode macros are broken" >&5 +echo "configure:6061: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6209 "configure" +#line 6066 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -6258,12 +6115,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6262: checking for working const" >&5 +echo "configure:6119: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6267 "configure" +#line 6124 "configure" #include "confdefs.h" int main() { @@ -6312,7 +6169,7 @@ ; return 0; } EOF -if { (eval echo configure:6316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6333,21 +6190,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:6337: checking for inline" >&5 +echo "configure:6194: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 6344 "configure" +#line 6201 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:6351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -6373,12 +6230,12 @@ esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:6377: checking for ANSI C header files" >&5 +echo "configure:6234: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6382 "configure" +#line 6239 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -6386,7 +6243,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6403,7 +6260,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 6407 "configure" +#line 6264 "configure" #include "confdefs.h" #include <string.h> EOF @@ -6421,7 +6278,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 6425 "configure" +#line 6282 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -6442,7 +6299,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 6446 "configure" +#line 6303 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6453,7 +6310,7 @@ exit (0); } EOF -if { (eval echo configure:6457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6477,12 +6334,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6481: checking for size_t" >&5 +echo "configure:6338: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6486 "configure" +#line 6343 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6510,7 +6367,7 @@ fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:6514: checking size of long long" >&5 +echo "configure:6371: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6518,7 +6375,7 @@ ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext <<EOF -#line 6522 "configure" +#line 6379 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> @@ -6530,7 +6387,7 @@ exit(0); } EOF -if { (eval echo configure:6534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -6551,12 +6408,12 @@ echo $ac_n "checking "whether linux/input.h is for real"""... $ac_c" 1>&6 -echo "configure:6555: checking "whether linux/input.h is for real"" >&5 +echo "configure:6412: checking "whether linux/input.h is for real"" >&5 if eval "test \"`echo '$''{'wine_cv_linux_input_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6560 "configure" +#line 6417 "configure" #include "confdefs.h" #include <linux/input.h> @@ -6569,7 +6426,7 @@ ; return 0; } EOF -if { (eval echo configure:6573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_input_h=yes else @@ -6593,12 +6450,12 @@ echo $ac_n "checking "whether we can use re-entrant gethostbyname_r Linux style"""... $ac_c" 1>&6 -echo "configure:6597: checking "whether we can use re-entrant gethostbyname_r Linux style"" >&5 +echo "configure:6454: checking "whether we can use re-entrant gethostbyname_r Linux style"" >&5 if eval "test \"`echo '$''{'wine_cv_linux_gethostbyname_r_6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6602 "configure" +#line 6459 "configure" #include "confdefs.h" #include <netdb.h> @@ -6619,7 +6476,7 @@ ; return 0; } EOF -if { (eval echo configure:6623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_gethostbyname_r_6=yes else @@ -6645,12 +6502,12 @@ if test "$ac_cv_header_linux_joystick_h" = "yes" then echo $ac_n "checking "whether linux/joystick.h uses the Linux 2.2+ API"""... $ac_c" 1>&6 -echo "configure:6649: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 +echo "configure:6506: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 if eval "test \"`echo '$''{'wine_cv_linux_joystick_22_api'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6654 "configure" +#line 6511 "configure" #include "confdefs.h" #include <sys/ioctl.h> @@ -6665,7 +6522,7 @@ /*empty*/ ; return 0; } EOF -if { (eval echo configure:6669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_joystick_22_api=yes else @@ -6692,12 +6549,12 @@ if test "$ac_cv_header_sys_vfs_h" = "yes" then echo $ac_n "checking "whether sys/vfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:6696: checking "whether sys/vfs.h defines statfs"" >&5 +echo "configure:6553: checking "whether sys/vfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_vfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6701 "configure" +#line 6558 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6714,7 +6571,7 @@ ; return 0; } EOF -if { (eval echo configure:6718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_vfs_has_statfs=yes else @@ -6741,12 +6598,12 @@ if test "$ac_cv_header_sys_statfs_h" = "yes" then echo $ac_n "checking "whether sys/statfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:6745: checking "whether sys/statfs.h defines statfs"" >&5 +echo "configure:6602: checking "whether sys/statfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_statfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6750 "configure" +#line 6607 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6761,7 +6618,7 @@ ; return 0; } EOF -if { (eval echo configure:6765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_statfs_has_statfs=yes else @@ -6788,12 +6645,12 @@ if test "$ac_cv_header_sys_mount_h" = "yes" then echo $ac_n "checking "whether sys/mount.h defines statfs"""... $ac_c" 1>&6 -echo "configure:6792: checking "whether sys/mount.h defines statfs"" >&5 +echo "configure:6649: checking "whether sys/mount.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_mount_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6797 "configure" +#line 6654 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6808,7 +6665,7 @@ ; return 0; } EOF -if { (eval echo configure:6812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_mount_has_statfs=yes else @@ -6834,7 +6691,7 @@ echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6 -echo "configure:6838: checking "for statfs.f_bfree"" >&5 +echo "configure:6695: checking "for statfs.f_bfree"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bfree'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6843,7 +6700,7 @@ wine_cv_statfs_bfree=no else cat > conftest.$ac_ext <<EOF -#line 6847 "configure" +#line 6704 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6870,7 +6727,7 @@ ; return 0; } EOF -if { (eval echo configure:6874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bfree=yes else @@ -6894,7 +6751,7 @@ fi echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6 -echo "configure:6898: checking "for statfs.f_bavail"" >&5 +echo "configure:6755: checking "for statfs.f_bavail"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bavail'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6903,7 +6760,7 @@ wine_cv_statfs_bavail=no else cat > conftest.$ac_ext <<EOF -#line 6907 "configure" +#line 6764 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6930,7 +6787,7 @@ ; return 0; } EOF -if { (eval echo configure:6934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bavail=yes else @@ -6955,12 +6812,12 @@ echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6 -echo "configure:6959: checking "for msg_accrights in struct msghdr"" >&5 +echo "configure:6816: checking "for msg_accrights in struct msghdr"" >&5 if eval "test \"`echo '$''{'ac_cv_c_msg_accrights'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6964 "configure" +#line 6821 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6968,7 +6825,7 @@ struct msghdr hdr; hdr.msg_accrights=0 ; return 0; } EOF -if { (eval echo configure:6972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_msg_accrights="yes" else @@ -6991,12 +6848,12 @@ echo $ac_n "checking "for sun_len in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:6995: checking "for sun_len in struct sockaddr_un"" >&5 +echo "configure:6852: checking "for sun_len in struct sockaddr_un"" >&5 if eval "test \"`echo '$''{'ac_cv_c_sun_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7000 "configure" +#line 6857 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -7005,7 +6862,7 @@ static struct sockaddr_un addr; addr.sun_len = 1 ; return 0; } EOF -if { (eval echo configure:7009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_sun_len="yes" else @@ -7028,12 +6885,12 @@ echo $ac_n "checking "whether we need to define __i386__"""... $ac_c" 1>&6 -echo "configure:7032: checking "whether we need to define __i386__"" >&5 +echo "configure:6889: checking "whether we need to define __i386__"" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_def_i386'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7037 "configure" +#line 6894 "configure" #include "confdefs.h" #if (defined(i386) || defined(__i386)) && !defined(__i386__) yes
diff --git a/configure.in b/configure.in index 9e34ffa..667baf0 100644 --- a/configure.in +++ b/configure.in
@@ -38,13 +38,12 @@ if test "$DEBUG_MSGS" = "no" then - AC_DEFINE(NO_DEBUG_MSGS) - AC_DEFINE(NO_TRACE_MSGS) -else - if test "$TRACE_MSGS" = "no" - then - AC_DEFINE(NO_TRACE_MSGS) - fi + AC_DEFINE(NO_DEBUG_MSGS, 1, [Define if all debug messages are to be compiled out]) +fi + +if test "$TRACE_MSGS" = "no" -o "$DEBUG_MSGS" = "no" +then + AC_DEFINE(NO_TRACE_MSGS, 1, [Define if TRACE messages are to be compiled out]) fi dnl **** Check for some programs **** @@ -114,16 +113,15 @@ )) AC_CHECK_HEADERS(dlfcn.h, - AC_CHECK_FUNCS(dlopen, - AC_DEFINE(HAVE_DL_API), - AC_CHECK_LIB(dl,dlopen, - AC_DEFINE(HAVE_DL_API) - LIBS="$LIBS -ldl", - LIBEXT="a" - ) - ), - LIBEXT="a" -) + AC_CHECK_FUNCS(dlopen,, + AC_CHECK_LIB(dl,dlopen, + AC_DEFINE(HAVE_DLOPEN) + LIBS="$LIBS -ldl", + LIBEXT="a") + ), + LIBEXT="a" + ) + AC_SUBST(XLIB) AC_SUBST(X_DLLS) X_DLLS="" @@ -147,7 +145,8 @@ AC_CHECK_HEADERS(X11/xpm.h, [ dnl *** If X11/xpm.h exists... AC_CHECK_LIB(Xpm, XpmCreatePixmapFromData, - [ AC_DEFINE(HAVE_LIBXXPM) X_PRE_LIBS="$X_PRE_LIBS -lXpm"],, + [ AC_DEFINE(HAVE_LIBXXPM, 1, [Define if you have the Xpm library]) + X_PRE_LIBS="$X_PRE_LIBS -lXpm"],, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ) ], @@ -174,7 +173,7 @@ AC_CHECK_HEADERS(X11/XKBlib.h, [ dnl *** If X11/XKBlib.h exists... AC_CHECK_LIB(X11, XkbQueryExtension, - AC_DEFINE(HAVE_XKB),, + AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) ], AC_MSG_WARN([XKB extension not found!!]) @@ -184,7 +183,7 @@ AC_CHECK_HEADERS(X11/extensions/XShm.h, [ dnl *** If X11/extensions/XShm.h exists... AC_CHECK_LIB(Xext, XShmQueryExtension, - AC_DEFINE(HAVE_LIBXXSHM),, + AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) ], AC_MSG_WARN([Xshm extension not found!!]) @@ -194,7 +193,7 @@ AC_CHECK_HEADERS(X11/extensions/shape.h, [ dnl *** If X11/extensions/shape.h exists... AC_CHECK_LIB(Xext,XShapeQueryExtension, - AC_DEFINE(HAVE_LIBXSHAPE),, + AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS) ], AC_MSG_WARN([XShape extension not found!!]) @@ -206,14 +205,15 @@ dnl *** for XDGAQueryExtension()... AC_CHECK_LIB(Xxf86dga, XDGAQueryExtension, [ dnl *** If found... - AC_DEFINE(HAVE_LIBXXF86DGA2) - AC_DEFINE(HAVE_LIBXXF86DGA) + AC_DEFINE(HAVE_LIBXXF86DGA2, 1, + [Define if you have the Xxf86dga library version 2]) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga" ], [ dnl *** If not found, look for XF86DGAQueryExtension() dnl *** instead (DGA 2.0 not found)... AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension, - [ AC_DEFINE(HAVE_LIBXXF86DGA) + [ AC_DEFINE(HAVE_LIBXXF86DGA, 1, + [Define if you have the Xxf86dga library version 1]) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga" ],, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS @@ -229,7 +229,7 @@ AC_CHECK_HEADERS(X11/extensions/xf86vmode.h, [ dnl *** If X11/extensions/xf86vmode.h exists... AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, - [ AC_DEFINE(HAVE_LIBXXF86VM) + [ AC_DEFINE(HAVE_LIBXXF86VM, 1, [Define if you have the Xxf86vm library]) X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm" ],, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS @@ -242,7 +242,7 @@ AC_CHECK_HEADERS(X11/extensions/Xvlib.h, [ dnl *** If X11/extensions/Xvlib.h exists... AC_CHECK_LIB(Xv, XvShmCreateImage, - [ AC_DEFINE(HAVE_XVIDEO) + [ AC_DEFINE(HAVE_XVIDEO, 1, [Define if the X libraries support XVideo]) X_PRE_LIBS="$X_PRE_LIBS -lXv" ],, $X_LIBS -lXext -lX11 $X_EXTRA_LIBS @@ -293,9 +293,12 @@ then OPENGLFILES='$(OPENGLFILES)' - AC_DEFINE(HAVE_OPENGL) + AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system]) - AC_CHECK_LIB(GL,glXGetProcAddressARB,AC_DEFINE(HAVE_GLX_GETPROCADDRESS),,$X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) + AC_CHECK_LIB(GL,glXGetProcAddressARB, + AC_DEFINE(HAVE_GLX_GETPROCADDRESS, 1, + [Define if the OpenGL library supports the glXGetProcAddressARB call]),, + $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS) if test $ac_cv_lib_GL_glXGetProcAddressARB = "yes" then @@ -312,7 +315,8 @@ ) if test $wine_cv_extension_prototypes = "yes" then - AC_DEFINE(HAVE_GLEXT_PROTOTYPES) + AC_DEFINE(HAVE_GLEXT_PROTOTYPES, 1, + [Define if the OpenGL headers define extension typedefs]) fi OPENGL32_DLL=opengl32 @@ -320,12 +324,10 @@ AC_CHECK_HEADERS(GL/osmesa.h, [ dnl *** If GL/osmesa.h exists... - AC_CHECK_LIB(GL, OSMesaCreateContext, - AC_DEFINE(HAVE_OSMESA), + AC_CHECK_LIB(GL, OSMesaCreateContext,, AC_CHECK_LIB(OSMesa, OSMesaCreateContext, - [ AC_DEFINE(HAVE_OSMESA) - X_PRE_LIBS="$X_PRE_LIBS -lOSMesa" - ],,-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS), + X_PRE_LIBS="$X_PRE_LIBS -lOSMesa",, + -lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS), $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS ) ] @@ -355,27 +357,10 @@ dnl **** Check which curses lib to use *** if test "$CURSES" = "yes" then - AC_CHECK_HEADERS(ncurses.h) - if test "$ac_cv_header_ncurses_h" = "yes" - then - AC_CHECK_LIB(ncurses,waddch) - fi - if test "$ac_cv_lib_ncurses_waddch" = "yes" - then - AC_CHECK_LIB(ncurses,resizeterm,AC_DEFINE(HAVE_RESIZETERM)) - AC_CHECK_LIB(ncurses,getbkgd,AC_DEFINE(HAVE_GETBKGD)) - else - AC_CHECK_HEADERS(curses.h) - if test "$ac_cv_header_curses_h" = "yes" - then - AC_CHECK_LIB(curses,waddch) - if test "$ac_cv_lib_curses_waddch" = "yes" - then - AC_CHECK_LIB(curses,resizeterm,AC_DEFINE(HAVE_RESIZETERM)) - AC_CHECK_LIB(curses,getbkgd,AC_DEFINE(HAVE_GETBKGD)) - fi - fi - fi + AC_CHECK_HEADERS(ncurses.h, + AC_CHECK_LIB(ncurses,waddch), + AC_CHECK_HEADERS(curses.h,AC_CHECK_LIB(curses,waddch))) + AC_CHECK_FUNCS(getbkgd resizeterm) fi CUPSLIBS="" @@ -383,7 +368,7 @@ wine_cv_warn_cups_h=no AC_CHECK_LIB(cups,cupsGetPPD, AC_CHECK_HEADER(cups/cups.h, - AC_DEFINE(HAVE_CUPS) + AC_DEFINE(HAVE_CUPS, 1, [Define if we have CUPS]) CUPSLIBS="-lcups", wine_cv_warn_cups_h=yes) ) @@ -412,7 +397,7 @@ FREETYPEINCL="" wine_cv_msg_freetype=yes else - AC_DEFINE(HAVE_FREETYPE) + AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed]) FREETYPELIBS=`$ft_devel --libs` FREETYPEINCL=`$ft_devel --cflags` ac_save_CPPFLAGS="$CPPFLAGS" @@ -440,7 +425,7 @@ ) if test "$ac_cv_c_ppdev" = "yes" then - AC_DEFINE(HAVE_PPDEV,1,[Define if we can use ppdev.h for parallel port access]) + AC_DEFINE(HAVE_PPDEV, 1, [Define if we can use ppdev.h for parallel port access]) fi dnl **** Check for IPX (currently Linux only) **** @@ -454,7 +439,7 @@ ) if test "$ac_cv_c_ipx_gnu" = "yes" then - AC_DEFINE(HAVE_IPX_GNU) + AC_DEFINE(HAVE_IPX_GNU, 1, [Define if IPX should use netipx/ipx.h from libc]) fi if test "$ac_cv_c_ipx_gnu" = "no" @@ -470,7 +455,7 @@ ) if test "$ac_cv_c_ipx_linux" = "yes" then - AC_DEFINE(HAVE_IPX_LINUX) + AC_DEFINE(HAVE_IPX_LINUX, 1, [Define if IPX includes are taken from Linux kernel]) fi fi @@ -497,7 +482,7 @@ if test "$ac_cv_c_opensoundsystem" = "yes" then - AC_DEFINE(HAVE_OSS) + AC_DEFINE(HAVE_OSS, 1, [Define if you have the Open Sound system]) fi AC_CACHE_CHECK("for Open Sound System/MIDI interface", @@ -520,7 +505,7 @@ if test "$ac_cv_c_opensoundsystem_midi" = "yes" then - AC_DEFINE(HAVE_OSS_MIDI) + AC_DEFINE(HAVE_OSS_MIDI, 1, [Define if you have the Open Sound system (MIDI interface)]) fi dnl **** If ln -s doesn't work, use cp instead **** @@ -621,7 +606,7 @@ LIBS=$saved_libs]) if test "$ac_cv_c_type_in_def" = "yes" then - AC_DEFINE(NEED_TYPE_IN_DEF) + AC_DEFINE(NEED_TYPE_IN_DEF, 1, [Define if .type asm directive must be inside a .def directive]) fi dnl **** Check for underscore on external symbols **** @@ -640,7 +625,8 @@ LIBS=$saved_libs]) if test "$ac_cv_c_extern_prefix" = "yes" then - AC_DEFINE(NEED_UNDERSCORE_PREFIX) + AC_DEFINE(NEED_UNDERSCORE_PREFIX, 1, + [Define if symbols declared in assembly code need an underscore prefix]) fi dnl **** Check for .string in assembler **** @@ -656,7 +642,7 @@ LIBS=$saved_libs]) if test "$ac_cv_c_asm_string" = "yes" then - AC_DEFINE(HAVE_ASM_STRING) + AC_DEFINE(HAVE_ASM_STRING, 1, [Define to use .string instead of .ascii]) fi dnl **** Check for working dll **** @@ -791,7 +777,8 @@ if test "$wine_cv_libc_reentrant" != "no" then - AC_DEFINE_UNQUOTED(ERRNO_LOCATION,$wine_cv_libc_reentrant) + AC_DEFINE_UNQUOTED(ERRNO_LOCATION,$wine_cv_libc_reentrant, + [Define to the name of the function returning errno for reentrant libc]) fi dnl **** Check for reentrant X libraries **** @@ -834,7 +821,8 @@ fi if test "$wine_cv_x_reentrant" = "no" then - AC_DEFINE(NO_REENTRANT_X11) + AC_DEFINE(NO_REENTRANT_X11, 1, + [Define if X libraries are not reentrant (compiled without -D_REENTRANT)]) fi @@ -959,7 +947,8 @@ ) if test "$wine_cv_linux_input_h" = "yes" then - AC_DEFINE(HAVE_CORRECT_LINUXINPUT_H) + AC_DEFINE(HAVE_CORRECT_LINUXINPUT_H, 1, + [Define if we have linux/input.h AND it contains the INPUT event API]) fi @@ -986,7 +975,8 @@ ) if test "$wine_cv_linux_gethostbyname_r_6" = "yes" then - AC_DEFINE(HAVE_LINUX_GETHOSTBYNAME_R_6) + AC_DEFINE(HAVE_LINUX_GETHOSTBYNAME_R_6, 1, + [Define if Linux-style gethostbyname_r and gethostbyaddr_r are available]) fi if test "$ac_cv_header_linux_joystick_h" = "yes" @@ -1009,7 +999,8 @@ ) if test "$wine_cv_linux_joystick_22_api" = "yes" then - AC_DEFINE(HAVE_LINUX_22_JOYSTICK_API) + AC_DEFINE(HAVE_LINUX_22_JOYSTICK_API, 1, + [Define if <linux/joystick.h> defines the Linux 2.2 joystick API]) fi fi @@ -1034,7 +1025,8 @@ ) if test "$wine_cv_sys_vfs_has_statfs" = "yes" then - AC_DEFINE(STATFS_DEFINED_BY_SYS_VFS) + AC_DEFINE(STATFS_DEFINED_BY_SYS_VFS, 1, + [Define if the struct statfs is defined by <sys/vfs.h>]) fi fi @@ -1055,7 +1047,8 @@ ) if test "$wine_cv_sys_statfs_has_statfs" = "yes" then - AC_DEFINE(STATFS_DEFINED_BY_SYS_STATFS) + AC_DEFINE(STATFS_DEFINED_BY_SYS_STATFS, 1, + [Define if the struct statfs is defined by <sys/statfs.h>]) fi fi @@ -1076,7 +1069,8 @@ ) if test "$wine_cv_sys_mount_has_statfs" = "yes" then - AC_DEFINE(STATFS_DEFINED_BY_SYS_MOUNT) + AC_DEFINE(STATFS_DEFINED_BY_SYS_MOUNT, 1, + [Define if the struct statfs is defined by <sys/mount.h>]) fi fi @@ -1112,7 +1106,7 @@ fi ] ) if test "$wine_cv_statfs_bfree" = "yes" then - AC_DEFINE(STATFS_HAS_BFREE) + AC_DEFINE(STATFS_HAS_BFREE, 1, [Define if the struct statfs has the member bfree]) fi AC_CACHE_CHECK( "for statfs.f_bavail", wine_cv_statfs_bavail, @@ -1145,7 +1139,7 @@ fi ] ) if test "$wine_cv_statfs_bavail" = "yes" then - AC_DEFINE(STATFS_HAS_BAVAIL) + AC_DEFINE(STATFS_HAS_BAVAIL, 1, [Define if the struct statfs has the member bavail]) fi dnl *** check for file descriptor passing with msg_accrights @@ -1156,7 +1150,7 @@ ac_cv_c_msg_accrights="yes", ac_cv_c_msg_accrights="no")) if test "$ac_cv_c_msg_accrights" = "yes" then - AC_DEFINE(HAVE_MSGHDR_ACCRIGHTS) + AC_DEFINE(HAVE_MSGHDR_ACCRIGHTS, 1, [Define if struct msghdr contains msg_accrights]) fi dnl *** Check for the sun_len member in struct sockaddr_un @@ -1168,7 +1162,7 @@ ac_cv_c_sun_len="yes", ac_cv_c_sun_len="no")) if test "$ac_cv_c_sun_len" = "yes" then - AC_DEFINE(HAVE_SOCKADDR_SUN_LEN) + AC_DEFINE(HAVE_SOCKADDR_SUN_LEN, 1, [Define if struct sockaddr_un contains sun_len]) fi dnl *** check for the need to define __i386__
diff --git a/include/acconfig.h b/include/acconfig.h deleted file mode 100644 index faf5c31..0000000 --- a/include/acconfig.h +++ /dev/null
@@ -1,127 +0,0 @@ -/* - * This file is used by 'autoheader' to generate the list of symbols - * defined in the 'configure' script. - */ - -/* Define if .type asm directive must be inside a .def directive */ -#undef NEED_TYPE_IN_DEF - -/* Define if symbols declared in assembly code need an underscore prefix */ -#undef NEED_UNDERSCORE_PREFIX - -/* Define to use .string instead of .ascii */ -#undef HAVE_ASM_STRING - -/* Define if struct msghdr contains msg_accrights */ -#undef HAVE_MSGHDR_ACCRIGHTS - -/* Define if struct sockaddr_un contains sun_len */ -#undef HAVE_SOCKADDR_SUN_LEN - -/* Define if you have the XKB extension */ -#undef HAVE_XKB - -/* Define if you have the Xxf86dga library (-lXxf86dga). */ -#undef HAVE_LIBXXF86DGA - -/* Define if you have the Xxf86dga library version 2.0 (-lXxf86dga). */ -#undef HAVE_LIBXXF86DGA2 - -/* Define if you have the X Shm extension */ -#undef HAVE_LIBXXSHM - -/* Define if you have the X Shape extension */ -#undef HAVE_LIBXSHAPE - -/* Define if you have the Xxf86vm library */ -#undef HAVE_LIBXXF86VM - -/* Define if you have the Xpm library */ -#undef HAVE_LIBXXPM - -/* Define if you have the Open Sound system. */ -#undef HAVE_OSS - -/* Define if you have the Open Sound system (MIDI interface). */ -#undef HAVE_OSS_MIDI - -/* Define if X libraries are not reentrant (compiled without -D_REENTRANT). */ -#undef NO_REENTRANT_X11 - -/* Define to the name of the function returning erro for reentrant libc */ -#undef ERRNO_LOCATION - -/* Define if all debug messages are to be compiled out */ -#undef NO_DEBUG_MSGS - -/* Define if TRACE messages are to be compiled out */ -#undef NO_TRACE_MSGS - -/* Define if the struct statfs has the member bavail */ -#undef STATFS_HAS_BAVAIL - -/* Define if the struct statfs has the member bfree */ -#undef STATFS_HAS_BFREE - -/* Define if the struct statfs is defined by <sys/vfs.h> */ -#undef STATFS_DEFINED_BY_SYS_VFS - -/* Define if the struct statfs is defined by <sys/statfs.h> */ -#undef STATFS_DEFINED_BY_SYS_STATFS - -/* Define if the struct statfs is defined by <sys/mount.h> */ -#undef STATFS_DEFINED_BY_SYS_MOUNT - -/* Define if we can use ncurses for full-screen access */ -#undef HAVE_LIBNCURSES - -/* Define if we can use curses (if no ncurses) for full-screen access */ -#undef HAVE_LIBCURSES - -/* Define if ncurses have the new resizeterm function */ -#undef HAVE_RESIZETERM - -/* Define if ncurses have the new getbkgd function */ -#undef HAVE_GETBKGD - -/* Define if we can a compatible xterm program */ -#undef XTERM_PROGRAM - -/* Define if IPX should use netipx/ipx.h from libc */ -#undef HAVE_IPX_GNU - -/* Define if IPX includes are taken from Linux kernel */ -#undef HAVE_IPX_LINUX - -/* Define if OpenGL is present on the system or not */ -#undef HAVE_OPENGL - -/* Define if the system has dynamic link library support with the dl* API */ -#undef HAVE_DL_API - -/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */ -#undef HAVE_LINUX_22_JOYSTICK_API - -/* Define if the OpenGL library supports the glXGetProcAddressARB call */ -#undef HAVE_GLX_GETPROCADDRESS - -/* Define if the OpenGL headers define extension typedefs */ -#undef HAVE_GLEXT_PROTOTYPES - -/* Define if the X libraries support XVideo */ -#undef HAVE_XVIDEO - -/* Define if Mesa's OSMesa (off-screen rendering) library is present */ -#undef HAVE_OSMESA - -/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ -#undef HAVE_LINUX_GETHOSTBYNAME_R_6 - -/* Define if we have linux/input.h AND it contains the INPUT event API */ -#undef HAVE_CORRECT_LINUXINPUT_H - -/* Define if we have CUPS */ -#undef HAVE_CUPS - -/* Define if FreeType 2 is installed */ -#undef HAVE_FREETYPE
diff --git a/include/config.h.in b/include/config.h.in index 52ba496..588b278 100644 --- a/include/config.h.in +++ b/include/config.h.in
@@ -40,120 +40,6 @@ /* Define if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING -/* Define if .type asm directive must be inside a .def directive */ -#undef NEED_TYPE_IN_DEF - -/* Define if symbols declared in assembly code need an underscore prefix */ -#undef NEED_UNDERSCORE_PREFIX - -/* Define to use .string instead of .ascii */ -#undef HAVE_ASM_STRING - -/* Define if struct msghdr contains msg_accrights */ -#undef HAVE_MSGHDR_ACCRIGHTS - -/* Define if struct sockaddr_un contains sun_len */ -#undef HAVE_SOCKADDR_SUN_LEN - -/* Define if you have the XKB extension */ -#undef HAVE_XKB - -/* Define if you have the Xxf86dga library (-lXxf86dga). */ -#undef HAVE_LIBXXF86DGA - -/* Define if you have the Xxf86dga library version 2.0 (-lXxf86dga). */ -#undef HAVE_LIBXXF86DGA2 - -/* Define if you have the X Shm extension */ -#undef HAVE_LIBXXSHM - -/* Define if you have the X Shape extension */ -#undef HAVE_LIBXSHAPE - -/* Define if you have the Xxf86vm library */ -#undef HAVE_LIBXXF86VM - -/* Define if you have the Xpm library */ -#undef HAVE_LIBXXPM - -/* Define if you have the Open Sound system. */ -#undef HAVE_OSS - -/* Define if you have the Open Sound system (MIDI interface). */ -#undef HAVE_OSS_MIDI - -/* Define if X libraries are not reentrant (compiled without -D_REENTRANT). */ -#undef NO_REENTRANT_X11 - -/* Define to the name of the function returning erro for reentrant libc */ -#undef ERRNO_LOCATION - -/* Define if all debug messages are to be compiled out */ -#undef NO_DEBUG_MSGS - -/* Define if TRACE messages are to be compiled out */ -#undef NO_TRACE_MSGS - -/* Define if the struct statfs has the member bavail */ -#undef STATFS_HAS_BAVAIL - -/* Define if the struct statfs has the member bfree */ -#undef STATFS_HAS_BFREE - -/* Define if the struct statfs is defined by <sys/vfs.h> */ -#undef STATFS_DEFINED_BY_SYS_VFS - -/* Define if the struct statfs is defined by <sys/statfs.h> */ -#undef STATFS_DEFINED_BY_SYS_STATFS - -/* Define if the struct statfs is defined by <sys/mount.h> */ -#undef STATFS_DEFINED_BY_SYS_MOUNT - -/* Define if ncurses have the new resizeterm function */ -#undef HAVE_RESIZETERM - -/* Define if ncurses have the new getbkgd function */ -#undef HAVE_GETBKGD - -/* Define if IPX should use netipx/ipx.h from libc */ -#undef HAVE_IPX_GNU - -/* Define if IPX includes are taken from Linux kernel */ -#undef HAVE_IPX_LINUX - -/* Define if OpenGL is present on the system or not */ -#undef HAVE_OPENGL - -/* Define if the system has dynamic link library support with the dl* API */ -#undef HAVE_DL_API - -/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */ -#undef HAVE_LINUX_22_JOYSTICK_API - -/* Define if the OpenGL library supports the glXGetProcAddressARB call */ -#undef HAVE_GLX_GETPROCADDRESS - -/* Define if the OpenGL headers define extension typedefs */ -#undef HAVE_GLEXT_PROTOTYPES - -/* Define if the X libraries support XVideo */ -#undef HAVE_XVIDEO - -/* Define if Mesa's OSMesa (off-screen rendering) library is present */ -#undef HAVE_OSMESA - -/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ -#undef HAVE_LINUX_GETHOSTBYNAME_R_6 - -/* Define if we have linux/input.h AND it contains the INPUT event API */ -#undef HAVE_CORRECT_LINUXINPUT_H - -/* Define if we have CUPS */ -#undef HAVE_CUPS - -/* Define if FreeType 2 is installed */ -#undef HAVE_FREETYPE - /* The number of bytes in a long long. */ #undef SIZEOF_LONG_LONG @@ -184,6 +70,9 @@ /* Define if you have the ftruncate64 function. */ #undef HAVE_FTRUNCATE64 +/* Define if you have the getbkgd function. */ +#undef HAVE_GETBKGD + /* Define if you have the gethostbyname function. */ #undef HAVE_GETHOSTBYNAME @@ -232,6 +121,9 @@ /* Define if you have the openpty function. */ #undef HAVE_OPENPTY +/* Define if you have the resizeterm function. */ +#undef HAVE_RESIZETERM + /* Define if you have the rfork function. */ #undef HAVE_RFORK @@ -502,6 +394,9 @@ /* Define if you have the <ucontext.h> header file. */ #undef HAVE_UCONTEXT_H +/* Define if you have the GL library (-lGL). */ +#undef HAVE_LIBGL + /* Define if you have the curses library (-lcurses). */ #undef HAVE_LIBCURSES @@ -523,9 +418,111 @@ /* Define if you have the xpg4 library (-lxpg4). */ #undef HAVE_LIBXPG4 +/* Define if all debug messages are to be compiled out */ +#undef NO_DEBUG_MSGS + +/* Define if TRACE messages are to be compiled out */ +#undef NO_TRACE_MSGS + +/* Define if you have the Xpm library */ +#undef HAVE_LIBXXPM + +/* Define if you have the XKB extension */ +#undef HAVE_XKB + +/* Define if you have the X Shm extension */ +#undef HAVE_LIBXXSHM + +/* Define if you have the X Shape extension */ +#undef HAVE_LIBXSHAPE + +/* Define if you have the Xxf86dga library version 2 */ +#undef HAVE_LIBXXF86DGA2 + +/* Define if you have the Xxf86dga library version 1 */ +#undef HAVE_LIBXXF86DGA + +/* Define if you have the Xxf86vm library */ +#undef HAVE_LIBXXF86VM + +/* Define if the X libraries support XVideo */ +#undef HAVE_XVIDEO + +/* Define if OpenGL is present on the system */ +#undef HAVE_OPENGL + +/* Define if the OpenGL library supports the glXGetProcAddressARB call */ +#undef HAVE_GLX_GETPROCADDRESS + +/* Define if the OpenGL headers define extension typedefs */ +#undef HAVE_GLEXT_PROTOTYPES + +/* Define if we have CUPS */ +#undef HAVE_CUPS + +/* Define if FreeType 2 is installed */ +#undef HAVE_FREETYPE + /* Define if we can use ppdev.h for parallel port access */ #undef HAVE_PPDEV +/* Define if IPX should use netipx/ipx.h from libc */ +#undef HAVE_IPX_GNU + +/* Define if IPX includes are taken from Linux kernel */ +#undef HAVE_IPX_LINUX + +/* Define if you have the Open Sound system */ +#undef HAVE_OSS + +/* Define if you have the Open Sound system (MIDI interface) */ +#undef HAVE_OSS_MIDI + /* Set this to 64 to enable 64-bit file support on Linux */ #undef _FILE_OFFSET_BITS +/* Define if .type asm directive must be inside a .def directive */ +#undef NEED_TYPE_IN_DEF + +/* Define if symbols declared in assembly code need an underscore prefix */ +#undef NEED_UNDERSCORE_PREFIX + +/* Define to use .string instead of .ascii */ +#undef HAVE_ASM_STRING + +/* Define to the name of the function returning errno for reentrant libc */ +#undef ERRNO_LOCATION + +/* Define if X libraries are not reentrant (compiled without -D_REENTRANT) */ +#undef NO_REENTRANT_X11 + +/* Define if we have linux/input.h AND it contains the INPUT event API */ +#undef HAVE_CORRECT_LINUXINPUT_H + +/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ +#undef HAVE_LINUX_GETHOSTBYNAME_R_6 + +/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */ +#undef HAVE_LINUX_22_JOYSTICK_API + +/* Define if the struct statfs is defined by <sys/vfs.h> */ +#undef STATFS_DEFINED_BY_SYS_VFS + +/* Define if the struct statfs is defined by <sys/statfs.h> */ +#undef STATFS_DEFINED_BY_SYS_STATFS + +/* Define if the struct statfs is defined by <sys/mount.h> */ +#undef STATFS_DEFINED_BY_SYS_MOUNT + +/* Define if the struct statfs has the member bfree */ +#undef STATFS_HAS_BFREE + +/* Define if the struct statfs has the member bavail */ +#undef STATFS_HAS_BAVAIL + +/* Define if struct msghdr contains msg_accrights */ +#undef HAVE_MSGHDR_ACCRIGHTS + +/* Define if struct sockaddr_un contains sun_len */ +#undef HAVE_SOCKADDR_SUN_LEN +
diff --git a/include/wine/port.h b/include/wine/port.h index 8ccd83d..198a7b1 100644 --- a/include/wine/port.h +++ b/include/wine/port.h
@@ -140,7 +140,7 @@ extern void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize ); extern int wine_dlclose( void *handle, char *error, int errorsize ); -#ifdef HAVE_DL_API +#ifdef HAVE_DLFCN_H #include <dlfcn.h> #else #define RTLD_LAZY 0x001
diff --git a/library/port.c b/library/port.c index 01841d0..03ada14 100644 --- a/library/port.c +++ b/library/port.c
@@ -40,9 +40,6 @@ #ifdef HAVE_LIBUTIL_H # include <libutil.h> #endif -#ifdef HAVE_DL_API -# include <dlfcn.h> -#endif /*********************************************************************** @@ -449,7 +446,7 @@ */ void *wine_dlopen( const char *filename, int flag, char *error, int errorsize ) { -#ifdef HAVE_DL_API +#ifdef HAVE_DLOPEN void *ret; char *s; dlerror(); dlerror(); @@ -477,7 +474,7 @@ */ void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize ) { -#ifdef HAVE_DL_API +#ifdef HAVE_DLOPEN void *ret; char *s; dlerror(); dlerror(); @@ -505,7 +502,7 @@ */ int wine_dlclose( void *handle, char *error, int errorsize ) { -#ifdef HAVE_DL_API +#ifdef HAVE_DLOPEN int ret; char *s; dlerror(); dlerror();
diff --git a/loader/elf.c b/loader/elf.c index 4729531..ed7ac6a 100644 --- a/loader/elf.c +++ b/loader/elf.c
@@ -26,8 +26,6 @@ DEFAULT_DEBUG_CHANNEL(win32); -#ifdef HAVE_DL_API - typedef struct { WORD popl WINE_PACKED; /* 0x8f 0x05 */ DWORD addr_popped WINE_PACKED;/* ... */ @@ -268,12 +266,3 @@ fun = SNOOP_GetProcAddress(wm->module,funcName,stub-first_stub,fun); return (FARPROC)fun; } - -#else /* HAVE_DL_API */ - -WINE_MODREF *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags) -{ - return NULL; -} - -#endif /* HAVE_DL_API */