X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=configure.in;h=7463752b23c556e94a51b3396b438423cfebbe31;hp=81e1de9e5d46212ff87c5e391b6d1c229d86bfba;hb=9ff5b5165b2c8871bd4b29ccd5ca794638414615;hpb=1992cbf6645e87584da8576e290e270fc40af6cb

diff --git a/configure.in b/configure.in
index 81e1de9..7463752 100644
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
-AC_INIT(src/ctrec.cpp)
-AM_INIT_AUTOMAKE(ctsim,0.6.0-b1)
+AC_INIT(src/ctsim.cpp)
+AM_INIT_AUTOMAKE(ctsim,3.1.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -12,9 +12,14 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
+
+CFLAGS="$CFLAGS -I/usr/local/include"
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_PROG_CC
 AC_PROG_CXX
+AC_C_BIGENDIAN
 
+AC_PATH_PROG(wxconfig,wx-config)
 
 dnl AC_MSG_CHECKING([that the compiler works])
 dnl AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],     AC_MSG_RESULT(yes),     AC_MSG_RESULT(no)     AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),     AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
@@ -28,64 +33,30 @@ AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 
-dnl ---------------------------------------------------------------------------
-dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
-dnl from wxGTK (www.wxwindows.org) - LGPL license
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN(WX_C_BIGENDIAN,
-[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
-[ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/param.h>], [
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/param.h>], [
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
-if test $ac_cv_c_bigendian = unknown; then
-AC_TRY_RUN([main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes, ac_cv_c_bigendian=unknown)
-fi])
-if test $ac_cv_c_bigendian = unknown; then
-  AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" 
-to config.cache file])
-fi
-if test $ac_cv_c_bigendian = yes; then
-  AC_DEFINE(WORDS_BIGENDIAN)
-fi
-])
-
-WX_C_BIGENDIAN
-
-
 dnl Checks for libraries.
-AC_CHECK_LIB(z, main, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])])
-AC_CHECK_LIB(m, main)
+AC_CHECK_LIB(z, deflate, [ zlib="true" ], [ zlib="false" ;  AC_MSG_WARN([zlib missing. Will need zlib for PNG support])])
+AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(curses, main, [curses=true], [curses=false])
 AC_CHECK_LIB(ncurses, main, [ncurses=true], [ncurses=false])
 AC_CHECK_LIB(g2, main, [g2=true], [g2=false])
+AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readline=false])
+AC_CHECK_LIB(ncurses, main, [ncurses=true; AC_DEFINE(HAVE_NCURSES)], [ncurses=false])
+AC_CHECK_LIB(curses, main, [curses=true; AC_DEFINE(HAVE_CURSES)], [curses=false])
+wxwin=false
+AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
+AC_CHECK_LIB(hdf5, main, [hdf5=true], [hdf5=false], -lz)
+AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [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)], [png=false])
 fi
-AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true], [wxwin=false])
-AC_CHECK_LIB(wx_msw, main, [wxwin=true; wx_msw=true], [wxwin=false])
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h sys/time.h readline.h readline/readline.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -95,22 +66,76 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strtod strtol snprintf htonl)
+AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf)
 AC_CHECK_FUNC(basename)
 AC_CHECK_FUNC(setjmp)
+AC_CHECK_FUNC(setpriority)
+AC_CHECK_FUNC(time)
+AC_CHECK_FUNC(gettimeofday)
+
 if test "${OSTYPE}" = "cygwin" ; then
   getopt_long=false
 else
   AC_CHECK_FUNC(getopt_long, [ getopt_long=true ], [ getopt_long=false ])
 fi
+
+if test "${pthread}" = "true" ; then
+  AC_ADD_GCC_CFLAGS([-pthread -D_REENTRANT])
+  AC_DEFINE(HAVE_WXTHREADS)
+fi
+
 if test "${getopt_long}" = "false" ; then
-  my_includes="$myincludes -I../getopt"
+  my_includes="$my_includes -I../getopt"
   AC_DEFINE(HAVE_GETOPT_LONG)
   ctlibs_base="$ctlibs_base -lgetopt"
   LDFLAGS="$LDFLAGS -L../getopt"
   AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
 fi
 
