r1944: *** empty log message ***

diff --git a/.cvsignore b/.cvsignore
index 68dc6cf0bec820319a146585cb3c0c0389bdd781..e0c3aab2bc20cc2277f2591bd305d94435ac72de 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ config.status
 configure-stamp
 stamp-h
 stamp-h.in
+

diff --git a/Makefile.in b/Makefile.in
index 7d928433dcb0bbfb72e5aa420fa8e66a3a6dc60a..f47f4fe3f827aee3a487c5b058e929ea84f12ccc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,9 +104,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
-config.h.in config.sub configure configure.ac install-sh missing \
-mkinstalldirs
+Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \
+config.sub configure configure.ac install-sh missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,7 +146,7 @@ $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
                rm -f $(srcdir)/stamp-h.in; \
                $(MAKE) $(srcdir)/stamp-h.in; \
        else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) acconfig.h
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOHEADER)
        @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644 (file)
index f967cb2..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Define to be the version of the distribution.  */
-#undef VERSION
-
-/* Define to signal compiler support for void and void * types */
-#define HAVE_VOID 1
-
-/* Define (if compiling as C++) to signal compiler support for bool type */
-#undef HAVE_BOOL
-
-/* Define under HP/UX to get matherr-related things from math.h. */
-#undef _HPUX_SOURCE
-
-/* Define to signal that fflush(NULL) works: it flushes all outstreams. */
-#undef HAVE_NULL_FLUSH
-
-/* Redundant and unused: Define to signal that fflush(NULL) doesn't work. */
-#undef DONT_HAVE_NULL_FLUSH
-
-/* Define to signal that Motif should be used, if X11 is used */
-#undef USE_MOTIF
-
-/* Define to signal support in libc for the pthread threads library */
-#undef PTHREAD_SUPPORT
-
-/* Define if we have the thread-safe library function ctime_r() */
-#undef HAVE_CTIME_R
-
-/* Define if we have the thread-safe library function localtime_r() */
-#undef HAVE_LOCALTIME_R
-
-/* Define to signal support in libXt/libX11 for multithreading */
-#undef X_THREAD_SUPPORT
-
-/* Define to signal support in -lXext for the DBE X11 protocol extension */
-#undef HAVE_DBE_SUPPORT
-
-/* Define to signal support in -lXext for the MBX X11 protocol extension */
-#undef HAVE_MBX_SUPPORT
-
-/* Define to enable support for the 45 LaserJet fonts in X output */
-#undef USE_LJ_FONTS_IN_X
-
-/* Define to enable support for the 45 LaserJet fonts in PS output */
-#undef USE_LJ_FONTS_IN_PS
-
-/* Define to enable support for the 35 PS fonts in PCL output */
-#undef USE_PS_FONTS_IN_PCL
-
-/* Define if have getopt_long function */
-#undef HAVE_GETOPT_LONG
-
-/* Define if have PNG library */
-#undef HAVE_PNG
-
-/* Define is have interactive graphics */
-#undef HAVE_SGP
-
-/* Define for X11 library */
-#undef HAVE_X11
-
-#undef HAVE_WXWINDOWS
-
-#undef HAVE_FFTW
-
-#undef DEBUG
-
-#undef NDEBUG
-
-/* Define if have dmalloc library */
-#undef HAVE_DMALLOC
-
-/* Define for HDF5 library */
-#undef HAVE_HDF5
-
-#undef HAVE_USLEEP
-
-#undef HAVE_SSTREAM
-
-#undef HAVE_READLINE
-
-#undef HAVE_G2
-
-#undef HAVE_CURSES
-
-#undef HAVE_NCURSES
-
-#undef HAVE_CTN_DICOM
-
-#undef HAVE_WXTHREADS
-
-#undef HAVE_EFENCE

diff --git a/acsite.m4 b/acsite.m4
deleted file mode 100644 (file)
index a44ae52..0000000
--- a/acsite.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
-
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-#
-# acinclude.m4
-#
-
-dnl   Add argument to CFLAGS if using gcc.
-AC_DEFUN(AC_ADD_GCC_CFLAGS,
-[AC_REQUIRE([AC_PROG_CC])
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS $1"
- fi
- ])
-

