[Quake2world-dev] r546 - in quake2world/trunk: . src

[jdolan at jdolan.dyndns.org]

Author: jdolan
Date: 2009-06-17 11:29:14 +0000 (Wed, 17 Jun 2009)
New Revision: 546

Modified:
   quake2world/trunk/configure.in
   quake2world/trunk/src/Makefile.am
Log:
This way is actually cleaner.

Modified: quake2world/trunk/configure.in
===================================================================
--- quake2world/trunk/configure.in	2009-06-17 11:25:54 UTC (rev 545)
+++ quake2world/trunk/configure.in	2009-06-17 11:29:14 UTC (rev 546)
@@ -91,8 +91,6 @@
 
 if test "x${with_client}" = xno; then
     AC_MSG_RESULT(no)
-    HOST_OPENGL_LIBS=""
-    AC_SUBST(HOST_OPENGL_LIBS)
 else
 	AC_MSG_RESULT(yes)
 	BUILD_CLIENT=yes
@@ -112,6 +110,9 @@
 		[#include <GL/gl.h>]
 	)
 	
+	OPENGL_LIBS=$HOST_OPENGL_LIBS
+	AC_SUBST(OPENGL_LIBS)
+	
 	dnl -------------
 	dnl Check for SDL
 	dnl -------------

Modified: quake2world/trunk/src/Makefile.am
===================================================================
--- quake2world/trunk/src/Makefile.am	2009-06-17 11:25:54 UTC (rev 545)
+++ quake2world/trunk/src/Makefile.am	2009-06-17 11:29:14 UTC (rev 546)
@@ -132,9 +132,9 @@
 	@CURSES_LIBS@ \
 	@DEBUG_LIBS@ \
 	@HOST_LIBS@ \
-	@HOST_OPENGL_LIBS@ \
 	@ICON@ \
 	@JPEG_LIBS@ \
+	@OPENGL_LIBS@ \
 	@SDL_LIBS@ \
 	-lm -lz