AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.5)
+AM_INIT_AUTOMAKE(ctsim,3.5.6)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
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])
if test "$zlib" = "true" ; then
- AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG,1,[PNG library])], [png=false])
+ AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG,1,[PNG library])], [png=false], [-lz -lm])
fi
dnl Checks for header files.
fi
if test "${pthread}" = "true" ; then
- CFLAGS="$CFLAGS -pthread -D_REENTRANT"
+dnl CFLAGS="$CFLAGS -D_REENTRANT"
AC_DEFINE(HAVE_WXTHREADS,1,[have wxthreads library])
fi
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
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