r1984: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 28082a8f84a7c23f5fad26cfade4122077664743..05733e9ff78915eecd01a0696095a6abc20cd5d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+May 8, 2000  Version 3.5.2
+       * configure: improved CTN (DICOM) installation search
+

 May 5, 2000  Version 3.5.1
 
        New Features:
 May 5, 2000  Version 3.5.1
 
        New Features:

diff --git a/configure b/configure
index de7ee105fc09816acccfbb89f6667a16bcdcb63d..7b9f38841a956feeccce107c0c1bb7a64cdd56b4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1415,7 +1415,7 @@ fi
 
 PACKAGE=ctsim
 
 
 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
 
 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;
 
 
 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
   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
 
       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
 echo "${ECHO_T}no" >&6

+  fi

 fi
 
 fi
 

-

 echo "$as_me:$LINENO: checking for web access" >&5
 echo $ECHO_N "checking for web access... $ECHO_C" >&6
 
 echo "$as_me:$LINENO: checking for web access" >&5
 echo $ECHO_N "checking for web access... $ECHO_C" >&6
 

diff --git a/configure.ac b/configure.ac
index 5057920a9d723397abe6b80770dca2d9707bf5ec..c6ed69f004daeded4bda79f49948dc9eae6b9e36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl CDPATH=
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])

-AM_INIT_AUTOMAKE(ctsim,3.5.0)
+AM_INIT_AUTOMAKE(ctsim,3.5.2)

 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.


@@ -209,30 +209,34 @@ AC_ARG_WITH(ctn,
      fi ]
 )
 
      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])
   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
       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
 
 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 web access])
 dnl Set cgi-bin directory
 AC_ARG_WITH(cgibin-dir, [  --with-cgibin-dir=PATH  Set path of CGI binaries directory ], 

diff --git a/cvsbp-prepare.sh b/cvsbp-prepare.sh
index bb25e54c7cf37df81210160e1306ddec89cfcadc..1769405b85f9c6cd66542a6cfb14eb116e6da2a1 100755 (executable)
--- a/cvsbp-prepare.sh
+++ b/cvsbp-prepare.sh
@@ -14,7 +14,7 @@ else
 fi
 
 # Clean checked out CVS directory
 fi
 
 # Clean checked out CVS directory

-rm -f upload.sh make-upstream.sh make-debian.sh make-doc.sh do-autoconf
+rm -f upload.sh make-upstream.sh make-debian.sh make-doc.sh do-autoconf cvsbp-prepare.sh

 rm -f `find . -type f -name .cvsignore`
 rm -rf images doc stamp-h.in build-stamp configure-stamp
 rm -f cvsbp-prepare.sh
 rm -f `find . -type f -name .cvsignore`
 rm -rf images doc stamp-h.in build-stamp configure-stamp
 rm -f cvsbp-prepare.sh

diff --git a/debian/changelog b/debian/changelog
index 7c78709e03ebc8c01f1738da487b87d548a60137..58102007e79f48982c011bab333f75249d94bd9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ctsim (3.5.2-1) unstable; urgency=low
+
+  *  New upstream version.
+
+ -- Kevin Rosenberg <kevin@pal.med-info.com>  Wed,  8 May 2002 00:09:05 -0600
+

 ctsim (3.5.1-2) unstable; urgency=low
 
   * Changed control file.
 ctsim (3.5.1-2) unstable; urgency=low
 
   * Changed control file.

diff --git a/make-upstream.sh b/make-upstream.sh
index 77212bdce0b6f03b1a303703aa197e45d579ea7e..5f127a9e5be0a355503010cc0364bc595d0c03b9 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -76,7 +76,7 @@ rm -rf `find . -type d -name CVS`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`
 rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
   -name \*.log -or -name \*.out -or -name \*.dvi`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`
 rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
   -name \*.log -or -name \*.out -or -name \*.dvi`

-rm -rf images doc stamp-h.in build-stamp configure-stamp autom4te.cache
+rm -rf images doc stamp-h.in build-stamp configure-stamp autom4te.cache configure.ac do-autoconf

 cd ..
 
 echo "Creating upstream archives"
 cd ..
 
 echo "Creating upstream archives"