r563: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index db07adfad3141cc51eba55a2c5d5927d69c491b9..40e1ce5ec1b739a381bc81cd93e6d9346610d0c5 100644 (file)
--- 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.0.3)
 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
@@ -389,4 +388,4 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
-AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile doc/tex2rtf/Makefile)
+AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile tools/sample-ctsim.sh cgi-bin/ctsim.conf tools/Makefile src/Makefile)