diff --git a/configure.ac b/configure.ac index cef0cc323a5a784fccbbb4358f33e46e31b138e1..88b54622bc28cb9271020409a1a402ab3c265913 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,10 @@ AC_INIT([albert], [1.2], [dani@mathematik.uni-freiburg.de]) AC_CONFIG_SRCDIR([ALBERT/src/Common/albert.h]) AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERT_UTIL/Makefile + GRAPE/Makefile GRAPE/mesh/Makefile + GRAPE/mesh/2d/Makefile + GRAPE/mesh/3d/Makefile + GRAPE/mesh/Common/Makefile SOLVER/Makefile SOLVER/src/Makefile PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile DEMO/src/Makefile @@ -126,7 +130,8 @@ gltools_include= LIBGLTOOLS_PRESENT= AC_MSG_CHECKING([for libgltools.a]) AC_ARG_WITH(gltools, -[ --with-gltools=PATH specify the absolute path of the gltools library], +AC_HELP_STRING([--with-gltools=PATH], + [specify the absolute path of the gltools library]), [if test -f $withval/gltools-2-4/libgltools.a; then AC_MSG_RESULT([Found libgltools.a in specified directory $withval/gltools-2-4.]) gltools_include="-I$withval/gltools-2-4" @@ -149,16 +154,37 @@ else AC_MSG_RESULT([*** No libgltools.a found in ./gltools-2-4]) fi]) -ELINDEX= +dnl +dnl some defines to enable building of albert_movi +dnl +ALBERT_CHECK_PACKAGE(GRAPE, gr, , ${X_LIBS} -lX11, grape.h,, optional) +AM_CONDITIONAL(GRAPE, test -n "${GRAPE_LIB}") +ALBERT_LIB_PATH=$prefix/lib +ALBERT_INCLUDE_PATH=$prefix/include +ALBERT_LIBS_22='$(top_builddir)/ALBERT/src/ALBERT22_0/libALBERT22_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERT_UTIL/libalbert_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la' +ALBERT_LIBS_33='$(top_builddir)/ALBERT/src/ALBERT33_0/libALBERT33_0.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERT_UTIL/libalbert_util.la' +ALBERT_DEBUG= +AC_SUBST(ALBERT_DEBUG) +AC_SUBST(ALBERT_LIB_PATH) +AC_SUBST(ALBERT_INCLUDE_PATH) +AC_SUBST(ALBERT_LIBS_22) +AC_SUBST(ALBERT_LIBS_33) +dnl +dnl end of albert_movi +dnl + +EL_INDEX=0 AC_ARG_ENABLE(el_index, -[ --enable-el_index also build a version of ALBERT libraries using EL_INDEX=1 (default is off)], -[ELINDEX=1]) +AC_HELP_STRING([--enable-el_index], + [also build a version of ALBERT libraries using EL_INDEX=1 (default is off)]), +[EL_INDEX=1]) +AC_SUBST(EL_INDEX) AM_CONDITIONAL(PLOT_FOR_SUN, test x$plot_for_sun = xtrue) AM_CONDITIONAL(PLOT_FOR_IBM, test x$plot_for_ibm = xtrue) AM_CONDITIONAL(PLOT_FOR_TIT, test x$plot_for_tit = xtrue) AM_CONDITIONAL(USE_GLTOOLS, test x$LIBGLTOOLS_PRESENT = x1) -AM_CONDITIONAL(USE_EL_INDEX, test x$ELINDEX = x1) +AM_CONDITIONAL(USE_EL_INDEX, test x$EL_INDEX = x1) AC_SUBST(gltools_include) AC_SUBST(make_own_blas_lib)