From 2e808bd20e0fb339f36b20fd5104d6b5e2a38fdf Mon Sep 17 00:00:00 2001
From: Jamie Wilkinson <jaq@spacepants.org>
Date: Wed, 9 Oct 2002 21:15:53 +0000
Subject: [PATCH] - Applied patch from Ulrich 'Q' Spoerlein to fix build  
 problems on FreeBSD.

---
 THANKS          | 2 +-
 configure.in    | 9 ++++++++-
 src/Makefile.am | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/THANKS b/THANKS
index 2e190db..1ca4bdb 100644
--- a/THANKS
+++ b/THANKS
@@ -24,4 +24,4 @@ Faried Nawaz			<fn@hungry.org>
 'RvB'				<hansmaulwurf@blinkenlights.ch>
 Victor Shkamerda		<vvs@auto.bnm.org>
 Jeff Teunissen			<deek@quakeforge.net>
-Ulrich 'Q' Spoerlein		<q@uni.de>
+Ulrich 'Q' Spoerlein		<q@galgenberg.net>
diff --git a/configure.in b/configure.in
index 0782fca..9d53e16 100644
--- a/configure.in
+++ b/configure.in
@@ -158,7 +158,14 @@ if test "x$HAVE_OPENGL" != xno; then
 		AC_CHECK_LIB(GL, glBegin,
 			OPENGL_LIBS="$OPENGL_LIBS -lGL"
 			HAVE_OPENGL=yes,
-			HAVE_OPENGL=no,
+			dnl add -lX11 and -lXext on FreeBSD if the first
+			dnl  test failed
+			AC_CHECK_LIB(GL, glBegin,
+				OPENGL_LIBS="$OPENGL_LIBS -lX11 -lXext"
+				HAVE_OPENGL=yes,
+				HAVE_OPENGL=no,
+				[$OPENGL_LIBS]
+			),
 			[$OPENGL_LIBS]
 		)
 	fi
diff --git a/src/Makefile.am b/src/Makefile.am
index b68064d..c7c6a5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,7 @@ endif
 # ref_tdfx
 if BUILD_TDFX
 ref_tdfx_la_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c
-ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@
+ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ @OPENGL_CFLAGS@
 ref_tdfx_la_LIBADD = @SVGALIB_LIBS@
 ref_tdfx_la_LDFLAGS = $(module_ldflags)
 endif