AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.6)
+AM_INIT_AUTOMAKE(ctsim,4.0.0)
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.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_mac=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])
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
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"
+ # Removed "-lglut" for Mac OS X compilation
+ ctlib_graphics="$ctlib_graphics -lGL -lGLU"
if test "$wxwin" = "true" ; then
- ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.3"
+ if [ "$wx_gtk" ]; then
+ ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4"
+ elif [ "$wx_mac" ]; then
+ ctlib_graphics="$ctlib_graphics -lwx_mac_gl-2.4"
+ fi
fi
fi
if test "$wxwin" = "true" ; then
fi
if test "$wxwin" = "true" ; then
- if test "$wx_gtk" = "true" ; then
+ if [ "$wx_gtk" = "true" ] || [ "$wx_mac" == "true" ] ; then
wxcflags=`$wxconfig --cflags`
wxlibs=`$wxconfig --libs`
else
wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__"
- wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
+ wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff"
fi
CFLAGS="$CFLAGS -I../include $wxcflags"
ctlib_graphics="$ctlib_graphics $wxlibs"