X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=configure.in;h=fe236e653057574d574b5f916dc3c5fc7c08258b;hb=f38c5bc9dff65d0e9a666a846fe82f8d49669d84;hp=e021fb5dc53a6974e7207acf991821b5e5a77215;hpb=b62329164e187293fd348e4e133e5720ffa8c3c8;p=ctsim.git diff --git a/configure.in b/configure.in index e021fb5..fe236e6 100644 --- 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) +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 @@ -184,7 +186,7 @@ AC_ARG_WITH(html-dir, [ --with-html-dir=PATH Set directory of html files], [ htmldir=$withval ; AC_SUBST(htmldir) ] ) if test -n "$cgibindir" -o -n "$cgibinurl" ; then - cgiprograms=ctsim.cgi + cgiprograms="ctsim.cgi ctsim.conf" AC_SUBST(cgiprograms) fi @@ -285,6 +287,9 @@ 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) +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) +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)