diff --git a/config.h.in b/config.h.in
index af273a485b729f62e06904493d5b9a082b56b1dc..a955015cb8aa8f2d74a115c673c2d10f6b425189 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,112 +1,41 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
-/* Define to be the version of the distribution.  */
-#undef VERSION
-
-/* Define to signal compiler support for void and void * types */
-#define HAVE_VOID 1
-
-/* Define (if compiling as C++) to signal compiler support for bool type */
-#undef HAVE_BOOL
-
-/* Define under HP/UX to get matherr-related things from math.h. */
-#undef _HPUX_SOURCE
-
-/* Define to signal that fflush(NULL) works: it flushes all outstreams. */
-#undef HAVE_NULL_FLUSH
-
-/* Redundant and unused: Define to signal that fflush(NULL) doesn't work. */
-#undef DONT_HAVE_NULL_FLUSH
-
-/* Define to signal that Motif should be used, if X11 is used */
-#undef USE_MOTIF
-
-/* Define to signal support in libc for the pthread threads library */
-#undef PTHREAD_SUPPORT
-
-/* Define if we have the thread-safe library function ctime_r() */
-#undef HAVE_CTIME_R
-
-/* Define if we have the thread-safe library function localtime_r() */
-#undef HAVE_LOCALTIME_R
-
-/* Define to signal support in libXt/libX11 for multithreading */
-#undef X_THREAD_SUPPORT
-
-/* Define to signal support in -lXext for the DBE X11 protocol extension */
-#undef HAVE_DBE_SUPPORT
-
-/* Define to signal support in -lXext for the MBX X11 protocol extension */
-#undef HAVE_MBX_SUPPORT
-
-/* Define to enable support for the 45 LaserJet fonts in X output */
-#undef USE_LJ_FONTS_IN_X
-
-/* Define to enable support for the 45 LaserJet fonts in PS output */
-#undef USE_LJ_FONTS_IN_PS
-
-/* Define to enable support for the 35 PS fonts in PCL output */
-#undef USE_PS_FONTS_IN_PCL
-
-/* Define if have getopt_long function */
-#undef HAVE_GETOPT_LONG
-
-/* Define if have PNG library */
-#undef HAVE_PNG
-
-/* Define is have interactive graphics */
-#undef HAVE_SGP
-
-/* Define for X11 library */
-#undef HAVE_X11
-
-#undef HAVE_WXWINDOWS
-
-#undef HAVE_FFTW
 
+/* turn on debugging */
 #undef DEBUG
 
-#undef NDEBUG
-
-/* Define if have dmalloc library */
-#undef HAVE_DMALLOC
-
-/* Define for HDF5 library */
-#undef HAVE_HDF5
-
-#undef HAVE_USLEEP
-
-#undef HAVE_SSTREAM
-
-#undef HAVE_READLINE
-
-#undef HAVE_G2
-
-#undef HAVE_CURSES
-
-#undef HAVE_NCURSES
-
-#undef HAVE_CTN_DICOM
-
-#undef HAVE_WXTHREADS
-
-#undef HAVE_EFENCE
-
-
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 
+/* ctn dicom library */
+#undef HAVE_CTN_DICOM
+
 /* Define to 1 if you have the <ctype.h> header file. */
 #undef HAVE_CTYPE_H
 
+/* x dbe support */
+#undef HAVE_DBE_SUPPORT
+
+/* dmalloc library */
+#undef HAVE_DMALLOC
+
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
+/* efence library */
+#undef HAVE_EFENCE
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* FFTW library */
+#undef HAVE_FFTW
+
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
+/* getopt_long library */
+#undef HAVE_GETOPT_LONG
+
 /* Define to 1 if you have the `htonl' function. */
 #undef HAVE_HTONL
 
@@ -119,12 +48,21 @@
 /* Define to 1 if you have the <math.h> header file. */
 #undef HAVE_MATH_H
 
