projects / ctsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f38c5bc)
r21: *** empty log message ***
authorKevin M. Rosenberg <kevin@rosenberg.net>
Sun, 30 Apr 2000 18:22:41 +0000 (18:22 +0000)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Sun, 30 Apr 2000 18:22:41 +0000 (18:22 +0000)
Makefile.am patch | blob | history
configure.in patch | blob | history
html/ctsim.html patch | blob | history

diff --git a/Makefile.am b/Makefile.am
index 8619c5bde49ab376b2fe5ac35b111b8a336c679c..b1b74c9008463879b48b87c6fbecf04067201912 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,16 @@
 if INCLUDED_GETOPT_LONG
-EXTRA_DIRS=getopt
+  EXTRA_DIRS1 = getopt
 else
-EXTRA_DIRS=
+  EXTRA_DIRS1 =
 endif
 
-SUBDIRS=$(EXTRA_DIRS) libcio libk libkmath libgraph libezplot libir src man html cgi-bin include 
+if HAVE_INTERACTIVE_GRAPHICS
+  EXTRA_DIRS2 = libezplot libgraph
+else
+  EXTRA_DIRS2 =
+endif
+
+SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libcio libk libkmath libir src man html cgi-bin include 
 
 
 
diff --git a/configure.in b/configure.in
index fe236e653057574d574b5f916dc3c5fc7c08258b..e40568a76466a356f438ccf76a5161d7ce770baa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -215,26 +215,6 @@ else
   AC_MSG_RESULT([no])
 fi
 
-dnl Setting projet libraries and includes
-LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L../libkmath -L../libk -L../libcio -L../libir" 
-ctlibs_base="$ctlibs_base -lezplot -lgraph -lkmath -lk -lcio"
-if test -n "$pngdir" ; then
-  ctlibs_base="$ctlibs_base -lpng"
-fi
-if test "$zlib" = "true" ; then
-  ctlibs_base="$ctlibs_base -lz"
-fi
-ctlibs="-lir $ctlibs_base"
-
-AC_SUBST(ctlibs)
-
-if test -n "$lamdir" ; then
-  ctlamlibs="-lir_lam $ctlibs_base"
-  lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam"
-  AC_SUBST(lamprograms)
-  AC_SUBST(ctlamlibs)
-fi
-
 AM_CONDITIONAL(USE_LAM, test -n "$lamdir")
 
 dnl Prepare to support X.  If the user gave the command-line option
@@ -290,6 +270,28 @@ AC_SUBST(my_includes)
 if test "x$no_x" != "xyes" ; then
   AC_DEFINE(HAVE_INTERACTIVE_GRAPHICS)
   AM_CONDITIONAL(HAVE_INTERACTIVE_GRAPHICS, test 1==1)
+  LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph"
+  ctlibs_base="$ctlibs_base -lezplot -lgraph"
+fi
+
+dnl Setting projet libraries and includes
+LDFLAGS="$LDFLAGS -L../libkmath -L../libk -L../libcio -L../libir" 
+ctlibs_base="$ctlibs_base -lkmath -lk -lcio"
+if test -n "$pngdir" ; then
+  ctlibs_base="$ctlibs_base -lpng"
+fi
+if test "$zlib" = "true" ; then
+  ctlibs_base="$ctlibs_base -lz"
+fi
+ctlibs="-lir $ctlibs_base"
+
+AC_SUBST(ctlibs)
+
+if test -n "$lamdir" ; then
+  ctlamlibs="-lir_lam $ctlibs_base"
+  lamprograms="ctrec-lam phm2sdf-lam phm2rs-lam"
+  AC_SUBST(lamprograms)
+  AC_SUBST(ctlamlibs)
 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)
diff --git a/html/ctsim.html b/html/ctsim.html
index e0136148b1dc41b25bed1ede55a9bb0379162996..0f0534546d892a8b19f8caf8a6e11e7b5a9d988e 100644 (file)
--- a/html/ctsim.html
+++ b/html/ctsim.html
@@ -4,7 +4,7 @@
 </HEAD>
 <BODY BGCOLOR="#FFFFFF">
 <H1>Perform CT Simulation</H1>
-<FORM action="/cgi-bin/ctsim.cgi" method="POST">
+<FORM action="/ctsim.cgi" method="POST">
 <table border=1 cellpadding="5" bgcolor="#FFFFFF">
 <tr><td valign="top">
 <h3>Select Image and Size</h3>
Computed Tomography simulator and reconstructor