mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-10 14:42:06 +00:00
./configure is actually included this time. If DJGPP has autoconf we
should remove that file and just have people regenerate it. Also update the Makefile.in's to put bins right in targets rather than subdirs under targets. Removed stale uquake/Makefile.extra.
This commit is contained in:
Joseph Carter
parent
57def3e264
commit
d9d937cd66
5 changed files with 89 additions and 1492 deletions
146
configure
vendored
146
configure
vendored
|
|
@ -2496,15 +2496,15 @@ HAS_TDFXGL=
|
|||
fi
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
if test "x$HAS_TDFXGL" = xyes; then
|
||||
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
|
||||
else
|
||||
HAS_TDFXGL="no"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "x$HAS_TDFXGL" = xyes; then
|
||||
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
|
||||
else
|
||||
HAS_TDFXGL="no"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
|
@ -2700,46 +2700,25 @@ case "${target}" in
|
|||
esac
|
||||
|
||||
|
||||
##########################################################
|
||||
#
|
||||
# CD audio available?
|
||||
#
|
||||
echo $ac_n "checking for CD audio support""... $ac_c" 1>&6
|
||||
echo "configure:2709: checking for CD audio support" >&5
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
CD_AUDIO_SRC="cd_linux.c" ;;
|
||||
*)
|
||||
CD_AUDIO_SRC="cd_null.c" ;;
|
||||
esac
|
||||
if test "x$CD_AUDIO_SRC" = xcd_null.c; then
|
||||
echo "$ac_t""no" 1>&6
|
||||
else
|
||||
echo "$ac_t""yes ($CD_AUDIO_SRC)" 1>&6
|
||||
fi
|
||||
|
||||
|
||||
##########################################################
|
||||
#
|
||||
# Sound available?
|
||||
#
|
||||
echo $ac_n "checking for sound support""... $ac_c" 1>&6
|
||||
echo "configure:2728: checking for sound support" >&5
|
||||
echo "configure:2709: checking for sound support" >&5
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
SND_SRC="snd_dma.c snd_linux.c snd_mixa.s" ;;
|
||||
SND_STYLE="Linux" ;;
|
||||
*-solaris*)
|
||||
SND_SRC="snd_dma.c snd_sun.c" ;;
|
||||
*-sgi*)
|
||||
SND_SRC="snd_null.c" ;;
|
||||
SND_STYLE="Solaris" ;;
|
||||
*)
|
||||
SND_SRC="snd_null.c" ;;
|
||||
SND_STYLE="Null" ;;
|
||||
# XXX - need to add dos, Windows
|
||||
esac
|
||||
if test "x$SND_SRC" = xsnd_null.c; then
|
||||
if test "x$SND_STYLE" = xNull; then
|
||||
echo "$ac_t""no" 1>&6
|
||||
else
|
||||
echo "$ac_t""yes ($SND_SRC)" 1>&6
|
||||
echo "$ac_t""yes ($SND_STYLE style)" 1>&6
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -2748,7 +2727,7 @@ fi
|
|||
# System driver?
|
||||
#
|
||||
echo $ac_n "checking for system driver""... $ac_c" 1>&6
|
||||
echo "configure:2752: checking for system driver" >&5
|
||||
echo "configure:2731: checking for system driver" >&5
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
SYS_SRC="sys_linux.c"
|
||||
|
|
@ -2785,7 +2764,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:2789: checking for X11 video driver" >&5
|
||||
echo "configure:2768: checking for X11 video driver" >&5
|
||||
case "${target}" in
|
||||
*-solaris*)
|
||||
X11_VID_SRC="vid_sunx.c" ;;
|
||||
|
|
@ -2805,12 +2784,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
||||
echo "configure:2809: checking for Cygwin environment" >&5
|
||||
echo "configure:2788: 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 2814 "configure"
|
||||
#line 2793 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
|
@ -2821,7 +2800,7 @@ int main() {
|
|||
return __CYGWIN__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cygwin=yes
|
||||
else
|
||||
|
|
@ -2838,19 +2817,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:2842: checking for mingw32 environment" >&5
|
||||
echo "configure:2821: 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 <<EOF
|
||||
#line 2847 "configure"
|
||||
#line 2826 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return __MINGW32__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_mingw32=yes
|
||||
else
|
||||
|
|
@ -2869,7 +2848,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
|
|||
|
||||
|
||||
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
||||
echo "configure:2873: checking for executable suffix" >&5
|
||||
echo "configure:2852: checking for executable suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2879,7 +2858,7 @@ else
|
|||
rm -f conftest*
|
||||
echo 'int main () { return 0; }' > conftest.$ac_ext
|
||||
ac_cv_exeext=
|
||||
if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
for file in conftest.*; do
|
||||
case $file in
|
||||
*.c | *.o | *.obj) ;;
|
||||
|
|
@ -2900,13 +2879,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:2904: checking for object suffix" >&5
|
||||
echo "configure:2883: 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:2910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
for ac_file in conftest.*; do
|
||||
case $ac_file in
|
||||
*.c) ;;
|
||||
|
|
@ -2943,17 +2922,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:2947: checking whether -R must be followed by a space" >&5
|
||||
echo "configure:2926: 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 2950 "configure"
|
||||
#line 2929 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_nospace=yes
|
||||
else
|
||||
|
|
@ -2969,14 +2948,14 @@ rm -f conftest*
|
|||
else
|
||||
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2973 "configure"
|
||||
#line 2952 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_space=yes
|
||||
else
|
||||
|
|
@ -3008,7 +2987,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:3012: checking for dnet_ntoa in -ldnet" >&5
|
||||
echo "configure:2991: 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
|
||||
|
|
@ -3016,7 +2995,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3020 "configure"
|
||||
#line 2999 "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
|
||||
|
|
@ -3027,7 +3006,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3010: \"$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
|
||||
|
|
@ -3049,7 +3028,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:3053: checking for dnet_ntoa in -ldnet_stub" >&5
|
||||
echo "configure:3032: 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
|
||||
|
|
@ -3057,7 +3036,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet_stub $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3061 "configure"
|
||||
#line 3040 "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
|
||||
|
|
@ -3068,7 +3047,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3051: \"$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
|
||||
|
|
@ -3097,12 +3076,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:3101: checking for gethostbyname" >&5
|
||||
echo "configure:3080: 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 3106 "configure"
|
||||
#line 3085 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char gethostbyname(); below. */
|
||||
|
|
@ -3125,7 +3104,7 @@ gethostbyname();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3108: \"$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
|
||||
|
|
@ -3146,7 +3125,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_gethostbyname = no; then
|
||||
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
|
||||
echo "configure:3150: checking for gethostbyname in -lnsl" >&5
|
||||
echo "configure:3129: 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
|
||||
|
|
@ -3154,7 +3133,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lnsl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3158 "configure"
|
||||
#line 3137 "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
|
||||
|
|
@ -3165,7 +3144,7 @@ int main() {
|
|||
gethostbyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3148: \"$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
|
||||
|
|
@ -3195,12 +3174,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:3199: checking for connect" >&5
|
||||
echo "configure:3178: 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 3204 "configure"
|
||||
#line 3183 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char connect(); below. */
|
||||
|
|
@ -3223,7 +3202,7 @@ connect();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3206: \"$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
|
||||
|
|
@ -3244,7 +3223,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_connect = no; then
|
||||
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:3248: checking for connect in -lsocket" >&5
|
||||
echo "configure:3227: 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
|
||||
|
|
@ -3252,7 +3231,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3256 "configure"
|
||||
#line 3235 "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
|
||||
|
|
@ -3263,7 +3242,7 @@ int main() {
|
|||
connect()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3246: \"$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
|
||||
|
|
@ -3287,12 +3266,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:3291: checking for remove" >&5
|
||||
echo "configure:3270: 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 3296 "configure"
|
||||
#line 3275 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char remove(); below. */
|
||||
|
|
@ -3315,7 +3294,7 @@ remove();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3298: \"$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
|
||||
|
|
@ -3336,7 +3315,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_remove = no; then
|
||||
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
|
||||
echo "configure:3340: checking for remove in -lposix" >&5
|
||||
echo "configure:3319: 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
|
||||
|
|
@ -3344,7 +3323,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lposix $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3348 "configure"
|
||||
#line 3327 "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
|
||||
|
|
@ -3355,7 +3334,7 @@ int main() {
|
|||
remove()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3338: \"$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
|
||||
|
|
@ -3379,12 +3358,12 @@ fi
|
|||
|
||||
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
||||
echo $ac_n "checking for shmat""... $ac_c" 1>&6
|
||||
echo "configure:3383: checking for shmat" >&5
|
||||
echo "configure:3362: 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 3388 "configure"
|
||||
#line 3367 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char shmat(); below. */
|
||||
|
|
@ -3407,7 +3386,7 @@ shmat();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3390: \"$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
|
||||
|
|
@ -3428,7 +3407,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_shmat = no; then
|
||||
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
|
||||
echo "configure:3432: checking for shmat in -lipc" >&5
|
||||
echo "configure:3411: 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
|
||||
|
|
@ -3436,7 +3415,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lipc $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3440 "configure"
|
||||
#line 3419 "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
|
||||
|
|
@ -3447,7 +3426,7 @@ int main() {
|
|||
shmat()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3430: \"$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
|
||||
|
|
@ -3480,7 +3459,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:3484: checking for IceConnectionNumber in -lICE" >&5
|
||||
echo "configure:3463: 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
|
||||
|
|
@ -3488,7 +3467,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3492 "configure"
|
||||
#line 3471 "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
|
||||
|
|
@ -3499,7 +3478,7 @@ int main() {
|
|||
IceConnectionNumber()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3482: \"$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
|
||||
|
|
@ -3712,8 +3691,7 @@ s%@TDFXGL_LDFLAGS@%$TDFXGL_LDFLAGS%g
|
|||
s%@STRICMP_DEF@%$STRICMP_DEF%g
|
||||
s%@RELEASE_CFLAGS@%$RELEASE_CFLAGS%g
|
||||
s%@INTEL_ARCH@%$INTEL_ARCH%g
|
||||
s%@CD_AUDIO_SRC@%$CD_AUDIO_SRC%g
|
||||
s%@SND_SRC@%$SND_SRC%g
|
||||
s%@SND_STYLE@%$SND_STYLE%g
|
||||
s%@SYS_SRC@%$SYS_SRC%g
|
||||
s%@QW_CL_SYS_SRC@%$QW_CL_SYS_SRC%g
|
||||
s%@QW_SRV_SYS_SRC@%$QW_SRV_SYS_SRC%g
|
||||
|
|
|
|||
|
|
@ -34,9 +34,6 @@ MAKE_SURE_DIR = if test -d "$(BUILD_DIR)/$$DIR"; \
|
|||
echo "Creating directory $(BUILD_DIR)/$$DIR"; \
|
||||
mkdir -p $(BUILD_DIR)/$$DIR; \
|
||||
fi
|
||||
MAKE_SURE_bin_DIR = @DIR=bin; \
|
||||
$(MAKE_SURE_DIR)
|
||||
|
||||
|
||||
|
||||
########################################################################
|
||||
|
|
@ -240,11 +237,10 @@ $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_x11_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(X11QUAKE): $(BUILD_DIR)/bin/$(X11QUAKE)
|
||||
$(X11QUAKE): $(BUILD_DIR)/../$(X11QUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(X11QUAKE): $(OBJSquake-x11)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(X11QUAKE)
|
||||
$(BUILD_DIR)/../$(X11QUAKE): $(OBJSquake-x11)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(X11QUAKE)
|
||||
# XXX - Can this be automated?
|
||||
clean-$(X11QUAKE):
|
||||
rm -f $(OBJSquake-x11)
|
||||
|
|
@ -294,11 +290,10 @@ $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_svga_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(SVGAQUAKE): $(BUILD_DIR)/bin/$(SVGAQUAKE)
|
||||
$(SVGAQUAKE): $(BUILD_DIR)/../$(SVGAQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(SVGAQUAKE): $(OBJSquake-svga)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(SVGAQUAKE)
|
||||
$(BUILD_DIR)/../$(SVGAQUAKE): $(OBJSquake-svga)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SVGAQUAKE)
|
||||
# XXX - Can this be automated?
|
||||
clean-$(SVGAQUAKE):
|
||||
rm -f $(OBJSquake-svga)
|
||||
|
|
@ -344,11 +339,10 @@ $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_gl_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(GLQUAKE): $(BUILD_DIR)/bin/$(GLQUAKE)
|
||||
$(GLQUAKE): $(BUILD_DIR)/../$(GLQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(GLQUAKE): $(OBJSquake-gl)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(GLQUAKE)
|
||||
$(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GLQUAKE)
|
||||
|
||||
# XXX - Can this be automated?
|
||||
clean-$(GLQUAKE):
|
||||
|
|
@ -394,11 +388,10 @@ $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_gl_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(TDFXQUAKE): $(BUILD_DIR)/bin/$(TDFXQUAKE)
|
||||
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(TDFXQUAKE): $(OBJSquake-3dfx)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(TDFXQUAKE)
|
||||
$(BUILD_DIR)/../$(TDFXQUAKE): $(OBJSquake-3dfx)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(TDFXQUAKE)
|
||||
|
||||
# XXX - Can this be automated?
|
||||
clean-$(TDFXQUAKE):
|
||||
|
|
|
|||
|
|
@ -26,9 +26,6 @@ MAKE_SURE_DIR = if test -d "$(BUILD_DIR)/$$DIR"; \
|
|||
echo "Creating directory $(BUILD_DIR)/$$DIR"; \
|
||||
mkdir -p $(BUILD_DIR)/$$DIR; \
|
||||
fi
|
||||
MAKE_SURE_bin_DIR = @DIR=bin; \
|
||||
$(MAKE_SURE_DIR)
|
||||
|
||||
|
||||
|
||||
########################################################################
|
||||
|
|
@ -118,11 +115,10 @@ $(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_srv_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(SRVQUAKE): $(BUILD_DIR)/bin/$(SRVQUAKE)
|
||||
$(SRVQUAKE): $(BUILD_DIR)/../$(SRVQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(SRVQUAKE): $(OBJSqw-server)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSqw-server) $(SRV_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(SRVQUAKE)
|
||||
$(BUILD_DIR)/../$(SRVQUAKE): $(OBJSqw-server)
|
||||
$(CC) $(CFLAGS) $(OBJSqw-server) $(SRV_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SRVQUAKE)
|
||||
# XXX - Can this be automated?
|
||||
clean-$(SRVQUAKE):
|
||||
rm -f $(OBJSqw-server)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -33,8 +33,6 @@ MAKE_SURE_DIR = if test -d "$(BUILD_DIR)/$$DIR"; \
|
|||
echo "Creating directory $(BUILD_DIR)/$$DIR"; \
|
||||
mkdir -p $(BUILD_DIR)/$$DIR; \
|
||||
fi
|
||||
MAKE_SURE_bin_DIR = @DIR=bin; \
|
||||
$(MAKE_SURE_DIR)
|
||||
|
||||
|
||||
########################################################################
|
||||
|
|
@ -223,11 +221,10 @@ $(BUILD_DIR)/x11/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_x11_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(X11QUAKE): $(BUILD_DIR)/bin/$(X11QUAKE)
|
||||
$(X11QUAKE): $(BUILD_DIR)/../$(X11QUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(X11QUAKE): $(OBJSquake-x11)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(X11QUAKE)
|
||||
$(BUILD_DIR)/../$(X11QUAKE): $(OBJSquake-x11)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-x11) $(X11_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(X11QUAKE)
|
||||
# XXX - Can this be automated?
|
||||
clean-$(X11QUAKE):
|
||||
rm -f $(OBJSquake-x11)
|
||||
|
|
@ -271,11 +268,10 @@ $(BUILD_DIR)/svga/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_svga_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(SVGAQUAKE): $(BUILD_DIR)/bin/$(SVGAQUAKE)
|
||||
$(SVGAQUAKE): $(BUILD_DIR)/../$(SVGAQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(SVGAQUAKE): $(OBJSquake-svga)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(SVGAQUAKE)
|
||||
$(BUILD_DIR)/../$(SVGAQUAKE): $(OBJSquake-svga)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-svga) $(SVGA_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(SVGAQUAKE)
|
||||
# XXX - Can this be automated?
|
||||
clean-$(SVGAQUAKE):
|
||||
rm -f $(OBJSquake-svga)
|
||||
|
|
@ -315,11 +311,10 @@ $(BUILD_DIR)/gl/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_gl_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(GLQUAKE): $(BUILD_DIR)/bin/$(GLQUAKE)
|
||||
$(GLQUAKE): $(BUILD_DIR)/../$(GLQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(GLQUAKE): $(OBJSquake-gl)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(GLQUAKE)
|
||||
$(BUILD_DIR)/../$(GLQUAKE): $(OBJSquake-gl)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-gl) $(GL_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(GLQUAKE)
|
||||
|
||||
# XXX - Can this be automated?
|
||||
clean-$(GLQUAKE):
|
||||
|
|
@ -359,11 +354,10 @@ $(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s
|
|||
$(MAKE_SURE_gl_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(TDFXQUAKE): $(BUILD_DIR)/bin/$(TDFXQUAKE)
|
||||
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(TDFXQUAKE): $(OBJSquake-3dfx)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(TDFXQUAKE)
|
||||
$(BUILD_DIR)/../$(TDFXQUAKE): $(OBJSquake-3dfx)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/../$(TDFXQUAKE)
|
||||
|
||||
# XXX - Can this be automated?
|
||||
clean-$(TDFXQUAKE):
|
||||
|
|
|
|||
Loading…
Reference in a new issue