r23: *** empty log message ***

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index 6f1310999a7dcf7c7662a09ebfe092483d210e88..e40568a76466a356f438ccf76a5161d7ce770baa 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
@@ -213,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
@@ -285,6 +267,31 @@ 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)
+  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)