diff options
author | lecoanet | 2007-02-27 10:20:39 +0000 |
---|---|---|
committer | lecoanet | 2007-02-27 10:20:39 +0000 |
commit | 42dc5d55b3e0c61f97bf7f7c8666ebe8a3d9a15a (patch) | |
tree | 5d635a2a2756aabb8027e2af32ffd298aadcf6be /aclocal.m4 | |
parent | aef2863a903c49638e29330531209ff2ecf90273 (diff) | |
download | tkzinc-42dc5d55b3e0c61f97bf7f7c8666ebe8a3d9a15a.zip tkzinc-42dc5d55b3e0c61f97bf7f7c8666ebe8a3d9a15a.tar.gz tkzinc-42dc5d55b3e0c61f97bf7f7c8666ebe8a3d9a15a.tar.bz2 tkzinc-42dc5d55b3e0c61f97bf7f7c8666ebe8a3d9a15a.tar.xz |
Rearrange the additional GL libraries so that they are specified only if GL is requested.
Diffstat (limited to 'aclocal.m4')
-rw-r--r-- | aclocal.m4 | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -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 |