From 7a49504cf40cc6a2d15802bf64a73f269703c2c1 Mon Sep 17 00:00:00 2001
From: Jay Dolan <jdolan@jdolan.dyndns.org>
Date: Sat, 14 Jan 2006 21:16:20 +0000
Subject: [PATCH] Merge changes from FreeBSD port to configure.in.  Do not
 clobber OpenGL/SVGALib CFLAGS/LIBS.

---
 configure.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index a10e547..1b42dd3 100644
--- a/configure.in
+++ b/configure.in
@@ -103,6 +103,7 @@ if test "x${ac_with_svgalib}" != xno ; then
 	# test for the library first, for people who may have the libs
 	# installed but no headers
 	AC_CHECK_LIB(vga, vga_getmousetype,
+		SVGALIB_LIBS="$SVGALIB_LIBS -lvga"
 		HAVE_SVGALIB=maybe,
 		HAVE_SVGALIB=no,
 		[ $SVGALIB_LIBS ]
@@ -119,7 +120,6 @@ if test "x${ac_with_svgalib}" != xno ; then
 	# if it's all there, define the relevant bits
 	if test "x$HAVE_SVGALIB" = xyes ; then
 		AC_DEFINE(HAVE_SVGALIB, 1, [Define this if you have SVGAlib])
-		SVGALIB_LIBS="-lvga"
 		AC_SUBST(SVGALIB_CFLAGS)
 		AC_SUBST(SVGALIB_LIBS)
 	else
@@ -215,7 +215,7 @@ if test "x${ac_with_opengl}" != xno ; then
 	# --with-opengl was explicitly given, so look in that directory
 	if test "x${withval}" != xyes ; then
 		OPENGL_CFLAGS="$OPENGL_CFLAGS -I$withval/include"
-		OPENGL_LIBS="$OPENGL_CFLAGS -L$withval/lib"
+		OPENGL_LIBS="$OPENGL_LIBS -L$withval/lib"
 	fi
 	# save and set CPPFLAGS for coming tests
 	save_CPPFLAGS="$CPPFLAGS"
@@ -257,7 +257,6 @@ if test "x${ac_with_opengl}" != xno ; then
 
 	if test "x$HAVE_OPENGL" = xyes; then
 		AC_DEFINE(HAVE_OPENGL, 1, [Define this if you have OpenGL])
-		OPENGL_LIBS="-lGL"
 		AC_SUBST(OPENGL_CFLAGS)
 		AC_SUBST(OPENGL_LIBS)
 	else