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 /configure | |
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 'configure')
-rwxr-xr-x | configure | 44 |
1 files changed, 22 insertions, 22 deletions
@@ -11417,28 +11417,12 @@ _ACEOF #-------------------------------------------------------------------- # Add platform libs to LIBS or SHLIB_LD_LIBS as necessary. #-------------------------------------------------------------------- - -# Check whether --with-glew-includes was given. -if test "${with_glew_includes+set}" = set; then - withval=$with_glew_includes; GL_INCLUDES="${GL_INCLUDES} -I\"${withval}\"" -else - GL_INCLUDES="$GL_INCLUDES -I/usr/local/lib" -fi - - -# Check whether --with-glew-lib was given. -if test "${with_glew_lib+set}" = set; then - withval=$with_glew_lib; GLEW_LIB="${withval}" -else - GLEW_LIB="/usr/local/lib" -fi - if test "${TEA_PLATFORM}" = "windows" ; then - LIBS="${LIBS} ${GLEW_LIB}/libglew32.a -lglu32 -lgdi32 -luser32 -lwsock32" + LIBS="${LIBS} -lglu32 -lgdi32 -luser32 -lwsock32" elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then - LIBS="${LIBS} -lGLEW -framework OpenGL -framework Carbon" + LIBS="${LIBS} -framework Carbon" else - LIBS="${LIBS} -lGLEW -lGLU" + LIBS="${LIBS} -lGLU" fi @@ -11642,6 +11626,22 @@ else fi + +# Check whether --with-glew-includes was given. +if test "${with_glew_includes+set}" = set; then + withval=$with_glew_includes; GL_INCLUDES="${GL_INCLUDES} -I\"${withval}\"" +else + GL_INCLUDES="$GL_INCLUDES -I/usr/local/lib" +fi + + +# Check whether --with-glew-lib was given. +if test "${with_glew_lib+set}" = set; then + withval=$with_glew_lib; GLEW_LIB="${withval}" +else + GLEW_LIB="/usr/local/lib" +fi + if test "$tcl_ok" = "no"; then GL_LIBS= GL_INCLUDES= @@ -11649,12 +11649,12 @@ fi echo "${ECHO_T}no" >&6; } 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 |