From ffdfebd7a79cd12a4fcab065a590ffb7f8ebde98 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 2 Oct 2003 21:50:23 +0000 Subject: [PATCH] r7936: preliminary changes to compile on redhat amd64 --- ChangeLog | 4 ++++ Makefile.in | 4 ++-- configure | 2 +- configure.ac | 2 +- tools/Makefile.in | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 344a2ac..f88a16a 100644 --- 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 c6a9269..be18d3c 100644 --- 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 353929b..f907e39 100755 --- 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 c684ec1..6d2a681 100644 --- 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 3c6a568..fd1f0d6 100644 --- 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@ -- 2.34.1