diff options
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 15 insertions, 11 deletions
@@ -66,9 +66,9 @@ AC_DEFUN(ZINC_ENABLE_GL, [ AC_MSG_RESULT([no]) else if test "${TEA_PLATFORM}" = "windows" ; then - GL_LIBS=-lglu32 -lopengl32 + GL_LIBS=-lopengl32 else - GL_LIBS="-lGLU -lGL" + GL_LIBS="-lGL" GL_INCLUDES='-I/usr/include' fi @@ -4086,7 +4086,9 @@ EOF # Add platform libs to LIBS or SHLIB_LD_LIBS as necessary. #-------------------------------------------------------------------- if test "${TEA_PLATFORM}" = "windows" ; then - LIBS="${LIBS} -lgdi32 -luser32 -lwsock32" + LIBS="${LIBS} -lglu32 -lgdi32 -luser32 -lwsock32" +else + LIBS="${LIBS} -lGLU -lGL" fi #SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -lxxxx" @@ -4100,7 +4102,7 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:4104: checking for tclsh" >&5 +echo "configure:4106: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4132,7 +4134,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:4136: checking for wish" >&5 +echo "configure:4138: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4172,7 +4174,7 @@ fi { echo "configure: error: Must call TEA INIT before ENABLE_SHAPE" 1>&2; exit 1; } fi echo $ac_n "checking for build with X shape support""... $ac_c" 1>&6 -echo "configure:4176: checking for build with X shape support" >&5 +echo "configure:4178: checking for build with X shape support" >&5 # Check whether --enable-shape or --disable-shape was given. if test "${enable_shape+set}" = set; then enableval="$enable_shape" @@ -4208,7 +4210,7 @@ EOF fi echo $ac_n "checking for build with GL""... $ac_c" 1>&6 -echo "configure:4212: checking for build with GL" >&5 +echo "configure:4214: checking for build with GL" >&5 # Check whether --enable-gl or --disable-gl was given. if test "${enable_gl+set}" = set; then enableval="$enable_gl" @@ -4224,9 +4226,9 @@ fi echo "$ac_t""no" 1>&6 else if test "${TEA_PLATFORM}" = "windows" ; then - GL_LIBS=-lglu32 -lopengl32 + GL_LIBS=-lopengl32 else - GL_LIBS="-lGLU -lGL" + GL_LIBS="-lGL" GL_INCLUDES='-I/usr/include' fi @@ -4263,7 +4265,7 @@ EOF fi echo $ac_n "checking for build with the ATC extensions""... $ac_c" 1>&6 -echo "configure:4267: checking for build with the ATC extensions" >&5 +echo "configure:4269: checking for build with the ATC extensions" >&5 # Check whether --enable-atc or --disable-atc was given. if test "${enable_atc+set}" = set; then enableval="$enable_atc" diff --git a/configure.in b/configure.in index d1154ca..3344293 100644 --- a/configure.in +++ b/configure.in @@ -180,7 +180,9 @@ TEA_MAKE_LIB # Add platform libs to LIBS or SHLIB_LD_LIBS as necessary. #-------------------------------------------------------------------- if test "${TEA_PLATFORM}" = "windows" ; then - LIBS="${LIBS} -lgdi32 -luser32 -lwsock32" + LIBS="${LIBS} -lglu32 -lgdi32 -luser32 -lwsock32" +else + LIBS="${LIBS} -lGLU -lGL" fi #SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -lxxxx" |