From 59558a60e00c26ac5a85252f414f962be4d36811 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 19 Jun 2006 23:21:43 +0000 Subject: [PATCH] Added the GRAPHVIZDIR variable to the configure script. This is used to locate the dot executable, when using doxygen. --- configure.in | 8 ++++++++ preconfig | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index cf987c179..d883e7961 100755 --- a/configure.in +++ b/configure.in @@ -253,6 +253,11 @@ AC_DEFINE_UNQUOTED(CANTERA_DATA,"$ct_datadir") if test -z "$MAKE"; then MAKE='make'; fi AC_SUBST(MAKE) +if test -z "$GRAPHVIZDIR" ; then +GRAPHVIZDIR=" " +fi +AC_SUBST(GRAPHVIZDIR) + #----------- ARCHIVE -------------------- if test "x${OS_IS_DARWIN}" = "x1"; then @@ -1179,6 +1184,8 @@ AC_OUTPUT(Makefile \ examples/Makefile \ examples/cxx/Makefile \ tools/Makefile \ + tools/doc/Cantera.cfg \ + tools/doc/Makefile \ tools/src/Makefile \ tools/src/sample.mak \ tools/src/finish_install.py \ @@ -1199,6 +1206,7 @@ AC_OUTPUT(Makefile \ test_problems/python/Makefile \ test_problems/cathermo/Makefile \ test_problems/cathermo/issp/Makefile \ + test_problems/cathermo/ims/Makefile \ bin/install_tsc \ ) # ) diff --git a/preconfig b/preconfig index 403e7cf9c..18cabeb2c 100755 --- a/preconfig +++ b/preconfig @@ -363,6 +363,10 @@ RANLIB=${RANLIB:="ranlib"} # doesn't work, try GNU make. MAKE=${MAKE:=make} +# The directory location of the graphviz program, dot. +# dot is used for creating of the documentation. +# if "dot" is in your path, you can leave this unspecified. +GRAPHVIZDIR=${GRAPHVIZDIR:=" "} # file extensions CXX_EXT=${CXX_EXT:=cpp} @@ -396,7 +400,6 @@ export BUILD_F90_INTERFACE export PYTHON_PACKAGE export BUILD_MATLAB_TOOLBOX #export MATLAB_CMD -export CANTERA_ROOT export CT_SHARED_LIB export CXX export CXX_EXT @@ -435,6 +438,7 @@ export PIC export SHARED export SOEXT export MAKE +export GRAPHVIZDIR export RPFONT export FORTRAN_LIB_DIR export CANTERA_INSTALL_DIR