aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlecoanet2004-04-30 11:46:52 +0000
committerlecoanet2004-04-30 11:46:52 +0000
commit82665ac3ec2591ab6bdfff7443f5a3bff9dcf48f (patch)
tree9279b151829dfc958393ab6217c2b4979dc33f48
parentdb078e2e84e5f248735165dbdbac8380a30db892 (diff)
downloadtkzinc-82665ac3ec2591ab6bdfff7443f5a3bff9dcf48f.zip
tkzinc-82665ac3ec2591ab6bdfff7443f5a3bff9dcf48f.tar.gz
tkzinc-82665ac3ec2591ab6bdfff7443f5a3bff9dcf48f.tar.bz2
tkzinc-82665ac3ec2591ab6bdfff7443f5a3bff9dcf48f.tar.xz
*** empty log message ***
-rw-r--r--aclocal.m47
-rwxr-xr-xconfigure11
-rw-r--r--configure.in2
-rw-r--r--tkzinc.m47
4 files changed, 6 insertions, 21 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index eb9be5c..21fcec9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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
diff --git a/configure b/configure
index f50c837..523c699 100755
--- a/configure
+++ b/configure
@@ -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}
diff --git a/tkzinc.m4 b/tkzinc.m4
index 785b892..e1fde7e 100644
--- a/tkzinc.m4
+++ b/tkzinc.m4
@@ -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