+/* x mbx support */
+#undef HAVE_MBX_SUPPORT
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
+/* PNG library */
+#undef HAVE_PNG
+
+/* Readline library */
+#undef HAVE_READLINE
+
 /* Define to 1 if you have the <readline.h> header file. */
 #undef HAVE_READLINE_H
 
@@ -134,9 +72,15 @@
 /* Define to 1 if you have the <setjmp.h> header file. */
 #undef HAVE_SETJMP_H
 
+/* use sgp library */
+#undef HAVE_SGP
+
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
+/* sstream header */
+#undef HAVE_SSTREAM
+
 /* Define to 1 if you have the <stdarg.h> header file. */
 #undef HAVE_STDARG_H
 
@@ -197,12 +141,24 @@
 /* Define to 1 if you have the `vsprintf' function. */
 #undef HAVE_VSPRINTF
 
+/* have wxthreads library */
+#undef HAVE_WXTHREADS
+
+/* wxwindows library */
+#undef HAVE_WXWINDOWS
+
+/* X11 system */
+#undef HAVE_X11
+
 /* Define to 1 if you have the <X11/extensions/multibuf.h> header file. */
 #undef HAVE_X11_EXTENSIONS_MULTIBUF_H
 
 /* Define to 1 if you have the <X11/extensions/Xdbe.h> header file. */
 #undef HAVE_X11_EXTENSIONS_XDBE_H
 
+/* no debugging */
+#undef NDEBUG
+
 /* Name of package */
 #undef PACKAGE
 
@@ -252,6 +208,9 @@
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
+/* x thread supported */
+#undef X_THREAD_SUPPORT
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

diff --git a/configure b/configure
index 19619e4f1af390a6804818605060eb1dc5b4917e..843687cdb2715679dbbe037729cea4ce270322e5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1222,6 +1222,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1743,9 +1744,6 @@ else
 fi
 
 
-CPPFLAGS='$(CPPFLAGS) -DDATADIR="$(datadir)"'
-CFLAGS="$CFLAGS -I/usr/local/include"
-LDFLAGS="$LDFLAGS -L/usr/local/lib"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3072,7 +3070,6 @@ echo "${ECHO_T}no" >&6
 fi
 
 
-
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -5485,6 +5482,7 @@ _ACEOF
 
 
 
+
 echo "$as_me:$LINENO: checking for deflate in -lz" >&5
 echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_deflate+set}" = set; then
@@ -5772,7 +5770,9 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5
 echo "${ECHO_T}$ac_cv_lib_readline_main" >&6
 if test $ac_cv_lib_readline_main = yes; then
-  readline=true; cat >>confdefs.h <<\_ACEOF
+  readline=true;
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_READLINE 1
 _ACEOF
 
@@ -5780,122 +5780,6 @@ else
   readline=false
 fi
 
-echo "$as_me:$LINENO: checking for main in -lncurses" >&5
-echo $ECHO_N "checking for main in -lncurses... $ECHO_C" >&6
-if test "${ac_cv_lib_ncurses_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ncurses_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_ncurses_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_main" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_main" >&6
-if test $ac_cv_lib_ncurses_main = yes; then
-  ncurses=true; cat >>confdefs.h <<\_ACEOF
-#define HAVE_NCURSES 1
-_ACEOF
-
-else
-  ncurses=false
-fi
-
-echo "$as_me:$LINENO: checking for main in -lcurses" >&5
-echo $ECHO_N "checking for main in -lcurses... $ECHO_C" >&6
-if test "${ac_cv_lib_curses_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_curses_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_curses_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_curses_main" >&5
-echo "${ECHO_T}$ac_cv_lib_curses_main" >&6
-if test $ac_cv_lib_curses_main = yes; then
-  curses=true; cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURSES 1
-_ACEOF
-
-else
-  curses=false
-fi
-
 wxwin=false
 echo "$as_me:$LINENO: checking for main in -lwx_gtk-2.2" >&5
 echo $ECHO_N "checking for main in -lwx_gtk-2.2... $ECHO_C" >&6
@@ -5947,123 +5831,13 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_wx_gtk_2_2_main" >&5
 echo "${ECHO_T}$ac_cv_lib_wx_gtk_2_2_main" >&6
 if test $ac_cv_lib_wx_gtk_2_2_main = yes; then
