X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure;h=7b9f38841a956feeccce107c0c1bb7a64cdd56b4;hb=c0f892798de8f89715266150f7d8e413f2cf29fe;hp=de7ee105fc09816acccfbb89f6667a16bcdcb63d;hpb=512ebbafa4666521b5a8acef939e89dcec6e2643;p=ctsim.git

diff --git a/configure b/configure
index de7ee10..7b9f388 100755
--- a/configure
+++ b/configure
@@ -1415,7 +1415,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=3.5.0
+VERSION=3.5.2
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
@@ -7456,37 +7456,43 @@ if test "${with_ctn+set}" = set; then
 
 fi;
 
-if test "$withval" != "no" ; then
-  if test "$prefix" != "NONE" ; then
-     tryctndir="$tryctndir $prefix"
-  fi
-
+if test "$withval" == "no" -o "$withval" == "NONE" ; then
   echo "$as_me:$LINENO: checking for CTN DICOM installation" >&5
 echo $ECHO_N "checking for CTN DICOM installation... $ECHO_C" >&6
-  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"
+  echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6
+else
+  echo "$as_me:$LINENO: checking for CTN DICOM installation" >&5
+echo $ECHO_N "checking for CTN DICOM installation... $ECHO_C" >&6
+  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
+  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"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_CTN_DICOM 1
 _ACEOF
 
-      break
-    fi
-  done
-  echo "$as_me:$LINENO: result: $ctndir" >&5
-echo "${ECHO_T}$ctndir" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  else
+    echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
+  fi
 fi
 
-
 echo "$as_me:$LINENO: checking for web access" >&5
 echo $ECHO_N "checking for web access... $ECHO_C" >&6