qf
/
quake2forge
mirror of https://git.code.sf.net/p/quake/quake2forge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge changes from FreeBSD port to configure.in. Do not clobber OpenGL/SVGALib CFLAGS/LIBS.

This commit is contained in:
Jay Dolan 2006-01-14 21:16:20 +00:00
parent 2587a5e03e
commit 7a49504cf4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -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