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

diff --git a/configure.in b/configure.in
index e04c771..7463752 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,3.0.0beta1)
+AM_INIT_AUTOMAKE(ctsim,3.1.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -47,8 +47,8 @@ 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])
-AC_CHECK_LIB(wx_gtk_gl, main, [wxgtkgl=true], [wxgtkgl=false], -lwx_gtk -lGL)
+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])
@@ -79,6 +79,11 @@ 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="$my_includes -I../getopt"
   AC_DEFINE(HAVE_GETOPT_LONG)
@@ -118,7 +123,7 @@ dnl  AC_ADD_GCC_CFLAGS([-g -DDEBUG])
   CFLAGS="-g -DDEBUG"
   AC_DEFINE(DEBUG)
 else
-dnl  AC_ADD_GCC_CFLAGS([-O2 -DNDEBUG])
+dnl  AC_ADD_GCC_CFLAGS([-O2 -fexpensive-optimizations -DNDEBUG])
   CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
   AC_DEFINE(NDEBUG)
 fi
@@ -202,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 ], 
@@ -272,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.
@@ -316,8 +355,8 @@ if test "$no_x" != "yes" ; then
     AC_DEFINE(HAVE_G2)
   fi	
   ctlib_graphics="$ctlib_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
-  if test "$libgl" = "true" -a "$wxgtkgl" = "true" ; then
-    ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU -lwx_gtk_gl"
+  if test "$libgl" = "true" ; then
+    ctlib_graphics="$ctlib_graphics -lwx_gtk_gl -lglut -lGL -lGLU"
   fi
 else
   if test "$wxwin" = "true" ; then
@@ -336,6 +375,9 @@ fi
 if test "$fftw" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lrfftw -lfftw"
 fi
+if test "$ctn" = "true"; then
+  ctlibs_tools="$ctlibs_tools -lctn"
+fi
 
 dnl Check for dmalloc
 AC_CHECK_LIB(dmallocxx, main, [dmallocxx=true], [dmallocxx=false])
@@ -360,6 +402,29 @@ if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
   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`