Changeset dfed1c for configure.ac


Ignore:
Timestamp:
Nov 22, 2011, 9:22:10 PM (14 years ago)
Author:
Julian Iseringhausen <isering@…>
Children:
facba0
Parents:
66f24d
Message:

Major vmg update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1136 5161e1c8-67bf-11de-9fd5-51895aff932f

File:
1 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    r66f24d rdfed1c  
     1
    12#                                               -*- Autoconf -*-
    23# Process this file with autoconf to produce a configure script.
    … …  
    89AC_MSG_NOTICE([*      Configuring solver VMG                                  *])
    910AC_MSG_NOTICE([****************************************************************])
    10 
    1111
    1212AC_CONFIG_SRCDIR([src/mg.cpp])
    … …  
    2424            CXXFLAGS=${CXXFLAGS-"-g -O0 -Wall"}
    2525            AC_DEFINE([DEBUG], [1], [Debugging output])
    26             AC_DEFINE([DEBUGCMAT], [1], [Check matrices for nan])
    2726])
     27
     28AC_ARG_ENABLE([debug-check-matrices], AS_HELP_STRING([--enable-debug-check-matrices], [Enable matrix validity checks]))
     29
     30AS_IF([test "$enable_debug_check_matrices" = "yes"], [
     31            AC_DEFINE([DEBUG_MATRIX_CHECKS], [1], [Matrix validity checks])
     32])
     33
     34AC_ARG_ENABLE([debug-output], AS_HELP_STRING([--enable-debug-output], [Enable debugging output]))
     35
     36AS_IF([test "$enable_debug_output" = "yes"], [
     37            AC_DEFINE([DEBUG_OUTPUT], [1], [Debugging output])
     38])
     39
     40AC_ARG_ENABLE([mpe], AS_HELP_STRING([--enable-mpe], [Enable MPE parallel profiling]))
     41
     42AC_ARG_ENABLE([debug-measure-time], AS_HELP_STRING([--enable-debug-measure-time], [Enable runtime measurement]))
     43
     44AS_IF([test "$enable_debug_measure_time" = "yes"], [
     45            AC_DEFINE([DEBUG_MEASURE_TIME], [1], [Runtime measurement])
     46])
     47
     48AC_ARG_ENABLE([debug-barrier], AS_HELP_STRING([--enable-debug-barrier], [Enable MPI_Barrier debugging]))
     49
     50AS_IF([test "$enable_debug_barrier" = "yes"], [
     51            AC_DEFINE([DEBUG_BARRIER], [1], [MPI_Barrier debugging])
     52])
     53
     54AC_ARG_ENABLE([release], AS_HELP_STRING([--enable-release], [Compile with release settings]))
     55
     56AS_IF([test "$enable_release" = "yes"], [
     57            AC_DEFINE([RELEASE], [1], [Release]),
     58            AC_DEFINE([NDEBUG], [1], [Skip asserts])
     59])
     60
     61AC_ARG_VAR(BSPLINE_DEG, [Degree of interpolating B-Splines. Must be [3-6].])
     62
     63if test -z "$BSPLINE_DEG"
     64then
     65        BSPLINE_DEG=3
     66fi
     67
     68AC_DEFINE_UNQUOTED([BSPLINE_DEGREE], ${BSPLINE_DEG}, [Interpolating B-Spline degree])
    2869
    2970# Checks for programs.
    … …  
    3475
    3576# Do not even look for a non-MPI C++ compiler if MPICXX is set.
    36 AX_PROG_CXX_MPI(,[AC_DEFINE([HAVE_MPI], [1],
    37                             [Define if building the MPI parallel version])
    38                   AC_DEFINE([MPICH_SKIP_CXX], [1], [Skip C++ bindings])
    39                   AC_DEFINE([OMPI_SKIP_MPICXX], [1], [Skip C++ bindings])],
    40                  [AC_DEFINE([sequent], [1],
    41                             [Define if building the serial version])])
     77if test -n "$MPICXX" && test -z "$CXX"; then
     78  CXX=$MPICXX
     79fi
     80ACX_MPI([AC_DEFINE([HAVE_MPI], [1],
     81                   [Define if building the MPI parallel version])
     82         CXX=$MPICXX
     83         LIBS="$MPILIBS $LIBS"
     84         AC_DEFINE([MPICH_SKIP_CXX], [1], [Skip C++ bindings])
     85         AC_DEFINE([OMPI_SKIP_MPICXX], [1], [Skip C++ bindings])]
     86         if test "$enable_mpe" = "yes"; then
     87            AC_DEFINE([HAVE_MPE], [1], [Use MPE parallel profiler])
     88         fi,
     89        [AC_DEFINE([sequent], [1],
     90                   [Define if building the serial version])])
    4291
    4392# Get the Fortran MPI compiler, for Lapack.
    … …  
    54103
    55104AM_OPTIONS_VTK
    56 AM_PATH_VTK([5.4.2], 
     105AM_PATH_VTK([5.4.2],
    57106        [AC_DEFINE([HAVE_VTK], [1], [VTK present on system])])
    58107
    … …  
    60109AC_SUBST([VTK_LDFLAGS])
    61110
    62 AX_BOOST_BASE
     111AX_BOOST_BASE([1.34])
    63112AX_BOOST_SYSTEM
    64113AX_BOOST_FILESYSTEM
    … …  
    74123# Checks for libraries.
    75124AC_CHECK_LIB([m], [sqrt])
    76 
    77125AX_LAPACK
    78126AM_CONDITIONAL([HAVE_LAPACK], [test "x$ax_lapack_ok" = xyes])
    79 
    80 AC_CHECK_LIB([gsl], [gsl_qrng_init])
    81127
    82128AC_CACHE_CHECK([for cppunit], [vmg_cv_cppunit],
    … …  
    99145# Checks for types.
    100146
    101 # Set up FCS library arguments if inside the FCS tree.
    102 m4_ifdef([AX_FCS_CONFIG_SOLVER_ARGS],
    103   [AX_FCS_CONFIG_SOLVER_ARGS])
    104 
    105 # Set up FCS library if inside the FCS tree.
    106 m4_ifdef([AX_FCS_CONFIG_SOLVER],
    107   [AX_FCS_CONFIG_SOLVER
     147# Set up FCS types if inside the FCS tree.
     148m4_ifdef([AX_FCS_TYPES],
     149  [AX_FCS_TYPES
    108150   AC_DEFINE([vmg_float], [fcs_float],
    109151     [Define to the primary interface and computation floating type.])
    … …  
    139181                test/Makefile
    140182                test/interfaces/Makefile
    141                 test/unit_test/Makefile])
     183                test/unit_test/Makefile
     184                vmg_particles/Makefile])
    142185AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.