Made the Makefile checks ifeq(VAR,yes) rather than ifneq(VAR,) to make

things more robust.  Fixed HAS_TDFX in configure.in for real this time.
This commit is contained in:
Joseph Carter 1999-12-30 16:08:34 +00:00
parent 120e2e9252
commit 37dab64154
4 changed files with 14 additions and 14 deletions

2
configure vendored
View file

@ -2499,7 +2499,7 @@ fi
if test "x$HAS_TDFXGL" = xyes; then
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
else
HAVE_TDFXGL="no"
HAS_TDFXGL="no"
fi
fi
fi

View file

@ -199,15 +199,15 @@ if test "x$HAS_TDFXGL" != xno; then
LIBS="$TDFXGL_LDFLAGS $LIBS"
AC_CHECK_LIB(3dfxgl, glColor4f, HAS_TDFXGL=yes, HAS_TDFXGL=)
LIBS="$save_LIBS"
if test "x$HAS_TDFXGL" = xyes; then
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
else
HAVE_TDFXGL="no"
fi
fi
fi
fi
fi
if test "x$HAS_TDFXGL" = xyes; then
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
else
HAS_TDFXGL="no"
fi
AC_SUBST(HAS_TDFXGL)
AC_SUBST(TDFXGL_LDFLAGS)

View file

@ -45,19 +45,19 @@ BIN_PREFIX = qw-client
# Client targets
#
ifneq ($(HAS_OGL),)
ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl
endif
ifneq ($(HAS_TDFXGL),)
ifeq ($(HAS_TDFXGL),yes)
TDFXQUAKE= $(BIN_PREFIX)-3dfx
endif
ifneq ($(HAS_X11),)
ifeq ($(HAS_X11),yes)
X11QUAKE = $(BIN_PREFIX)-x11
endif
ifneq ($(HAS_VGA),)
ifeq ($(HAS_VGA),yes)
SVGAQUAKE = $(BIN_PREFIX)-svga
endif

View file

@ -45,19 +45,19 @@ BIN_PREFIX = quake
# Client targets
#
ifneq ($(HAS_OGL),)
ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl
endif
ifneq ($(HAS_TDFXGL),)
ifeq ($(HAS_TDFXGL),yes)
TDFXQUAKE= $(BIN_PREFIX)-3dfx
endif
ifneq ($(HAS_X11),)
ifeq ($(HAS_X11),yes)
X11QUAKE = $(BIN_PREFIX)-x11
endif
ifneq ($(HAS_VGA),)
ifeq ($(HAS_VGA),yes)
SVGAQUAKE = $(BIN_PREFIX)-svga
endif