From 4c5c608637d5d7b9460a0f3829687bef13165dba Mon Sep 17 00:00:00 2001
From: "Zephaniah E. Hull" <warp@babylon.d2dc.net>
Date: Tue, 7 Mar 2000 09:39:31 +0000
Subject: [PATCH] Compile fix for Taniwha

---
 Rules.mk.in  | 2 +-
 configure.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rules.mk.in b/Rules.mk.in
index ca47175..fd625dc 100644
--- a/Rules.mk.in
+++ b/Rules.mk.in
@@ -12,7 +12,7 @@ CC		:= @CC@
 
 
 LDFLAGS		+= @LDFLAGS@ @LIBS@
-INCLUDES	+= -I$(SRC_DIR) -I$(COMMON_DIR)
+INCLUDES	+= -I$(SRC_DIR) -I$(COMMON_DIR) @OGL_INCLUDES@
 CFLAGS		+= @CFLAGS@ $(INCLUDES)
 
 MAKE_SURE_DIR = if test -d "$$DIR"; then \
diff --git a/configure.in b/configure.in
index 53a05ed..2887112 100644
--- a/configure.in
+++ b/configure.in
@@ -304,9 +304,9 @@ if test "x$HAS_OGL" != xno; then
       OGL_LIBS="$OGL_LIBS -L$HAS_OGL"
    fi
    if test "x$OGL_INCLUDES" != xauto; then
-      OGL_CFLAGS="$OGL_CFLAGS -I$OGL_INCLUDES"
+      OGL_INCLUDES="-I$OGL_INCLUDES"
    else
-      OGL_CFLAGS="$OGL_CFLAGS -I${x_includes:-.}"
+      OGL_INCLUDES="-I${x_includes:-.}"
    fi
    save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $OGL_CFLAGS"