r7936: preliminary changes to compile on redhat amd64

diff --git a/ChangeLog b/ChangeLog
index 344a2ac700fddf9ca717df012ad430d2f4aa0d89..f88a16ab089a933ae598ab7451b7ad3502a1977d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Oct 5, 2003  Version 4.2.7
+
+       * Add support for building on RedHat AMD64 
+
 Sep 30, 2003  Version 4.2.7
 
        * Fix minor issue with floating point difference backprojection, add

diff --git a/Makefile.in b/Makefile.in
index c6a9269f67f52ed01ef95af6817ddd1a8ec991da..be18d3ce013aac57d6ff48c8a3fb0622d95866e5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -162,12 +162,12 @@ wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 @INCLUDED_GETOPT_LONG_FALSE@EXTRA_DIRS1 = 
 @INCLUDED_GETOPT_LONG_TRUE@EXTRA_DIRS1 = getopt
+@HAVE_SGP_FALSE@EXTRA_DIRS2 = 
 
 @HAVE_SGP_TRUE@EXTRA_DIRS2 = libctgraphics
-@HAVE_SGP_FALSE@EXTRA_DIRS2 = 
+@HAVE_WXWINDOWS_FALSE@EXTRA_DIRS3 = 
 
 @HAVE_WXWINDOWS_TRUE@EXTRA_DIRS3 = src
-@HAVE_WXWINDOWS_FALSE@EXTRA_DIRS3 = 
 
 SUBDIRS = man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) tools helical
 

diff --git a/configure b/configure
index 353929bf03a449359a48d2f179a5bf0654b0e816..f907e39a1cc44f0e2b35aa5f2a48f331595a6515 100755 (executable)
--- a/configure
+++ b/configure
@@ -1600,7 +1600,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=ctsim
- VERSION=4.2.7
+ VERSION=4.2.8
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index c684ec16aae13b32d4dfe035a2a15ed338d6964a..6d2a681392c498500b12e04a3671ca3a5b735c63 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl CDPATH=
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
 AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ctsim,4.2.7)
+AM_INIT_AUTOMAKE(ctsim,4.2.8)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3c6a56823b0eb373910f8e3b56494818e98a4ab7..fd1f0d69fe2ea755acbc6f131ec3e9a44980bb36 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -163,9 +163,9 @@ wxlibs = @wxlibs@
 bin_PROGRAMS = @lamprograms@  ctsimtext 
 EXTRA_PROGRAMS = ctsimtext-lam
 INCLUDES = @my_includes@
+@HAVE_SGP_FALSE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 
 @HAVE_SGP_TRUE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a ../libctgraphics/libctgraphics.a
-@HAVE_SGP_FALSE@SOURCE_DEPEND = ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 
 ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp linogram.cpp
 ctsimtext_LDADD = @ctlibs@