From 37dab641549662a38a67724d213f73a8b3adfeb7 Mon Sep 17 00:00:00 2001
From: Joseph Carter <knghtbrd@debian.org>
Date: Thu, 30 Dec 1999 16:08:34 +0000
Subject: [PATCH] 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.

---
 configure             |  2 +-
 configure.in          | 10 +++++-----
 qw_client/Makefile.in |  8 ++++----
 uquake/Makefile.in    |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index bba6ddd..855f26c 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index bd21348..e79a25a 100644
--- a/configure.in
+++ b/configure.in
@@ -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)
 
diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in
index 3725515..9c34bf2 100644
--- a/qw_client/Makefile.in
+++ b/qw_client/Makefile.in
@@ -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
 
diff --git a/uquake/Makefile.in b/uquake/Makefile.in
index 04fcd7d..b522e82 100644
--- a/uquake/Makefile.in
+++ b/uquake/Makefile.in
@@ -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