X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.ac;h=80bd7ea47436dc09617aadb4b2fc347fb3614192;hb=bcc0f3056ec84efcef9559f23b5513f7ed61f9c3;hp=df1a1037595bbcb037339b18a52df362793b8299;hpb=a0f552ce505ff64d43269842da6a9db4db0e7f0e;p=ctsim.git

diff --git a/configure.ac b/configure.ac
index df1a103..80bd7ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl CDPATH=
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.6)
+AM_INIT_AUTOMAKE(ctsim,3.7.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -40,8 +40,8 @@ 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.3, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
-AC_CHECK_LIB(wx_mac-2.3, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
+AC_CHECK_LIB(wx_gtk-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
+AC_CHECK_LIB(wx_mac-2.4, 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])
@@ -130,7 +130,8 @@ fi
 
 AC_MSG_CHECKING(sstream)
  if [ test -f /usr/include/sstream || test -f /usr/include/g++/sstream ||
-     test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ]; then
+     test -f /usr/include/g++-2/sstream || test -f /usr/include/g++-3/sstream ||
+     test -f /usr/include/gcc/darwin/3.1/g++-v3/sstream ]; then
   AC_DEFINE(HAVE_SSTREAM,1,[sstream header])
   AC_MSG_RESULT(yes)
 fi
@@ -330,13 +331,14 @@ AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
   AC_DEFINE(HAVE_X11,1,[X11 system])
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+  my_includes="$my_includes -I/usr/X11R6/include"
   ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
   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.3"
+      ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4"
     fi
   fi
   if test "$wxwin" = "true" ; then