Changeset ac6d04 for configure.ac


Ignore:
Timestamp:
Apr 10, 2012, 1:55:49 PM (14 years ago)
Author:
Julian Iseringhausen <isering@…>
Children:
a40eea
Parents:
d24c2f
Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    rd24c2f rac6d04  
    6969AC_MSG_RESULT($enable_mpe)
    7070
    71 AC_MSG_CHECKING(whether to enable debug measurement of run times)
    72 AC_ARG_ENABLE([debug-measure-time],
    73         AS_HELP_STRING([--enable-debug-measure-time], [Enable runtime measurement]),
    74         enable_debug_measure_time=$enableval,
    75         enable_debug_measure_time="no")
    76 AC_MSG_RESULT($enable_debug_measure_time)
    77 AS_IF([test "$enable_debug_measure_time" = "yes"], [
     71AC_MSG_CHECKING(whether to enable runtime measurement)
     72AC_ARG_ENABLE([timer],
     73        AS_HELP_STRING([--enable-timer], [Enable runtime measurement]),
     74        enable_timer=$enableval,
     75        enable_timer="no")
     76AC_MSG_RESULT($enable_timer)
     77AS_IF([test "$enable_timer" = "yes"], [
    7878            AC_DEFINE([DEBUG_MEASURE_TIME], [1], [Runtime measurement])
     79])
     80
     81AC_MSG_CHECKING(whether to enable runtime measurement output)
     82AC_ARG_ENABLE([timer-output],
     83        AS_HELP_STRING([--enable-timer-output], [Enable runtime measurement output]),
     84        enable_timer_output=$enableval,
     85        enable_timer_output="no")
     86AC_MSG_RESULT($enable_timer_output)
     87AS_IF([test "$enable_timer_output" = "yes"], [
     88            AC_DEFINE([DEBUG_MEASURE_TIME_OUTPUT], [1], [Output of runtime measurement])
    7989])
    8090
    … …  
    100110])
    101111
    102 AC_ARG_VAR(BSPLINE_DEG, [Degree of interpolating B-Splines. Must be [3-6].])
     112AC_ARG_VAR(BSPLINE_DEG, [Degree of interpolating B-Splines. Must be [3].])
    103113
    104114if test -z "$BSPLINE_DEG"
    … …  
    125135         CXX=$MPICXX
    126136         LIBS="$MPILIBS $LIBS"
    127          AC_DEFINE([MPICH_SKIP_CXX], [1], [Skip C++ bindings])
    128          AC_DEFINE([OMPI_SKIP_MPICXX], [1], [Skip C++ bindings])]
     137         AC_DEFINE([MPICH_SKIP_MPICXX], [1], [Skip C++ bindings])
     138         AC_DEFINE([OMPI_SKIP_MPICXX], [1], [Skip C++ bindings])
     139         AC_DEFINE([MPI_NO_CPPBIND], [1], [Skip C++ bindings])
     140         AC_DEFINE([_MPICC_H], [1], [Skip C++ bindings])
     141         AC_DEFINE([MPIBULL_SKIP_MPICXX], [1], [Skip C++ bindings])]
    129142         if test "$enable_mpe" = "yes"; then
    130143            AC_DEFINE([HAVE_MPE], [1], [Use MPE parallel profiler])
    … …  
    146159
    147160AM_OPTIONS_VTK
    148 AM_PATH_VTK([5.4.2],
     161AM_PATH_VTK([5.8.0],
    149162        [AC_DEFINE([HAVE_VTK], [1], [VTK present on system])])
    150163
    151164AC_SUBST([VTK_CXXFLAGS])
    152165AC_SUBST([VTK_LDFLAGS])
     166AC_SUBST([VTK_LIBS])
    153167
    154168AX_BOOST_BASE([1.34],[have_boost=yes],[have_boost=no])
    … …  
    156170  AX_BOOST_SYSTEM
    157171  AX_BOOST_FILESYSTEM
     172  AX_BOOST_UNIT_TEST_FRAMEWORK
    158173fi
    159 
    160 AC_SUBST([LIBVMG])
    161 LIBVMG='$(top_builddir)/src/libfcs_vmg.a $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB)'
    162 
    163 AC_SUBST([LIBINTERFACES])
    164 LIBINTERFACES='$(top_builddir)/test/interfaces/libinterfaces.a'
     174AM_CONDITIONAL([COND_HAVE_BOOST_UNIT_TEST], [test x"$ax_cv_boost_unit_test_framework" != xyes])
     175AM_CONDITIONAL([COND_HAVE_BOOST_UNIT_TEST_LIB], [test x"$ax_cv_boost_unit_test_framework" != xyes && test x"$ax_cv_boost_unit_test_framework_lib" != xyes])
    165176
    166177AC_PROG_RANLIB
    … …  
    170181AX_LAPACK
    171182AM_CONDITIONAL([HAVE_LAPACK], [test "x$ax_lapack_ok" = xyes])
    172 
    173 AC_CACHE_CHECK([for cppunit], [vmg_cv_cppunit],
    174   [save_LIBS=$LIBS
    175    LIBS="-lcppunit $LIBS"
    176    AC_LINK_IFELSE([AC_LANG_SOURCE([[
    177   #include <cppunit/TestResult.h>
    178   int main (void)
    179   {
    180     CppUnit::TestResult testresult;
    181     return 0;
    182   }]])],
    183     [vmg_cv_cppunit=yes], [vmg_cv_cppunit=no])
    184    LIBS=$save_LIBS
    185    ])
    186 AM_CONDITIONAL([HAVE_CPPUNIT], [test "$vmg_cv_cppunit" = yes])
    187183
    188184# Checks for header files.
    … …  
    222218
    223219AC_CONFIG_FILES([Makefile
    224                 src/Makefile
    225                 doc/Makefile
    226                 test/Makefile
    227                 test/interfaces/Makefile
    228                 test/unit_test/Makefile
    229                 vmg_particles/Makefile])
     220        src/Makefile
     221        doc/Makefile
     222        test/Makefile
     223        vmg_particles/Makefile])
    230224AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.