AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.0)
+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.2, 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])
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.
CFLAGS="$CFLAGS -g -DDEBUG"
AC_DEFINE(DEBUG,1,[turn on debugging])
else
- CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer"
+ CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer -funroll-loops"
AC_DEFINE(NDEBUG,1,[no debugging])
fi
if test "${pthread}" = "true" ; then
- CFLAGS="$FLAGS -pthread -D_REENTRANT"
+dnl CFLAGS="$CFLAGS -D_REENTRANT"
AC_DEFINE(HAVE_WXTHREADS,1,[have wxthreads library])
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
fi ]
)
-if test "$withval" != "no" ; then
- if test "$prefix" != "NONE" ; then
- tryctndir="$tryctndir $prefix"
- fi
-
+if test "$withval" == "no" -o "$withval" == "NONE" ; then
AC_MSG_CHECKING([for CTN DICOM installation])
- for testctndir in "." $tryctndir /usr/local /usr/local/ctn /usr /usr/ctn /opt /opt/ctn ; do
- if test -f "$testctndir/lib/libctn.a" ; then
- if test "$testctndir" != "/usr"; then
- LDFLAGS="$LDFLAGS -L$testctndir/lib"
- CFLAGS="$CFLAGS -I$testctndir/include"
- fi
- ctndir="$testctndir"
- ctn="true"
- AC_DEFINE(HAVE_CTN_DICOM,1,[ctn dicom library])
+ AC_MSG_RESULT([disabled])
+else
+ AC_MSG_CHECKING([for CTN DICOM installation])
+ for testctndir in $tryctndir/lib /usr/local/lib /usr/local/ctn/lib /usr/lib /usr/ctn/lib /usr/lib/ctn /opt/ctn/lib ; do
+ if test -f "$testctndir/libctn.a" ; then
+ LDFLAGS="$LDFLAGS -L$testctndir"
+ ctnlib="true"
break
fi
done
- AC_MSG_RESULT($ctndir)
-else
- AC_MSG_RESULT([no])
+ for testctndir in $tryctndir/include /usr/local/include /usr/local/ctn/include /usr/include /usr/include/ctn /usr/ctn/include /opt/ctn/include ; do
+ if test -f "$testctndir/ctn_os.h" ; then
+ CFLAGS="$CFLAGS -I$testctndir"
+ ctninclude="true"
+ break
+ fi
+ done
+ if test "$ctnlib" == "true" -a "$ctninclude" == "true" ; then
+ ctn="true"
+ AC_DEFINE(HAVE_CTN_DICOM,1,[ctn dicom library])
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
fi
-
AC_MSG_CHECKING([for web access])
dnl Set cgi-bin directory
AC_ARG_WITH(cgibin-dir, [ --with-cgibin-dir=PATH Set path of CGI binaries directory ],
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.2"
+ 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"
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