aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlecoanet2007-06-14 08:57:45 +0000
committerlecoanet2007-06-14 08:57:45 +0000
commita4f0709ec602b4c1c7433e13aa73c203db2506f1 (patch)
tree7a018dc6f8063f24e03ae2857a4df7e95665abe8
parentfdef8680162a5d0b33c8e3192caf348d57a1bb67 (diff)
downloadtkzinc-a4f0709ec602b4c1c7433e13aa73c203db2506f1.zip
tkzinc-a4f0709ec602b4c1c7433e13aa73c203db2506f1.tar.gz
tkzinc-a4f0709ec602b4c1c7433e13aa73c203db2506f1.tar.bz2
tkzinc-a4f0709ec602b4c1c7433e13aa73c203db2506f1.tar.xz
Updated from aclocal.m4
-rw-r--r--tkzinc.m421
1 files changed, 13 insertions, 8 deletions
diff --git a/tkzinc.m4 b/tkzinc.m4
index 8eeaf39..4220b72 100644
--- a/tkzinc.m4
+++ b/tkzinc.m4
@@ -43,20 +43,26 @@ 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/include")
+ 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_INCLUDES=''
- else
- GL_LIBS='-lGLU -lGL'
- GL_INCLUDES='-I/usr/include'
- fi
+ GL_LIBS="-L${GLEW_LIB} -lGLEW -framework AGL -framework OpenGL"
+ GL_INCLUDES="${GL_INCLUDES}"
+ else
+ GL_LIBS="-L${GLEW_LIB} -lGLEW -lGL"
+ GL_INCLUDES="${GL_INCLUDES} -I/usr/include"
+ fi
AC_DEFINE(GL)
if test "$tcl_ok" = "damage"; then
@@ -153,4 +159,3 @@ AC_DEFUN(ZINC_ENABLE_SHAPE, [
fi
fi
])
-