From 42dc5d55b3e0c61f97bf7f7c8666ebe8a3d9a15a Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Tue, 27 Feb 2007 10:20:39 +0000
Subject: Rearrange the additional GL libraries so that they are specified only
 if GL is requested.

---
 aclocal.m4 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'aclocal.m4')

diff --git a/aclocal.m4 b/aclocal.m4
index 22c3611..5b1c8ec 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -43,18 +43,24 @@ AC_DEFUN(ZINC_ENABLE_GL, [
  		  [  --enable-gl             build with openGL support (yes,no,damage) [[no]]],
  		  [tcl_ok=$enableval], [tcl_ok=no])
 
+     AC_ARG_WITH(glew-includes,
+                 AC_HELP_STRING([--with-glew-includes],[directory containing glew includes]),
+                                 GL_INCLUDES="${GL_INCLUDES} -I\"${withval}\"", GL_INCLUDES="$GL_INCLUDES -I/usr/local/lib")
+     AC_ARG_WITH(glew-lib,
+                 AC_HELP_STRING([--with-glew-lib],[directory containing glew lib]),
+                                GLEW_LIB="${withval}", GLEW_LIB="/usr/local/lib")
      if test "$tcl_ok" = "no"; then
  	GL_LIBS=
  	GL_INCLUDES=
  	AC_MSG_RESULT([no])
      else
 	if test "${TEA_PLATFORM}" = "windows" ; then
-	    GL_LIBS='-lglu32 -lopengl32'
+	    GL_LIBS='${GLEW_LIB}/libglew32.a -lglu32 -lopengl32'
 	elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then
- 	    GL_LIBS='-framework AGL'
+ 	    GL_LIBS='-lGLEW -framework AGL -framework OpenGL'
  	    GL_INCLUDES=''
         else
- 	    GL_LIBS='-lGLU -lGL'
+ 	    GL_LIBS='-lGLEW -lGL'
  	    GL_INCLUDES='-I/usr/include'
         fi
 
-- 
cgit v1.1