From e09e5d63975c23008052e758aeb082f10127189b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 30 Apr 2000 18:22:41 +0000 Subject: [PATCH] r21: *** empty log message *** --- Makefile.am | 12 +++++++++--- configure.in | 42 ++++++++++++++++++++++-------------------- html/ctsim.html | 2 +- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8619c5b..b1b74c9 100644 --- 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 fe236e6..e40568a 100644 --- 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 e013614..0f05345 100644 --- a/html/ctsim.html +++ b/html/ctsim.html @@ -4,7 +4,7 @@

Perform CT Simulation

Select Image and Size