-  wxwin=true; wx_gtk=true; cat >>confdefs.h <<\_ACEOF
-#define HAVE_WXWINDOWS 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for main in -lwx" >&5
-echo $ECHO_N "checking for main in -lwx... $ECHO_C" >&6
-if test "${ac_cv_lib_wx_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwx  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_wx_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_wx_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_wx_main" >&5
-echo "${ECHO_T}$ac_cv_lib_wx_main" >&6
-if test $ac_cv_lib_wx_main = yes; then
-  wxwin=true; wx_msw=true; cat >>confdefs.h <<\_ACEOF
+  wxwin=true; wx_gtk=true;
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_WXWINDOWS 1
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for main in -lhdf4" >&5
-echo $ECHO_N "checking for main in -lhdf4... $ECHO_C" >&6
-if test "${ac_cv_lib_hdf4_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhdf4 -lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_hdf4_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_hdf4_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_hdf4_main" >&5
-echo "${ECHO_T}$ac_cv_lib_hdf4_main" >&6
-if test $ac_cv_lib_hdf4_main = yes; then
-  hdf4=true
-else
-  hdf4=false
-fi
-
 echo "$as_me:$LINENO: checking for fftw_one in -lfftw" >&5
 echo $ECHO_N "checking for fftw_one in -lfftw... $ECHO_C" >&6
 if test "${ac_cv_lib_fftw_fftw_one+set}" = set; then
@@ -6120,7 +5894,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_fftw_fftw_one" >&5
 echo "${ECHO_T}$ac_cv_lib_fftw_fftw_one" >&6
 if test $ac_cv_lib_fftw_fftw_one = yes; then
-  fftw=true; cat >>confdefs.h <<\_ACEOF
+  fftw=true;
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_FFTW 1
 _ACEOF
 
@@ -6290,7 +6065,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
 echo "${ECHO_T}$ac_cv_lib_png_main" >&6
 if test $ac_cv_lib_png_main = yes; then
-  png=true ; cat >>confdefs.h <<\_ACEOF
+  png=true ;
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_PNG 1
 _ACEOF
 
@@ -7480,21 +7256,10 @@ fi
 
 fi
 
-if test "${pthread}" = "true" ; then
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -pthread -D_REENTRANT"
- fi
-
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_WXTHREADS 1
-_ACEOF
-
-fi
-
 if test "${getopt_long}" = "false" ; then
   my_includes="$my_includes -I../getopt"
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_GETOPT_LONG 1
 _ACEOF
 
@@ -7552,25 +7317,41 @@ else
   DEBUG_FALSE=
 fi
 
+if test "$datadir" != "" ; then
+  CPPFLAGS="$CPPFLAGS -DDATADIR=\"\\\"$datadir\\\"\""
+fi
+
 if test "$debug" = "true" ; then
-  CFLAGS="-g -DDEBUG"
-  cat >>confdefs.h <<\_ACEOF
+  CFLAGS="$CFLAGS -g -DDEBUG"
+
+cat >>confdefs.h <<\_ACEOF
 #define DEBUG 1
 _ACEOF
 
 else
-  CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
-  cat >>confdefs.h <<\_ACEOF
+  CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer"
+
+cat >>confdefs.h <<\_ACEOF
 #define NDEBUG 1
 _ACEOF
 
 fi
 
+if test "${pthread}" = "true" ; then
+  CFLAGS="$FLAGS -pthread -D_REENTRANT"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WXTHREADS 1
+_ACEOF
+
+fi
+
 echo "$as_me:$LINENO: checking sstream" >&5
 echo $ECHO_N "checking sstream... $ECHO_C" >&6
  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
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_SSTREAM 1
 _ACEOF
 
@@ -7581,11 +7362,7 @@ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -Wall"
- fi
-
+CFLAGS="$CFLAGS -Wall"
 echo "$as_me:$LINENO: checking whether to enable verbose warnings" >&5
 echo $ECHO_N "checking whether to enable verbose warnings... $ECHO_C" >&6
 # Check whether --enable-verbose-warnings or --disable-verbose-warnings was given.
