diff --git a/configure b/configure index 30fbb32..1ad78b5 100755 --- a/configure +++ b/configure @@ -2197,9 +2197,10 @@ fi rm -f conftest* if test "x$HAS_GL_COLOR_INDEX8_EXT" != xno; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAS_GL_COLOR_INDEX8_EXT 1 EOF + fi else @@ -2211,7 +2212,7 @@ fi echo $ac_n "checking for vga_getmousetype in -lvga""... $ac_c" 1>&6 -echo "configure:2215: checking for vga_getmousetype in -lvga" >&5 +echo "configure:2216: 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 @@ -2219,7 +2220,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:2235: \"$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 @@ -2253,7 +2254,7 @@ fi echo $ac_n "checking for xil_import in -lxil""... $ac_c" 1>&6 -echo "configure:2257: checking for xil_import in -lxil" >&5 +echo "configure:2258: 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 @@ -2261,7 +2262,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:2277: \"$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 @@ -2315,17 +2316,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:2319: checking for glide.h" >&5 +echo "configure:2320: 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:2329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2330: \"$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* @@ -2351,17 +2352,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:2355: checking for glide/glide.h" >&5 +echo "configure:2356: 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:2365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2366: \"$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* @@ -2387,7 +2388,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:2391: checking for main in -lglide2x" >&5 +echo "configure:2392: 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 @@ -2395,14 +2396,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:2407: \"$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 @@ -2454,7 +2455,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:2458: checking for glColor4f in -l3dfxgl" >&5 +echo "configure:2459: 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 @@ -2462,7 +2463,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:2478: \"$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 @@ -2507,13 +2508,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:2511: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:2512: 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 @@ -2531,7 +2532,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -2553,12 +2554,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for stricmp""... $ac_c" 1>&6 -echo "configure:2557: checking for stricmp" >&5 +echo "configure:2558: 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:2586: \"$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 @@ -2599,12 +2600,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:2603: checking for strcasecmp" >&5 +echo "configure:2604: 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:2632: \"$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 @@ -2658,7 +2659,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:2662: checking for special release compiler settings" >&5 +echo "configure:2663: 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*) @@ -2687,7 +2688,7 @@ fi # is it an intel box? # echo $ac_n "checking for an Intel machine""... $ac_c" 1>&6 -echo "configure:2691: checking for an Intel machine" >&5 +echo "configure:2692: checking for an Intel machine" >&5 case "${target}" in i[34567]86-*-linux-gnu*) INTEL_ARCH=yes @@ -2702,7 +2703,7 @@ esac # CD audio available? # echo $ac_n "checking for CD audio support""... $ac_c" 1>&6 -echo "configure:2706: checking for CD audio support" >&5 +echo "configure:2707: checking for CD audio support" >&5 case "${target}" in i[34567]86-*-linux-gnu*) CD_AUDIO_SRC="cd_linux.c" ;; @@ -2721,7 +2722,7 @@ fi # Sound available? # echo $ac_n "checking for sound support""... $ac_c" 1>&6 -echo "configure:2725: checking for sound support" >&5 +echo "configure:2726: checking for sound support" >&5 case "${target}" in i[34567]86-*-linux-gnu*) SND_SRC="snd_dma.c snd_linux.c snd_mixa.s" ;; @@ -2745,7 +2746,7 @@ fi # System driver? # echo $ac_n "checking for system driver""... $ac_c" 1>&6 -echo "configure:2749: checking for system driver" >&5 +echo "configure:2750: checking for system driver" >&5 case "${target}" in i[34567]86-*-linux-gnu*) SYS_SRC="sys_linux.c" @@ -2782,7 +2783,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:2786: checking for X11 video driver" >&5 +echo "configure:2787: checking for X11 video driver" >&5 case "${target}" in *-solaris*) X11_VID_SRC="vid_sunx.c" ;; @@ -2802,12 +2803,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2806: checking for Cygwin environment" >&5 +echo "configure:2807: 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:2823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2835,19 +2836,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:2839: checking for mingw32 environment" >&5 +echo "configure:2840: 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:2852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2866,7 +2867,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2870: checking for executable suffix" >&5 +echo "configure:2871: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2876,7 +2877,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -2897,13 +2898,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:2901: checking for object suffix" >&5 +echo "configure:2902: 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:2907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2940,17 +2941,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:2944: checking whether -R must be followed by a space" >&5 +echo "configure:2945: 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:2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -2966,14 +2967,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:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3005,7 +3006,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:3009: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3010: 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 @@ -3013,7 +3014,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:3029: \"$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 @@ -3046,7 +3047,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:3050: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3051: 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 @@ -3054,7 +3055,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:3070: \"$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 @@ -3094,12 +3095,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:3098: checking for gethostbyname" >&5 +echo "configure:3099: 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:3127: \"$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 @@ -3143,7 +3144,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3147: checking for gethostbyname in -lnsl" >&5 +echo "configure:3148: 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 @@ -3151,7 +3152,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:3167: \"$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 @@ -3192,12 +3193,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:3196: checking for connect" >&5 +echo "configure:3197: 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:3225: \"$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 @@ -3241,7 +3242,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3245: checking for connect in -lsocket" >&5 +echo "configure:3246: 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 @@ -3249,7 +3250,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:3265: \"$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 @@ -3284,12 +3285,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:3288: checking for remove" >&5 +echo "configure:3289: 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:3317: \"$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 @@ -3333,7 +3334,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3337: checking for remove in -lposix" >&5 +echo "configure:3338: 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 @@ -3341,7 +3342,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:3357: \"$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 @@ -3376,12 +3377,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3380: checking for shmat" >&5 +echo "configure:3381: 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:3409: \"$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 @@ -3425,7 +3426,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3429: checking for shmat in -lipc" >&5 +echo "configure:3430: 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 @@ -3433,7 +3434,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:3449: \"$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 @@ -3477,7 +3478,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:3481: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3482: 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 @@ -3485,7 +3486,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:3501: \"$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 diff --git a/configure.in b/configure.in index cfec7aa..b807ce8 100644 --- a/configure.in +++ b/configure.in @@ -129,9 +129,7 @@ if test "x$HAS_OGL_INC" != x; then HAS_GL_COLOR_INDEX8_EXT=no) if test "x$HAS_GL_COLOR_INDEX8_EXT" != xno; then AC_MSG_RESULT(yes) - cat >> confdefs.h <<\EOF -#define HAS_GL_COLOR_INDEX8_EXT 1 -EOF + AC_DEFINE(HAS_GL_COLOR_INDEX8_EXT, 1) fi else diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in index 9420929..3725515 100644 --- a/qw_client/Makefile.in +++ b/qw_client/Makefile.in @@ -49,7 +49,6 @@ ifneq ($(HAS_OGL),) GLQUAKE =$(BIN_PREFIX)-gl endif -# FIX: Add 3dfxgl targets ifneq ($(HAS_TDFXGL),) TDFXQUAKE= $(BIN_PREFIX)-3dfx endif diff --git a/uquake/Makefile.in b/uquake/Makefile.in index 699b6b4..04fcd7d 100644 --- a/uquake/Makefile.in +++ b/uquake/Makefile.in @@ -49,7 +49,6 @@ ifneq ($(HAS_OGL),) GLQUAKE =$(BIN_PREFIX)-gl endif -# FIX: Add 3dfxgl targets ifneq ($(HAS_TDFXGL),) TDFXQUAKE= $(BIN_PREFIX)-3dfx endif