+if test "${readline}" = "true" ; then
+  ctlibs_base="$ctlibs_base -lreadline"
+  if test "${ncurses}" = "true"; then
+    ctlibs_base="$ctlibs_base -lncurses"
+  elif test "${curses}" = "true"; then
+    ctlibs_base="$ctlibs_base -lcurses"
+  fi
+fi
+
+dnl Check for debug mode
+AC_MSG_CHECKING([debug])
+AC_ARG_ENABLE(debug,
+[  --enable-debug          Turn on debugging],
+[case "${enableval}" in
+  yes) debug=true 
+       AC_MSG_RESULT(yes)
+       ;;
+  no)  debug=false 
+       AC_MSG_RESULT(no)
+       ;;
+  *) AC_MSG_RESULT([bad value ${enableval} for --enable-debug]) 
+       ;;
+esac],
+[debug=false; AC_MSG_RESULT(no)])
+AM_CONDITIONAL(DEBUG, test "$debug" = "true")
+
+if test "$debug" = "true" ; then
+dnl  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
+  CFLAGS="-g -DDEBUG"
+  AC_DEFINE(DEBUG)
+else
+dnl  AC_ADD_GCC_CFLAGS([-O2 -fexpensive-optimizations -DNDEBUG])
+  CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
+  AC_DEFINE(NDEBUG)
+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)
+  AC_MSG_RESULT(yes)
+fi
+AC_MSG_RESULT(no)
+
 
 AC_ADD_GCC_CFLAGS([-Wall])
 AC_MSG_CHECKING(whether to enable verbose warnings)
@@ -134,20 +159,20 @@ AC_ARG_ENABLE(verbose-warnings,
   esac ], AC_MSG_RESULT(no)
 )
 
-dnl Check for debug mode
-AC_ARG_ENABLE(debug,
-[  --enable-debug          Turn on debugging],
-[case "${enableval}" in
-  yes) debug=true 
-       CFLAGS="$CFLAGS -g"
-       ;;
-  no)  debug=false 
-       CFLAGS="$CFLAGS -O2"
-       ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) 
-       ;;
-esac],[debug=false])
-AM_CONDITIONAL(DEBUG, test "$debug" = "true")
+AC_MSG_CHECKING(static executables)
+AC_ARG_ENABLE(static,
+[  --enable-static
+                          Enable static executables.],
+[ case "$enableval" in
+  yes)
+    AC_MSG_RESULT(yes)
+    AC_ADD_GCC_CFLAGS([--static])
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+  esac ], AC_MSG_RESULT(no)
+)
 
 dnl Set LAM path
 AC_ARG_WITH(lam,
@@ -164,9 +189,12 @@ if test "$withval" != "no" ; then
 
   AC_MSG_CHECKING([for LAM MPI installation])
   for testlamdir in "." $trylamdir /usr/local /usr/local/lam /usr /usr/lam /opt /opt/lam ; do
-    if test -x "$testlamdir/bin/hcc" ; then
-      LDFLAGS="$LDFLAGS -L$testlamdir/lib"
-      CFLAGS="$CFLAGS -I$testlamdir/include"
+    if test -x "$testlamdir/bin/hcp" ; then
+      if test "$testlamdir" != "/usr"; then 	
+        LDFLAGS="$LDFLAGS -L$testlamdir/lib"
+        CFLAGS="$CFLAGS -I$testlamdir/include"
+      fi
+      CFLAGS="$CFLAGS -I$testlamdir/include/mpi2c++"
       lamdir="$testlamdir"
       AC_SUBST(lamdir)
       mpienable="true"
@@ -179,6 +207,40 @@ else
   AC_MSG_RESULT([no])
 fi
 
+
+dnl Set CTN path
+AC_ARG_WITH(ctn,
+[  --with-ctn[=PATH]       Set path of CTN DICOM library ],
+[    if test "$withval" != "no" ; then
+         tryctndir=$withval
+     fi ]
+)
+
+if test "$withval" != "no" ; then
+  if test "$prefix" != "NONE" ; then
+     tryctndir="$tryctndir $prefix"
+  fi
+
+  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)
+      break
+    fi
+  done
+  AC_MSG_RESULT($ctndir)
+else
+  AC_MSG_RESULT([no])
+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 ], 
@@ -249,7 +311,7 @@ AC_SUBST(X_BASIC_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
 
 X_TOOLKIT_LIBS="-lXt"
-X_BASIC_LIBS="-lXext -lX11"
+X_BASIC_LIBS="-lXext -lX11 -lXmu"
 
 dnl Check whether libXt has thread support.  Some platforms may have
 dnl pthread support in libc, but no thread support in libXt/libX11.
@@ -275,43 +337,121 @@ dnl Our Makefile.am files test the automake variable NO_X to determine
 dnl whether X should be supported.
 AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes")
 
-my_includes="$my_includes -I../include -I.."
+my_includes="$my_includes -I../include -I.. -I/usr/local/include"
 AC_SUBST(my_includes)
 
-AC_MSG_CHECKING([interactive graphics])
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
+AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
-  AC_DEFINE(HAVE_X11)
   AC_DEFINE(HAVE_SGP)
   AM_CONDITIONAL(HAVE_SGP, test 1==1)
-  LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L/usr/X11R6/lib"
-  ctlibs_base="$ctlibs_base -lezplot -lgraph $X_BASIC_LIBS $X_TOOLKIT_LIBS"
+  AC_DEFINE(HAVE_X11)
+  LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
+  ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
+  if test "$g2" = "true" ; then
+    ctlib_graphics="$ctlib_graphics -lg2"
+    AC_DEFINE(HAVE_G2)
+  fi	
+  ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
+  if test "$libgl" = "true" ; then
+    ctlib_graphics="$ctlib_graphics -lwx_gtk_gl -lglut -lGL -lGLU"
+  fi
 else
+  if test "$wxwin" = "true" ; then
+    AC_DEFINE(HAVE_SGP)
+    AM_CONDITIONAL(HAVE_SGP, test 1==1)
+  fi
   AC_MSG_RESULT(no)
 fi
 
-dnl Setting projet libraries and includes
-LDFLAGS="$LDFLAGS -L../libkmath -L../libk -L../libcio -L../libir" 
-ctlibs_base="$ctlibs_base -lkmath -lk -lcio"
 if test "$png" = "true" ; then
-  ctlibs_base="$ctlibs_base -lpng"
+  ctlibs_tools="$ctlibs_tools -lpng"
 fi
 if test "$zlib" = "true" ; then
-  ctlibs_base="$ctlibs_base -lz"
+  ctlibs_tools="$ctlibs_tools -lz"
+fi
+if test "$fftw" = "true" ; then
+  ctlibs_tools="$ctlibs_tools -lrfftw -lfftw"
 fi
-if test "$g2" = "true" ; then
-  ctlibs_base="$ctlibs_base -lg2"
+if test "$ctn" = "true"; then
+  ctlibs_tools="$ctlibs_tools -lctn"
 fi
 
-ctlibs="-lir $ctlibs_base"
+dnl Check for dmalloc
+AC_CHECK_LIB(dmallocxx, main, [dmallocxx=true], [dmallocxx=false])
+AC_MSG_CHECKING([for enable-dmalloc])
+AC_ARG_ENABLE(dmalloc,
+[  --enable-dmalloc        Use dmalloc memory allocation],
+[case "${enableval}" in
+  yes) usedmalloc=true 
+       AC_MSG_RESULT(yes)
+       ;;
+  no)  usedmalloc=false 
+       AC_MSG_RESULT(no)
+       ;;
+  *) AC_MSG_RESULT([bad value ${enableval} for --enable-dmalloc]) 
+       ;;
+esac],
+[usedmalloc=false; AC_MSG_RESULT(no)])
+
+if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
+  ctlibs_tools="$ctlibs_tools -ldmallocxx"
+  AC_DEFINE(HAVE_DMALLOC)
+  AC_MSG_RESULT(Using dmalloc)
+fi
 
