r18: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 5a28b65342c42d6fb13295b983d3bf90fe269cdc..1e3a60db0ba765af9b02c35da74984a99a2bb6c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+0.5.2-b1 - 4/29/2000
+    Fixed a few MPI bugs
+    Better documented, coded raysum in-memory on on-disk options
+       
 0.5.1 - 4/28/2000
     Cleaned out library that wasn't being used by CTSim         
     Modified ctsim.cgi to read in configuration file ctsim.conf

diff --git a/config.h.in b/config.h.in
index 7cdca48c337bf89dc192febbd5bc4e8110b5c415..1c7a32c54063697c0d4da33b21bf5478013ffcf0 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -39,6 +39,9 @@
 /* Define if have PNG library */
 #undef HAVE_PNG
 
+/* Define is have interactive graphics */
+#undef HAVE_INTERACTIVE_GRAPHICS
+
 /* Define if you have the strtod function.  */
 #undef HAVE_STRTOD
 

diff --git a/configure.in b/configure.in
index 6f1310999a7dcf7c7662a09ebfe092483d210e88..fe236e653057574d574b5f916dc3c5fc7c08258b 100644 (file)
--- 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/ctrec.c)
-AM_INIT_AUTOMAKE(ctsim,0.5.2-b1)
+AM_INIT_AUTOMAKE(ctsim,0.5.2-b2)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -160,6 +160,8 @@ if test "$withval" != "no" ; then
       CFLAGS="$CFLAGS -I$testlamdir/include"
       lamdir="$testlamdir"
       AC_SUBST(lamdir)
+      mpienable="true"
+      AC_SUBST(mpienable)
       break
     fi
   done
@@ -285,6 +287,9 @@ AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes")
 my_includes="$my_includes -I../include -I.."
 AC_SUBST(my_includes)
 
-AM_CONDITIONAL(HAVE_INTERACTIVE_GRAPHICS, test 1==0)
+if test "x$no_x" != "xyes" ; then
+  AC_DEFINE(HAVE_INTERACTIVE_GRAPHICS)
+  AM_CONDITIONAL(HAVE_INTERACTIVE_GRAPHICS, test 1==1)
+fi
 
 AC_OUTPUT(Makefile libezplot/Makefile src/Makefile libgraph/Makefile libkmath/Makefile Makefile libk/Makefile libir/Makefile libcio/Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/ctsim.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf)