Rearrange the additional GL libraries so that they are specified only if GL is requested.

3 files changed, 34 insertions, 34 deletions

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
 
diff --git a/configure b/configure
index e74e1a3..1e604f2 100755
--- a/configure
+++ b/configure
@@ -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
 
diff --git a/configure.in b/configure.in
index ae311ee..13458bd 100644
--- a/configure.in
+++ b/configure.in
@@ -181,18 +181,12 @@ AC_DEFINE(USE_TK_STUBS)
 #--------------------------------------------------------------------
 # Add platform libs to LIBS or SHLIB_LD_LIBS as necessary.
 #--------------------------------------------------------------------
-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 "${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
 AC_SUBST(GL_INCLUDES)