AC_INIT
AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.6)
+AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE(ctsim,4.2.8)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
[readline=false], [-lcurses])
wxwin=false
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(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(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64 -lXt -lXext])
AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false])
if test "$zlib" = "true" ; then
AC_CHECK_FUNC(setpriority)
AC_CHECK_FUNC(time)
AC_CHECK_FUNC(gettimeofday)
+AC_CHECK_FUNC(getopt, [ getopt=true ], [ getopt=false ])
if test "${OSTYPE}" = "cygwin" ; then
getopt_long=false
AC_DEFINE(HAVE_GETOPT_LONG,1,[getopt_long library])
ctlibs_base="$ctlibs_base -lgetopt"
LDFLAGS="$LDFLAGS -L../getopt"
- AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
+ GETOPTLONG=1
fi
+AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test "$GETOPTLONG"="1")
if test "${readline}" = "true" ; then
ctlibs_base="$ctlibs_base -lreadline"
CFLAGS="$CFLAGS -g -DDEBUG"
AC_DEFINE(DEBUG,1,[turn on debugging])
else
- CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer -funroll-loops"
+ CFLAGS="$CFLAGS -O2 -DNDEBUG -fomit-frame-pointer"
AC_DEFINE(NDEBUG,1,[no debugging])
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
- AC_DEFINE(HAVE_SSTREAM,1,[sstream header])
- AC_MSG_RESULT(yes)
-fi
-AC_MSG_RESULT(no)
+ 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)
+ else
+ AC_MSG_RESULT(no)
+ fi
CFLAGS="$CFLAGS -Wall"
AC_MSG_CHECKING(static executables)
AC_ARG_ENABLE(static,
[ --enable-static
- Enable static executables.],
+ Enable static executables.],
[ case "$enableval" in
yes)
AC_MSG_RESULT(yes)
dnl Set LAM path
AC_ARG_WITH(lam,
-[ --with-lam[=PATH] Set path of LAM MPI ],
+[ --with-lam[=PATH] Set path of LAM MPI ],
[ if test "$withval" != "no" ; then
trylamdir=$withval
fi ]
dnl Set CTN path
AC_ARG_WITH(ctn,
-[ --with-ctn[=PATH] Set path of CTN DICOM library ],
+[ --with-ctn[=PATH] Set path of CTN DICOM library ],
[ if test "$withval" != "no" ; then
tryctndir=$withval
fi ]
fi
fi
+dnl Set CPU
+AC_MSG_CHECKING([for CPU specification])
+AC_ARG_WITH(mcpu,
+[ --with-mcpu[=CPU] Set name of CPU for gcc -mcpu])
+
+if test "$withval" == "no" -o "$withval" == "yes" -o "$withval" == ""; then
+ AC_MSG_RESULT([no])
+else
+ AC_MSG_RESULT([$withval])
+ CFLAGS="$CFLAGS -mcpu=$withval"
+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 ],
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"
+ LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib -L/usr/X11R6/lib64"
+ 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.4"
+ 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
AC_DEFINE(HAVE_SGP,1,[use sgp library])
- AM_CONDITIONAL(HAVE_SGP, test 1==1)
fi
else
AC_MSG_RESULT(no)
fi
+AM_CONDITIONAL(HAVE_SGP, test "$wxwin" = "true")
+
if test "$png" = "true" ; then
ctlibs_tools="$ctlibs_tools -lpng"
fi
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"
- AM_CONDITIONAL(HAVE_WXWINDOWS, test 1==1 )
fi
AC_SUBST(wxcflags)
AC_SUBST(wxlibs)
+AM_CONDITIONAL(HAVE_WXWINDOWS, test "$wxwin"="true")
dnl Setting projet libraries and includes
LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim"