X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=8a943c100bf40b3023fca6d155f4290c2abcb967;hp=e04c771a9d2be2354104770de8877c3b9e4ed6ff;hb=52f2fdc3424cd6b5b77ad1497243e1e06739ffe6;hpb=f692b2d39f56ffbafc04283f32233c098aa2978b

diff --git a/configure.in b/configure.in
index e04c771..8a943c1 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,3.0.0beta1)
+AM_INIT_AUTOMAKE(ctsim,3.1.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -48,7 +48,6 @@ 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], -lwx_gtk -lGL)
 
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
@@ -316,8 +315,8 @@ 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 "$wxgtkgl" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU -lwx_gtk_gl"
+  if test "$libgl" = "true" ; then
+    ctlib_graphics="$ctlib_graphics -lwx_gtk_gl -lglut -lGL -lGLU"
   fi
 else
   if test "$wxwin" = "true" ; then