qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-25 05:11:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned up detection of TDFXGL.

Browse source 
Also we prefer lib3dfxgl if it exists - this is the whole point of the
3dfx target in the first place. Only use $OGL_NAME as a last resort.
This commit is contained in:
Marcus Sundberg 2000-03-19 15:25:48 +00:00
parent c55f1914c8
commit 0dc2b18d74
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
configure.in
View file

@ -452,34 +452,26 @@ AC_CHECK_LIB(xil,xil_import, HAS_XIL=yes, HAS_XIL=no)
# First we see if we can use mesa with glide support.. # First we see if we can use mesa with glide support..
# if not then try the MiniGL.. # if not then try the MiniGL..
TDFXGL_CFLAGS=""
TDFXGL_LIBS=""
TDFXGL_NAME="" TDFXGL_NAME=""
AC_ARG_WITH(3dfx, AC_ARG_WITH(3dfx,
[ --with-3dfx support 3Dfx output for the V1/V2, if a argument [ --with-3dfx support 3Dfx output for the V1/V2, if a argument
is specified it will be used as the GL wrapper lib is specified it will be used as the GL wrapper lib
for glide.], for glide.],
HAS_3dfx=$withval, HAS_3dfx=auto) HAS_3dfx=$withval, HAS_3dfx=auto)
AC_MSG_CHECKING(for 3Dfx support) if test "x$HAS_3dfx" != "xno" -a "x$HAS_SVGA" = "xyes" \
if test "x$HAS_3dfx" != xno; then -a "x$HAS_GLIDE" = "xyes"; then
if test "x$HAS_3dfx" != xauto; then if test "x$HAS_3dfx" != xauto; then
TDFXGL_NAME="$HAS_3dfx" TDFXGL_NAME="$HAS_3dfx"
fi fi
if test -n "$HAS_GLIDE"; then
if test -n "$HAS_SVGA"; then
if test -z "$TDFXGL_NAME"; then if test -z "$TDFXGL_NAME"; then
if test -n "$HAS_FXMESA"; then dnl Check in reverse order of preference
TDFXGL_NAME=$OGL_NAME for a in $OGL_NAME 3dfxgl; do
fi AC_CHECK_LIB($a, fxMesaCreateContext, TDFXGL_NAME=$a, qwfoo=qwfoo,
fi
if test -z "$TDFXGL_NAME"; then
AC_CHECK_LIB("3dfxgl", glColor4f,
TDFXGL_NAME=3dfxgl, TDFXGL_NAME=,
[$GLIDE_LIBS $TDFXGL_LIBS]) [$GLIDE_LIBS $TDFXGL_LIBS])
fi done
fi
fi fi
fi fi
AC_MSG_CHECKING(for 3Dfx support)
if test -n "$TDFXGL_NAME"; then if test -n "$TDFXGL_NAME"; then
TDFXGL_CFLAGS="$GLIDE_CFLAGS" TDFXGL_CFLAGS="$GLIDE_CFLAGS"
TDFXGL_LIBS="$TDFXGL_LIBS $GLIDE_LIBS -l$TDFXGL_NAME" TDFXGL_LIBS="$TDFXGL_LIBS $GLIDE_LIBS -l$TDFXGL_NAME"
@ -576,7 +568,6 @@ esac
dnl Check for sound libraries dnl Check for sound libraries
AC_CHECK_LIB(mme,waveOutOpen,HAVE_LIBMME=yes) AC_CHECK_LIB(mme,waveOutOpen,HAVE_LIBMME=yes)
SOUND_LIBS=""
SOUND_STYLE="" SOUND_STYLE=""
AC_MSG_CHECKING(for sound support) AC_MSG_CHECKING(for sound support)
if test "x$enable_alsa" != "xno"; then if test "x$enable_alsa" != "xno"; then
@ -682,8 +673,6 @@ AC_HAVE_STRUCT_FIELD(struct ioc_read_toc_single_entry, entry,[
dnl ======================================================================== dnl ========================================================================
dnl Check for networking dnl Check for networking
NET_LIBS=""
dnl Check for network libraries dnl Check for network libraries
if test "x$ac_cv_func_connect" != "xyes"; then if test "x$ac_cv_func_connect" != "xyes"; then
AC_CHECK_LIB(socket,connect, AC_CHECK_LIB(socket,connect,