@@ -7595,37 +7372,7 @@ if test "${enable_verbose_warnings+set}" = set; then
   yes)
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -W"
- fi
-
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -Wshadow -Wpointer-arith -Wbad-function-cast"
- fi
-
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -Wcast-align -Wwrite-strings -Waggregate-return"
- fi
-
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -Wmissing-prototypes -Wstrict-prototypes"
- fi
-
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -pedantic"
- fi
-
-
- if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -Wredundant-decls"
- fi
-
-
+    CFLAGS="$CFLAGS -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Waggregate-return -Wmissing-prototypes -Wstrict-prototypes -pedantic -Wredundant-decls"
     ;;
   *)
     echo "$as_me:$LINENO: result: no" >&5
@@ -7647,11 +7394,7 @@ if test "${enable_static+set}" = set; then
   yes)
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-
- if test -n "$GCC"; then
     CFLAGS="$CFLAGS --static"
- fi
-
     ;;
   *)
     echo "$as_me:$LINENO: result: no" >&5
@@ -7728,7 +7471,8 @@ echo $ECHO_N "checking for CTN DICOM installation... $ECHO_C" >&6
       fi
       ctndir="$testctndir"
       ctn="true"
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_CTN_DICOM 1
 _ACEOF
 
@@ -9080,7 +8824,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtToolkitThreadInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtToolkitThreadInitialize" >&6
 if test $ac_cv_lib_Xt_XtToolkitThreadInitialize = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define X_THREAD_SUPPORT 1
 _ACEOF
 
@@ -9146,7 +8891,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XdbeQueryExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XdbeQueryExtension" >&6
 if test $ac_cv_lib_Xext_XdbeQueryExtension = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_DBE_SUPPORT 1
 _ACEOF
 
@@ -9208,7 +8954,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XmbufQueryExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XmbufQueryExtension" >&6
 if test $ac_cv_lib_Xext_XmbufQueryExtension = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_MBX_SUPPORT 1
 _ACEOF
 
@@ -9352,7 +9099,8 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib"
 echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 if test "$no_x" != "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_X11 1
 _ACEOF
 
@@ -9368,7 +9116,8 @@ echo "${ECHO_T}yes" >&6
     fi
   fi
   if test "$wxwin" = "true" ; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_SGP 1
 _ACEOF
 
@@ -9480,7 +9229,8 @@ fi;
 
 if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
   ctlibs_tools="$ctlibs_tools -ldmallocxx"
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_DMALLOC 1
 _ACEOF
 
@@ -9568,7 +9318,8 @@ fi;
 
 if test "$efence" = "true" -a "$useefence" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lefence"
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_EFENCE 1
 _ACEOF
 
@@ -9613,6 +9364,7 @@ fi
 CXXFLAGS="$CFLAGS"
 
 ac_config_files="$ac_config_files Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/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 helical/Makefile helical/sample-helical.sh"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure

diff --git a/configure.ac b/configure.ac
index 6bfbe85ea25052596105d96f3c5c026903d8cc06..311ae15339e907e5f3295adb298dd25659d8d15a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +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/ctsim.cpp)
+AC_INIT
+AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_INIT_AUTOMAKE(ctsim,3.5.0)
 AM_CONFIG_HEADER(config.h)
 
@@ -13,18 +14,12 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-CPPFLAGS='$(CPPFLAGS) -DDATADIR="$(datadir)"'
-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.))
-
 dnl Check for C operation
 AC_CANONICAL_HOST 
 AC_C_INLINE
@@ -34,24 +29,24 @@ AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 
+dnl Add define templates
+
 dnl Checks for libraries.
 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(readline, main, [readline=true; AC_DEFINE(HAVE_READLINE)], [readline=false], [-lcurses])
-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])
+AC_CHECK_LIB(readline, main, [readline=true; 
+                 AC_DEFINE([HAVE_READLINE],1,[Readline library])],
+                [readline=false], [-lcurses])  
 wxwin=false
