From f7cb194142bc6a9dc6bad57583bd353dcb3ec992 Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Thu, 30 Dec 1999 14:26:53 +0000 Subject: [PATCH] autoconf updates, several autoconf options have changed how they are run, please run ./configure --help to see what's what. Also made --help output worth looking at. --- configure | 400 ++++++++++++++++++++++++--------------------------- configure.in | 45 ++---- 2 files changed, 202 insertions(+), 243 deletions(-) diff --git a/configure b/configure index bffb6d1..30fbb32 100755 --- a/configure +++ b/configure @@ -12,19 +12,18 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --with-optimize Compile with optimization" + --enable-release compile release (with optimization)" ac_help="$ac_help - --enable-release Compile release (with optimization)" + --with-opengl=DIR use OpenGL with libraries found in DIR" ac_help="$ac_help - --enable-OpenGLLIB=DIR Use OpenGL - the libraries are in DIR" -ac_help="$ac_help - --enable-OpenGLINC=DIR Use OpenGL - the header files are in DIR" + --with-opengl-includes=DIR + use OpenGL with header files found in DIR" ac_help="$ac_help --with-x use the X Window System" ac_help="$ac_help - --enable-glide=DIR Use glide with header files found in DIR" + --with-glide=DIR use the GLIDE 2.x SDK found in DIR" ac_help="$ac_help - --enable-3dfxgl=DIR Use lib3dfxgl.so found in DIR" + --with-3dfxgl=DIR use 3Dfx MiniGL library found in DIR" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -582,7 +581,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:586: checking host system type" >&5 +echo "configure:585: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -603,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:607: checking target system type" >&5 +echo "configure:606: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -621,7 +620,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:625: checking build system type" >&5 +echo "configure:624: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -654,7 +653,7 @@ cross_compiling=$ac_cv_prog_cc_cross # 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:658: checking for $ac_word" >&5 +echo "configure:657: 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 @@ -684,7 +683,7 @@ if test -z "$CC"; then # 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:688: checking for $ac_word" >&5 +echo "configure:687: 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 @@ -735,7 +734,7 @@ fi # 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:739: checking for $ac_word" >&5 +echo "configure:738: 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 @@ -767,7 +766,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:770: 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. @@ -778,12 +777,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 782 "configure" +#line 781 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:786: \"$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 @@ -809,12 +808,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:812: 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:818: checking whether we are using GNU C" >&5 +echo "configure:817: 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 @@ -823,7 +822,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:827: \"$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:826: \"$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 @@ -842,7 +841,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:846: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:845: 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 @@ -874,7 +873,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:878: checking how to run the C preprocessor" >&5 +echo "configure:877: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -889,13 +888,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:898: \"$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 : @@ -906,13 +905,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:915: \"$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 : @@ -923,13 +922,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:932: \"$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 +953,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:958: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:957: 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 @@ -982,14 +981,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:986: checking whether byte ordering is bigendian" >&5 +echo "configure:985: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -1000,11 +999,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -1015,7 +1014,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1035,7 +1034,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1072,14 +1071,6 @@ EOF fi -# Check whether --with-optimize or --without-optimize was given. -if test "${with_optimize+set}" = set; then - withval="$with_optimize" - RELEASE=$with_optimize - -fi - - # Check whether --enable-release or --disable-release was given. if test "${enable_release+set}" = set; then enableval="$enable_release" @@ -1089,18 +1080,18 @@ fi -# Check whether --enable-OpenGLLIB or --disable-OpenGLLIB was given. -if test "${enable_OpenGLLIB+set}" = set; then - enableval="$enable_OpenGLLIB" +# Check whether --with-opengl or --without-opengl was given. +if test "${with_opengl+set}" = set; then + withval="$with_opengl" HAS_OGL_LIB=yes; OGL_LIB_PATH=$enable_OpenGLLIB; OGL_LDFLAGS=-L$enable_OpenGLLIB fi -# Check whether --enable-OpenGLINC or --disable-OpenGLINC was given. -if test "${enable_OpenGLINC+set}" = set; then - enableval="$enable_OpenGLINC" +# Check whether --with-opengl-includes or --without-opengl-includes was given. +if test "${with_opengl_includes+set}" = set; then + withval="$with_opengl_includes" HAS_OGL_INC=yes; OGL_INC_PATH=$enable_OpenGLINC; OGL_CFLAGS=-I$enable_OpenGLINC fi @@ -1111,7 +1102,7 @@ fi # 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:1115: checking for X" >&5 +echo "configure:1106: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1173,12 +1164,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1173: \"$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* @@ -1247,14 +1238,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1249: \"$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. @@ -1360,17 +1351,17 @@ else 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:1364: checking whether -R must be followed by a space" >&5 +echo "configure:1355: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1386,14 +1377,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1425,7 +1416,7 @@ rm -f conftest* # 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:1429: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1420: 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 @@ -1433,7 +1424,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1439: \"$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 @@ -1466,7 +1457,7 @@ fi 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:1470: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1461: 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 @@ -1474,7 +1465,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1480: \"$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 @@ -1514,12 +1505,12 @@ fi # 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:1518: checking for gethostbyname" >&5 +echo "configure:1509: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1537: \"$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 @@ -1563,7 +1554,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1567: checking for gethostbyname in -lnsl" >&5 +echo "configure:1558: 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 @@ -1571,7 +1562,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1577: \"$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 @@ -1612,12 +1603,12 @@ fi # -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:1616: checking for connect" >&5 +echo "configure:1607: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1635: \"$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 @@ -1661,7 +1652,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1665: checking for connect in -lsocket" >&5 +echo "configure:1656: 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 @@ -1669,7 +1660,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1675: \"$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 @@ -1704,12 +1695,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1708: checking for remove" >&5 +echo "configure:1699: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1727: \"$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 @@ -1753,7 +1744,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1757: checking for remove in -lposix" >&5 +echo "configure:1748: 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 @@ -1761,7 +1752,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1767: \"$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 @@ -1796,12 +1787,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1800: checking for shmat" >&5 +echo "configure:1791: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1819: \"$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 @@ -1845,7 +1836,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:1849: checking for shmat in -lipc" >&5 +echo "configure:1840: 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 @@ -1853,7 +1844,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1859: \"$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 @@ -1897,7 +1888,7 @@ fi # 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:1901: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:1892: 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 @@ -1905,7 +1896,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1911: \"$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 @@ -1950,7 +1941,7 @@ HAS_X11=yes X_LIB_PATH_L= fi echo $ac_n "checking for XShmQueryExtension in -lXext""... $ac_c" 1>&6 -echo "configure:1954: checking for XShmQueryExtension in -lXext" >&5 +echo "configure:1945: 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 @@ -1958,7 +1949,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext ${X_LIB_PATH_L} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1964: \"$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 @@ -1997,7 +1988,7 @@ fi if test "x$HAS_OGL_LIB" = x; then echo $ac_n "checking for glColor4f in -lGL""... $ac_c" 1>&6 -echo "configure:2001: checking for glColor4f in -lGL" >&5 +echo "configure:1992: checking for glColor4f in -lGL" >&5 ac_lib_var=`echo GL'_'glColor4f | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2005,7 +1996,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2011: \"$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 @@ -2035,7 +2026,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glColor4f in -lMesaGL""... $ac_c" 1>&6 -echo "configure:2039: checking for glColor4f in -lMesaGL" >&5 +echo "configure:2030: checking for glColor4f in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glColor4f | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2043,7 +2034,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2049: \"$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 @@ -2075,7 +2066,7 @@ else if test "x$HAS_OGL_LIB" != xyes; then POSS_OGL_LDFLAGS=`echo $enable_OpenGLINC| sed 's/include/lib/i'`; echo $ac_n "checking for $POSS_OGL_LDFLAGS/libGL.so""... $ac_c" 1>&6 -echo "configure:2079: checking for $POSS_OGL_LDFLAGS/libGL.so" >&5 +echo "configure:2070: checking for $POSS_OGL_LDFLAGS/libGL.so" >&5 if test -f "$POSS_OGL_LDFLAGS"/libGL.so; then echo "$ac_t""yes" 1>&6 HAS_OGL_LIB=yes @@ -2085,7 +2076,7 @@ echo "configure:2079: checking for $POSS_OGL_LDFLAGS/libGL.so" >&5 echo "$ac_t""no" 1>&6 if test "x$x_libraries" != x; then echo $ac_n "checking for $x_libraries/libGL.so""... $ac_c" 1>&6 -echo "configure:2089: checking for $x_libraries/libGL.so" >&5 +echo "configure:2080: checking for $x_libraries/libGL.so" >&5 if test -f "$x_libraries"/libGL.so; then echo "$ac_t""yes" 1>&6 HAS_OGL_LIB=yes @@ -2108,17 +2099,17 @@ fi if test "x$HAS_OGL_INC" = x; then ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:2112: checking for GL/gl.h" >&5 +echo "configure:2103: checking for GL/gl.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2113: \"$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* @@ -2140,7 +2131,7 @@ else if test "x$HAS_OGL_LIB" != x; then if test "x$x_includes" != x; then echo $ac_n "checking for $x_includes/GL/gl.h""... $ac_c" 1>&6 -echo "configure:2144: checking for $x_includes/GL/gl.h" >&5 +echo "configure:2135: checking for $x_includes/GL/gl.h" >&5 if test -f "$x_includes"/GL/gl.h; then HAS_OGL_INC=yes OGL_CFLAGS=-I$x_includes @@ -2149,7 +2140,7 @@ echo "configure:2144: checking for $x_includes/GL/gl.h" >&5 else POSS_OGL_CFLAGS=`echo $enable_OpenGLLIB| sed 's/lib/include/i'`; echo $ac_n "checking for $POSS_OGL_CFLAGS/GL/gl.h""... $ac_c" 1>&6 -echo "configure:2153: checking for $POSS_OGL_CFLAGS/GL/gl.h" >&5 +echo "configure:2144: checking for $POSS_OGL_CFLAGS/GL/gl.h" >&5 if test -f "$POSS_OGL_CFLAGS/GL/gl.h"; then HAS_OGL_INC=yes OGL_CFLAGS=-I$POSS_OGL_CFLAGS @@ -2167,7 +2158,7 @@ fi fi echo $ac_n "checking for OpenGL support""... $ac_c" 1>&6 -echo "configure:2171: checking for OpenGL support" >&5 +echo "configure:2162: checking for OpenGL support" >&5 if test "x$HAS_OGL_INC" != x; then if test "x$HAS_OGL_LIB" != x; then HAS_OGL=yes @@ -2180,21 +2171,21 @@ if test "x$HAS_OGL_INC" != x; then { echo "configure: error: OpenGL LDFLAGS is -L with no directory" 1>&2; exit 1; } fi echo $ac_n "checking for GL_COLOR_INDEX8_EXT""... $ac_c" 1>&6 -echo "configure:2184: checking for GL_COLOR_INDEX8_EXT" >&5 +echo "configure:2175: checking for GL_COLOR_INDEX8_EXT" >&5 if test "x$OGL_INC_PATH" != x; then OGL_INC_PATH_TO_GL="$OGL_INC_PATH/GL/gl.h" else OGL_INC_PATH_TO_GL="GL/gl.h" fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HAS_GL_COLOR_INDEX8_EXT=yes else @@ -2220,7 +2211,7 @@ fi echo $ac_n "checking for vga_getmousetype in -lvga""... $ac_c" 1>&6 -echo "configure:2224: checking for vga_getmousetype in -lvga" >&5 +echo "configure:2215: checking for vga_getmousetype in -lvga" >&5 ac_lib_var=`echo vga'_'vga_getmousetype | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2228,7 +2219,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lvga $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2234: \"$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 @@ -2262,7 +2253,7 @@ fi echo $ac_n "checking for xil_import in -lxil""... $ac_c" 1>&6 -echo "configure:2266: checking for xil_import in -lxil" >&5 +echo "configure:2257: checking for xil_import in -lxil" >&5 ac_lib_var=`echo xil'_'xil_import | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2270,7 +2261,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2276: \"$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 @@ -2306,9 +2297,9 @@ fi GLIDE_CFLAGS="" GLIDE_LDFLAGS="" -# Check whether --enable-glide or --disable-glide was given. -if test "${enable_glide+set}" = set; then - enableval="$enable_glide" +# Check whether --with-glide or --without-glide was given. +if test "${with_glide+set}" = set; then + withval="$with_glide" HAS_GLIDE=$withval else HAS_GLIDE=auto @@ -2324,17 +2315,17 @@ if test "x$HAS_GLIDE" != xno; then CPPFLAGS="$CPPFLAGS $GLIDE_CFLAGS" ac_safe=`echo "glide.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for glide.h""... $ac_c" 1>&6 -echo "configure:2328: checking for glide.h" >&5 +echo "configure:2319: checking for glide.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2329: \"$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* @@ -2360,17 +2351,17 @@ fi CPPFLAGS="$save_CPPFLAGS -I/usr/include/glide -I/usr/local/include/glide" ac_safe=`echo "glide/glide.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for glide/glide.h""... $ac_c" 1>&6 -echo "configure:2364: checking for glide/glide.h" >&5 +echo "configure:2355: checking for glide/glide.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2365: \"$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* @@ -2396,7 +2387,7 @@ fi CPPFLAGS="$save_CPPFLAGS" if test "x$HAS_GLIDE" = xyes; then echo $ac_n "checking for main in -lglide2x""... $ac_c" 1>&6 -echo "configure:2400: checking for main in -lglide2x" >&5 +echo "configure:2391: checking for main in -lglide2x" >&5 ac_lib_var=`echo glide2x'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2404,14 +2395,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lglide2x -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2406: \"$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 @@ -2444,9 +2435,9 @@ fi TDFXGL_LDFLAGS="" -# Check whether --enable-3dfxgl or --disable-3dfxgl was given. -if test "${enable_3dfxgl+set}" = set; then - enableval="$enable_3dfxgl" +# Check whether --with-3dfxgl or --without-3dfxgl was given. +if test "${with_3dfxgl+set}" = set; then + withval="$with_3dfxgl" HAS_TDFXGL=$withval else HAS_TDFXGL=auto @@ -2463,7 +2454,7 @@ if test "x$HAS_TDFXGL" != xno; then save_LIBS="$LIBS" LIBS="$TDFXGL_LDFLAGS $LIBS" echo $ac_n "checking for glColor4f in -l3dfxgl""... $ac_c" 1>&6 -echo "configure:2467: checking for glColor4f in -l3dfxgl" >&5 +echo "configure:2458: checking for glColor4f in -l3dfxgl" >&5 ac_lib_var=`echo 3dfxgl'_'glColor4f | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2471,7 +2462,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l3dfxgl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2477: \"$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 @@ -2516,13 +2507,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:2520: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:2511: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -2540,7 +2531,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -2562,12 +2553,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for stricmp""... $ac_c" 1>&6 -echo "configure:2566: checking for stricmp" >&5 +echo "configure:2557: checking for stricmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_stricmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_stricmp=yes" else @@ -2608,12 +2599,12 @@ if eval "test \"`echo '$ac_cv_func_'stricmp`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:2612: checking for strcasecmp" >&5 +echo "configure:2603: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -2667,7 +2658,7 @@ fi if test "x$RELEASE" = xyes; then if test "x$GCC" = xyes; then echo $ac_n "checking for special release compiler settings""... $ac_c" 1>&6 -echo "configure:2671: checking for special release compiler settings" >&5 +echo "configure:2662: checking for special release compiler settings" >&5 BASE_RELEASE_CFLAGS="-O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations" case "${target}" in i[34567]86-*-linux-gnu*) @@ -2696,7 +2687,7 @@ fi # is it an intel box? # echo $ac_n "checking for an Intel machine""... $ac_c" 1>&6 -echo "configure:2700: checking for an Intel machine" >&5 +echo "configure:2691: checking for an Intel machine" >&5 case "${target}" in i[34567]86-*-linux-gnu*) INTEL_ARCH=yes @@ -2711,7 +2702,7 @@ esac # CD audio available? # echo $ac_n "checking for CD audio support""... $ac_c" 1>&6 -echo "configure:2715: checking for CD audio support" >&5 +echo "configure:2706: checking for CD audio support" >&5 case "${target}" in i[34567]86-*-linux-gnu*) CD_AUDIO_SRC="cd_linux.c" ;; @@ -2730,7 +2721,7 @@ fi # Sound available? # echo $ac_n "checking for sound support""... $ac_c" 1>&6 -echo "configure:2734: checking for sound support" >&5 +echo "configure:2725: checking for sound support" >&5 case "${target}" in i[34567]86-*-linux-gnu*) SND_SRC="snd_dma.c snd_linux.c snd_mixa.s" ;; @@ -2754,7 +2745,7 @@ fi # System driver? # echo $ac_n "checking for system driver""... $ac_c" 1>&6 -echo "configure:2758: checking for system driver" >&5 +echo "configure:2749: checking for system driver" >&5 case "${target}" in i[34567]86-*-linux-gnu*) SYS_SRC="sys_linux.c" @@ -2791,7 +2782,7 @@ fi # If Solaris, use vid_sunx.c, # otherwise (if X available) use vid_x.c echo $ac_n "checking for X11 video driver""... $ac_c" 1>&6 -echo "configure:2795: checking for X11 video driver" >&5 +echo "configure:2786: checking for X11 video driver" >&5 case "${target}" in *-solaris*) X11_VID_SRC="vid_sunx.c" ;; @@ -2811,12 +2802,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2815: checking for Cygwin environment" >&5 +echo "configure:2806: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2844,19 +2835,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2848: checking for mingw32 environment" >&5 +echo "configure:2839: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2875,7 +2866,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2879: checking for executable suffix" >&5 +echo "configure:2870: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2885,7 +2876,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -2906,13 +2897,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2910: checking for object suffix" >&5 +echo "configure:2901: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2949,17 +2940,17 @@ else 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:2953: checking whether -R must be followed by a space" >&5 +echo "configure:2944: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2975,14 +2966,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3014,7 +3005,7 @@ rm -f conftest* # 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:3018: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3009: 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 @@ -3022,7 +3013,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3028: \"$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 @@ -3055,7 +3046,7 @@ fi 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:3059: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3050: 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 @@ -3063,7 +3054,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3069: \"$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 @@ -3103,12 +3094,12 @@ fi # 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:3107: checking for gethostbyname" >&5 +echo "configure:3098: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3126: \"$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 @@ -3152,7 +3143,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3156: checking for gethostbyname in -lnsl" >&5 +echo "configure:3147: 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 @@ -3160,7 +3151,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3166: \"$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 @@ -3201,12 +3192,12 @@ fi # -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:3205: checking for connect" >&5 +echo "configure:3196: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3224: \"$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 @@ -3250,7 +3241,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3254: checking for connect in -lsocket" >&5 +echo "configure:3245: 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 @@ -3258,7 +3249,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3264: \"$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 @@ -3293,12 +3284,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3297: checking for remove" >&5 +echo "configure:3288: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3316: \"$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 @@ -3342,7 +3333,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3346: checking for remove in -lposix" >&5 +echo "configure:3337: 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 @@ -3350,7 +3341,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3356: \"$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 @@ -3385,12 +3376,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3389: checking for shmat" >&5 +echo "configure:3380: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3408: \"$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 @@ -3434,7 +3425,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3438: checking for shmat in -lipc" >&5 +echo "configure:3429: 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 @@ -3442,7 +3433,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3448: \"$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 @@ -3486,7 +3477,7 @@ fi # 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:3490: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3481: 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 @@ -3494,7 +3485,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3500: \"$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 @@ -3530,16 +3521,6 @@ fi fi -########################################################## -# -# make Makefile.header, Makefile.tail -# - - - - - - ########################################################## # # Output files @@ -3843,3 +3824,4 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + diff --git a/configure.in b/configure.in index 9dfbeb4..cfec7aa 100644 --- a/configure.in +++ b/configure.in @@ -11,26 +11,22 @@ AC_PROG_MAKE_SET dnl checks for compiler characteristics AC_C_BIGENDIAN -AC_ARG_WITH(optimize, -[ --with-optimize Compile with optimization], - RELEASE=$with_optimize -) - AC_ARG_ENABLE(release, -[ --enable-release Compile release (with optimization)], +[ --enable-release compile release (with optimization)], RELEASE=$enable_release ) AC_SUBST(RELEASE) dnl Checks for OGL support -AC_ARG_ENABLE(OpenGLLIB, -[ --enable-OpenGLLIB=DIR Use OpenGL - the libraries are in DIR], +AC_ARG_WITH(opengl, +[ --with-opengl=DIR use OpenGL with libraries found in DIR], [HAS_OGL_LIB=yes; OGL_LIB_PATH=$enable_OpenGLLIB; OGL_LDFLAGS=-L$enable_OpenGLLIB]) AC_SUBST(OGL_LDFLAGS) -AC_ARG_ENABLE(OpenGLINC, -[ --enable-OpenGLINC=DIR Use OpenGL - the header files are in DIR], +AC_ARG_WITH(opengl-includes, +[ --with-opengl-includes=DIR + use OpenGL with header files found in DIR], HAS_OGL_INC=yes; OGL_INC_PATH=$enable_OpenGLINC; OGL_CFLAGS=-I$enable_OpenGLINC) AC_SUBST(OGL_CFLAGS) @@ -156,8 +152,8 @@ dnl Checks for GLIDE support dnl this rule lifted almost wholesale from Mesa GLIDE_CFLAGS="" GLIDE_LDFLAGS="" -AC_ARG_ENABLE(glide, -[ --enable-glide=DIR Use glide with header files found in DIR], +AC_ARG_WITH(glide, +[ --with-glide=DIR use the GLIDE 2.x SDK found in DIR], HAS_GLIDE=$withval, HAS_GLIDE=auto ) if test "x$HAS_GLIDE" != xno; then @@ -189,8 +185,8 @@ AC_SUBST(GLIDE_CFLAGS) AC_SUBST(GLIDE_LDFLAGS) TDFXGL_LDFLAGS="" -AC_ARG_ENABLE(3dfxgl, -[ --enable-3dfxgl=DIR Use lib3dfxgl.so found in DIR], +AC_ARG_WITH(3dfxgl, +[ --with-3dfxgl=DIR use 3Dfx MiniGL library found in DIR], HAS_TDFXGL=$withval, HAS_TDFXGL=auto ) if test "x$HAS_TDFXGL" != xno; then @@ -385,28 +381,9 @@ AC_EXEEXT AC_OBJEXT AC_PATH_XTRA -########################################################## -# -# make Makefile.header, Makefile.tail -# - -dnl AC_SUBST_FILE(MAKEFILE_HEADER) -dnl MAKEFILE_HEADER=pre - -dnl AC_SUBST_FILE(MAKEFILE_TAIL) -dnl MAKEFILE_TAIL=post - -dnl AC_SUBST_FILE(CLIENT_TARGETS) -dnl CLIENT_TARGETS=client - -dnl AC_SUBST_FILE(SRCFILES) -dnl SRCFILES=srcfiles - -dnl AC_SUBST_FILE(COMP_RULES) -dnl COMP_RULES=rules - ########################################################## # # Output files # AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile) +