r2104: *** empty log message ***

[ctsim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5057920a9d723397abe6b80770dca2d9707bf5ec..d3d612cb9bf505f9c0367407357f0166124c6ed9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl CDPATH=
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.0)
+AM_INIT_AUTOMAKE(ctsim,3.5.4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -118,12 +118,12 @@ if test "$debug" = "true" ; then
   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"
+  CFLAGS="$CFLAGS -pthread -D_REENTRANT"
   AC_DEFINE(HAVE_WXTHREADS,1,[have wxthreads library])
 fi
 
@@ -209,30 +209,34 @@ AC_ARG_WITH(ctn,
      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 ],