-AC_CHECK_LIB(wx_gtk-2.2, 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(hdf4, main, [hdf4=true], [hdf4=false], -lz)
-AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
+AC_CHECK_LIB(wx_gtk-2.2, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])])
+AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [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])
+  AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG,1,[PNG library])], [png=false])
 fi
 
 dnl Checks for header files.
@@ -81,7 +76,7 @@ fi
 
 if test "${getopt_long}" = "false" ; then
   my_includes="$my_includes -I../getopt"
-  AC_DEFINE(HAVE_GETOPT_LONG)
+  AC_DEFINE(HAVE_GETOPT_LONG,1,[getopt_long library])
   ctlibs_base="$ctlibs_base -lgetopt"
   LDFLAGS="$LDFLAGS -L../getopt"
   AM_CONDITIONAL(INCLUDED_GETOPT_LONG, test 1==1)
@@ -113,23 +108,29 @@ esac],
 [debug=false; AC_MSG_RESULT(no)])
 AM_CONDITIONAL(DEBUG, test "$debug" = "true")
 
+if test "$datadir" != "" ; then
+  CPPFLAGS="$CPPFLAGS -DDATADIR=\"\\\"$datadir\\\"\""
+fi
+dnl CFLAGS="$CFLAGS -I/usr/local/include"
+dnl LDFLAGS="$LDFLAGS -L/usr/local/lib"
+
 if test "$debug" = "true" ; then
-  CFLAGS="-g -DDEBUG"
-  AC_DEFINE(DEBUG)
+  CFLAGS="$CFLAGS -g -DDEBUG"
+  AC_DEFINE(DEBUG,1,[turn on debugging])
 else
-  CFLAGS="-O3 -DNDEBUG -fomit-frame-pointer"
-  AC_DEFINE(NDEBUG)
+  CFLAGS="$CFLAGS -O3 -DNDEBUG -fomit-frame-pointer"
+  AC_DEFINE(NDEBUG,1,[no debugging])
 fi
 
 if test "${pthread}" = "true" ; then
   CFLAGS="$FLAGS -pthread -D_REENTRANT"
-  AC_DEFINE(HAVE_WXTHREADS)
+  AC_DEFINE(HAVE_WXTHREADS,1,[have wxthreads library])
 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_DEFINE(HAVE_SSTREAM,1,[sstream header])
   AC_MSG_RESULT(yes)
 fi
 AC_MSG_RESULT(no)
@@ -222,7 +223,7 @@ if test "$withval" != "no" ; then
       fi
       ctndir="$testctndir"
       ctn="true"
-      AC_DEFINE(HAVE_CTN_DICOM)
+      AC_DEFINE(HAVE_CTN_DICOM,1,[ctn dicom library])
       break
     fi
   done
@@ -308,7 +309,7 @@ dnl Check whether libXt has thread support.  Some platforms may have
 dnl pthread support in libc, but no thread support in libXt/libX11.
 our_saved_LDFLAGS="$LDFLAGS"
 LDFLAGS="$X_LIBS $LDFLAGS"
-AC_CHECK_LIB(Xt, XtToolkitThreadInitialize, AC_DEFINE(X_THREAD_SUPPORT), , $X_PRE_LIBS $X_BASIC_LIBS $X_EXTRA_LIBS)
+AC_CHECK_LIB(Xt, XtToolkitThreadInitialize, AC_DEFINE(X_THREAD_SUPPORT,1,[x thread supported]), , $X_PRE_LIBS $X_BASIC_LIBS $X_EXTRA_LIBS)
 LDFLAGS="$our_saved_LDFLAGS"
 
 dnl Check in -lXext for double buffering extensions to X11, and check
@@ -316,8 +317,8 @@ dnl whether appropriate header files are present.  (Some systems have one
 dnl but not the other.)
 our_saved_LDFLAGS="$LDFLAGS"
 LDFLAGS="$X_LIBS $LDFLAGS"
