X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.ac;h=d13290cce893207a39161816ff089b833a8c502b;hb=294a10772740d04c66b2ea9284a6d7e243e55c99;hp=d6cacfb1cd4a8c77ec112c575641e7db6e198653;hpb=0695e3d02bf8911708d191ac8490b7adcd8bb73a;p=ctsim.git

diff --git a/configure.ac b/configure.ac
index d6cacfb..d13290c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_CHECK_LIB(readline, main, [readline=true;
                  AC_DEFINE([HAVE_READLINE],1,[Readline library])],
 		 [readline=false], [-lcurses])	
 wxwin=false
-AC_CHECK_LIB(wx_gtk-2.2, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
+AC_CHECK_LIB(wx_gtk-2.3, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
 AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false])
 AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -lXt -lXext])
 AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false])
@@ -123,7 +123,7 @@ else
 fi
 
 if test "${pthread}" = "true" ; then
-  CFLAGS="$CFLAGS -D_REENTRANT"
+dnl  CFLAGS="$CFLAGS -D_REENTRANT"
   AC_DEFINE(HAVE_WXTHREADS,1,[have wxthreads library])
 fi
 
@@ -335,7 +335,7 @@ if test "$no_x" != "yes" ; then
   if test "$libgl" = "true" ; then
     ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU"
     if test "$wxwin" = "true" ; then
-      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.2"
+      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.3"
     fi
   fi
   if test "$wxwin" = "true" ; then
@@ -434,5 +434,6 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
-AC_CONFIG_FILES([Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/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 helical/Makefile helical/sample-helical.sh])
+AC_CONFIG_FILES([Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile man/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 helical/Makefile helical/sample-helical.sh])
+
 AC_OUTPUT