From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 31 Jan 2001 03:18:13 +0000 (+0000)
Subject: r477: *** empty log message ***
X-Git-Tag: debian-4.5.3-3~540
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=0843d071f40ac9ee32773dabbd68c969bdf2d9ef

r477: *** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index c106fd8..a1e199f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,13 @@
 	* ctsim: Added most-recently-used files to File menu with
 	registry storage between executions.
 
-	* ctsim: Added MDI interface for Windows version and made it default
+	* ctsim: Added MDI interface for Windows version and made it default for Windows.
 
+	* ctsim: Added 3-D wireframe view of images (uses OpenGL)
+	
 	* ctsim: Added graphical About box
 
-	* ctsim: Escape key now removes cursor from image files
+	* ctsim: Escape key now removes cursor lines from image file view
 
 	* ctsim: Added Revert to ImageFile menu
 	
diff --git a/configure b/configure
index f04d35a..1defa15 100755
--- a/configure
+++ b/configure
@@ -2238,7 +2238,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lwx_gtk_gl  $LIBS"
+LIBS="-lwx_gtk_gl -lwx_gtk -lGL $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 2244 "configure"
 #include "confdefs.h"
@@ -4523,7 +4523,7 @@ EOF
 
   fi	
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
-  if test "$libgl" = "true" -a test "$wxgtkgl" = "true" ; then
+  if test "$libgl" = "true" -a "$wxgtkgl" = "true" ; then
     ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU -lwx_gtk_gl"
   fi
 else
diff --git a/configure.in b/configure.in
index e13510f..db07adf 100644
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,7 @@ AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(hdf5, main, [hdf5=true], [hdf5=false], -lz)
 AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
 AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false])
-AC_CHECK_LIB(wx_gtk_gl, main, [wxgtkgl=true], [wxgtkgl=false])
+AC_CHECK_LIB(wx_gtk_gl, main, [wxgtkgl=true], [wxgtkgl=false], -lwx_gtk -lGL)
 
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
@@ -316,7 +316,7 @@ if test "$no_x" != "yes" ; then
     AC_DEFINE(HAVE_G2)
   fi	
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
-  if test "$libgl" = "true" -a test "$wxgtkgl" = "true" ; then
+  if test "$libgl" = "true" -a "$wxgtkgl" = "true" ; then
     ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU -lwx_gtk_gl"
   fi
 else