-AC_CHECK_LIB(Xext, XdbeQueryExtension, AC_DEFINE(HAVE_DBE_SUPPORT), , -lX11 "$X_EXTRA_LIBS")
-AC_CHECK_LIB(Xext, XmbufQueryExtension, AC_DEFINE(HAVE_MBX_SUPPORT), , -lX11 "$X_EXTRA_LIBS")
+AC_CHECK_LIB(Xext, XdbeQueryExtension, AC_DEFINE(HAVE_DBE_SUPPORT,1,[x dbe support]), , -lX11 "$X_EXTRA_LIBS")
+AC_CHECK_LIB(Xext, XmbufQueryExtension, AC_DEFINE(HAVE_MBX_SUPPORT,1,[x mbx support]), , -lX11 "$X_EXTRA_LIBS")
 LDFLAGS="$our_saved_LDFLAGS"
 our_saved_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$X_CFLAGS $CPPFLAGS"
@@ -335,7 +336,7 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib"
 
 AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
-  AC_DEFINE(HAVE_X11)
+  AC_DEFINE(HAVE_X11,1,[X11 system])
   LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib"
   ctlib_graphics="$ctlibs_base -lctgraphics"
   AC_MSG_RESULT(yes)
@@ -347,7 +348,7 @@ if test "$no_x" != "yes" ; then
     fi
   fi
   if test "$wxwin" = "true" ; then
-    AC_DEFINE(HAVE_SGP)
+    AC_DEFINE(HAVE_SGP,1,[use sgp library])
     AM_CONDITIONAL(HAVE_SGP, test 1==1)
   fi
 else
@@ -386,7 +387,7 @@ esac],
 
 if test "$dmallocxx" = "true" -a "$usedmalloc" = "true" ; then
   ctlibs_tools="$ctlibs_tools -ldmallocxx"
-  AC_DEFINE(HAVE_DMALLOC)
+  AC_DEFINE(HAVE_DMALLOC,1,[dmalloc library])
   AC_MSG_RESULT(Using dmalloc)
 fi
 
@@ -409,7 +410,7 @@ esac],
 
 if test "$efence" = "true" -a "$useefence" = "true" ; then
   ctlibs_tools="$ctlibs_tools -lefence"
-  AC_DEFINE(HAVE_EFENCE)
+  AC_DEFINE(HAVE_EFENCE,1,[efence library])
   AC_MSG_RESULT(Using efence)
 fi
 
@@ -442,4 +443,5 @@ fi
 
 CXXFLAGS="$CFLAGS"
 
-AC_OUTPUT(Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/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 helical/Makefile helical/sample-helical.sh)
+AC_CONFIG_FILES([Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/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 helical/Makefile helical/sample-helical.sh])
+AC_OUTPUT

diff --git a/do-autoconf b/do-autoconf
index 7d7825fcd0767d38b820c18d7d4b3b36c44b95bf..90524b7431c8ab91a4c7b78b5ccdde3c1b51fa68 100755 (executable)
--- a/do-autoconf
+++ b/do-autoconf
@@ -2,7 +2,7 @@ aclocal
 autoheader
 autoconf
 automake
-./configure --prefix=/usr --with-cgibin-dir=/usr/lib/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/var/www/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/var/www/ctsim --without-lam-dir  $*
+./configure --prefix=/usr --with-cgibin-dir=/usr/lib/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/var/www/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/var/www/ctsim --without-lam-dir --datadir=/usr/share/ctsim $*
 
 
 

diff --git a/softsubmit.ssu b/softsubmit.ssu
deleted file mode 100644 (file)
index 1dbc335..0000000
Binary files a/softsubmit.ssu and /dev/null differ

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 40a1ff452aef7ec76aa2971b81e61ddab64e8894..08dc513b7661690632407920f87e895040b7a176 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 kevin Exp $
+**  $Id: ctsim.cpp,v 1.109 2002/05/05 09:51:23 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.108 2002/05/05 08:09:34 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.109 2002/05/05 09:51:23 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -201,8 +201,10 @@ CTSimApp::OnInit()
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
 #else
-  if (! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") &&
-    ! m_pFrame->getHtmlHelpController().Initialize("/usr/local/share/ctsim/ctsim.htb"))
+  wxString docDir (DATADIR);
+  wxString docFile = docDir + "ctsim.htb";
+  if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
+    ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim.htb"))
     *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))