+dnl Check for efence
+AC_CHECK_LIB(efence, main, [efence=true], [efence=false])
+AC_MSG_CHECKING([for enable-efence])
+AC_ARG_ENABLE(efence,
+[  --enable-efence        Use ElectricFence memory allocation],
+[case "${enableval}" in
+  yes) useefence=true 
+       AC_MSG_RESULT(yes)
+       ;;
+  no)  useefence=false 
+       AC_MSG_RESULT(no)
+       ;;
+  *) AC_MSG_RESULT([bad value ${enableval} for --enable-efence]) 
+       ;;
+esac],
+[useefence=false; AC_MSG_RESULT(no)])
+
+if test "$efence" = "true" -a "$useefence" = "true" ; then
+  ctlibs_tools="$ctlibs_tools -lefence"
+  AC_DEFINE(HAVE_EFENCE)
+  AC_MSG_RESULT(Using efence)
+fi
+
+if test "$wxwin" = "true" ; then
+  if test "$wx_gtk" = "true" ; then	
+    wxcflags=`$wxconfig --cflags`
+    wxlibs=`$wxconfig --libs`
+  else
+	wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__"
+   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)
+
+dnl Setting projet libraries and includes
+LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" 
+ctlibs="$ctlibs_base -lctsim $ctlib_graphics -lctsupport $ctlibs_tools"
 AC_SUBST(ctlibs)
 
 if test -n "$lamdir" ; then
-  ctlamlibs="-lir_lam $ctlibs_base"
-  lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam"
+  lamprograms="ctsimtext-lam"
   AC_SUBST(lamprograms)
-  AC_SUBST(ctlamlibs)
+  lamdefs="$CFLAGS"
+  AC_SUBST(lamdefs)
 fi
 
-AC_OUTPUT(Makefile libezplot/Makefile src/Makefile libgraph/Makefile libkmath/Makefile Makefile libk/Makefile libir/Makefile libcio/Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf)
+CXXFLAGS="$CFLAGS"
+
+AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile doc/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)