diff options
-rw-r--r-- | aclocal.m4 | 7 | ||||
-rwxr-xr-x | configure | 11 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | tkzinc.m4 | 7 |
4 files changed, 6 insertions, 21 deletions
@@ -68,12 +68,7 @@ AC_DEFUN(ZINC_ENABLE_GL, [ if test "${TEA_PLATFORM}" = "windows" ; then GL_LIBS=-lopengl32 else - # - # On Linux, the Nvidia GL libraries needs threads support via - # pthreads but not mesa. Need to auto-detect that and the - # availability of pthreads. - GL_LIBS="-lGL -lpthread" -# GL_LIBS="-lGL" + GL_LIBS="-lGL" GL_INCLUDES='/usr/include' fi @@ -646,7 +646,7 @@ fi #----------------------------------------------------------------------- MAJOR_VERSION=3 MINOR_VERSION=2 -PATCHLEVEL=97 +PATCHLEVEL=98 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCHLEVEL} @@ -4235,12 +4235,7 @@ fi if test "${TEA_PLATFORM}" = "windows" ; then GL_LIBS=-lopengl32 else - # - # On Linux, the Nvidia GL libraries needs threads support via - # pthreads but not mesa. Need to auto-detect that and the - # availability of pthreads. - GL_LIBS="-lGL -lpthread" -# GL_LIBS="-lGL" + GL_LIBS="-lGL" GL_INCLUDES='/usr/include' fi @@ -4278,7 +4273,7 @@ EOF fi echo $ac_n "checking for build with the overlap manager""... $ac_c" 1>&6 -echo "configure:4282: checking for build with the overlap manager" >&5 +echo "configure:4277: checking for build with the overlap manager" >&5 # Check whether --enable-om or --disable-om was given. if test "${enable_om+set}" = set; then enableval="$enable_om" diff --git a/configure.in b/configure.in index 77e0100..b669b34 100644 --- a/configure.in +++ b/configure.in @@ -46,7 +46,7 @@ TEA_INIT #----------------------------------------------------------------------- MAJOR_VERSION=3 MINOR_VERSION=2 -PATCHLEVEL=97 +PATCHLEVEL=98 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCHLEVEL} @@ -55,12 +55,7 @@ AC_DEFUN(ZINC_ENABLE_GL, [ if test "${TEA_PLATFORM}" = "windows" ; then GL_LIBS=-lopengl32 else - # - # On Linux, the Nvidia GL libraries needs threads support via - # pthreads but not mesa. Need to auto-detect that and the - # availability of pthreads. - GL_LIBS="-lGL -lpthread" -# GL_LIBS="-lGL" + GL_LIBS="-lGL" GL_INCLUDES='/usr/include' fi |