diff --git a/AMDiS/Makefile.in b/AMDiS/Makefile.in index 6ce691a54c1077750d645d551287594b0e7964b1..2b28bece37ba860c9f2dc81da9e4252432de2a7f 100644 --- a/AMDiS/Makefile.in +++ b/AMDiS/Makefile.in @@ -103,6 +103,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_BOOST_FALSE = @ENABLE_BOOST_FALSE@ +ENABLE_BOOST_TRUE = @ENABLE_BOOST_TRUE@ ENABLE_DUNE_FALSE = @ENABLE_DUNE_FALSE@ ENABLE_DUNE_TRUE = @ENABLE_DUNE_TRUE@ ENABLE_MKL_FALSE = @ENABLE_MKL_FALSE@ diff --git a/AMDiS/bin/Makefile.am b/AMDiS/bin/Makefile.am index acdfdb44ffcb7461bbcb764e6a4ae2c3017e85b6..f68e1e49d351a8829c3b8da1c0080ab6031d21de 100644 --- a/AMDiS/bin/Makefile.am +++ b/AMDiS/bin/Makefile.am @@ -42,6 +42,10 @@ if ENABLE_DUNE AMDIS_INCLUDES += -I$(DUNE_DIR) endif +if ENABLE_BOOST + libamdis_la_CXXFLAGS += -DHAVE_BOOST=1 +endif + INCLUDES = $(AMDIS_INCLUDES) $(PARALLEL_INCLUDES) if AMDIS_DEBUG diff --git a/AMDiS/bin/Makefile.in b/AMDiS/bin/Makefile.in index a7441df779f78a4cc12fac1f09c4d9201fcbcffe..4d8fb49127197fffa8c93a3fb4b91c92b7b637a9 100644 --- a/AMDiS/bin/Makefile.in +++ b/AMDiS/bin/Makefile.in @@ -44,8 +44,9 @@ host_triplet = @host@ @ENABLE_MKL_TRUE@am__append_3 = -DHAVE_MKL=1 -I${MKL_INC} @ENABLE_DUNE_TRUE@am__append_4 = -DHAVE_DUNE=1 @ENABLE_DUNE_TRUE@am__append_5 = -I$(DUNE_DIR) -@AMDIS_DEBUG_TRUE@am__append_6 = -g -O0 -Wall -DDEBUG=1 $(OPENMP_FLAG) -ftemplate-depth-30 $(INCLUDES) #-pedantic -@AMDIS_DEBUG_FALSE@am__append_7 = -O2 -Wall -DDEBUG=0 $(OPENMP_FLAG) -ftemplate-depth-30 $(INCLUDES) #-pedantic +@ENABLE_BOOST_TRUE@am__append_6 = -DHAVE_BOOST=1 +@AMDIS_DEBUG_TRUE@am__append_7 = -g -O0 -Wall -DDEBUG=1 $(OPENMP_FLAG) -ftemplate-depth-30 $(INCLUDES) #-pedantic +@AMDIS_DEBUG_FALSE@am__append_8 = -O2 -Wall -DDEBUG=0 $(OPENMP_FLAG) -ftemplate-depth-30 $(INCLUDES) #-pedantic subdir = bin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -388,6 +389,8 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_BOOST_FALSE = @ENABLE_BOOST_FALSE@ +ENABLE_BOOST_TRUE = @ENABLE_BOOST_TRUE@ ENABLE_DUNE_FALSE = @ENABLE_DUNE_FALSE@ ENABLE_DUNE_TRUE = @ENABLE_DUNE_TRUE@ ENABLE_MKL_FALSE = @ENABLE_MKL_FALSE@ @@ -492,7 +495,7 @@ AMDIS_INCLUDES = -I$(SOURCE_DIR) $(am__append_2) $(am__append_5) @USE_PARALLEL_AMDIS_FALSE@PARALLEL_INCLUDES = @USE_PARALLEL_AMDIS_TRUE@PARALLEL_INCLUDES = -I$(MPI_DIR)/include -I$(PARMETIS_DIR) libamdis_la_CXXFLAGS = $(am__append_1) $(am__append_3) $(am__append_4) \ - $(am__append_6) $(am__append_7) + $(am__append_6) $(am__append_7) $(am__append_8) INCLUDES = $(AMDIS_INCLUDES) $(PARALLEL_INCLUDES) libamdis_la_SOURCES = \ $(PARALLEL_AMDIS_SOURCES) \ diff --git a/AMDiS/configure b/AMDiS/configure index db73e119c8d65331e80466e76cf6d00aa417ecb0..4ad0e601c9f5d9f7c5324d4bfac7e7fe330eb88c 100755 --- a/AMDiS/configure +++ b/AMDiS/configure @@ -462,7 +462,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT AMDIS_DEBUG_TRUE AMDIS_DEBUG_FALSE CXX CC AMDIS_INTEL_TRUE AMDIS_INTEL_FALSE AMDIS_OPENMP_TRUE AMDIS_OPENMP_FALSE OPENMP_FLAG MPI_DIR USE_PARALLEL_AMDIS_TRUE USE_PARALLEL_AMDIS_FALSE ENABLE_UMFPACK_TRUE ENABLE_UMFPACK_FALSE ENABLE_MKL_TRUE ENABLE_MKL_FALSE DUNE_DIR ENABLE_DUNE_TRUE ENABLE_DUNE_FALSE CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT AMDIS_DEBUG_TRUE AMDIS_DEBUG_FALSE CXX CC AMDIS_INTEL_TRUE AMDIS_INTEL_FALSE AMDIS_OPENMP_TRUE AMDIS_OPENMP_FALSE OPENMP_FLAG MPI_DIR USE_PARALLEL_AMDIS_TRUE USE_PARALLEL_AMDIS_FALSE ENABLE_UMFPACK_TRUE ENABLE_UMFPACK_FALSE ENABLE_MKL_TRUE ENABLE_MKL_FALSE DUNE_DIR ENABLE_DUNE_TRUE ENABLE_DUNE_FALSE ENABLE_BOOST_TRUE ENABLE_BOOST_FALSE CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1030,6 +1030,7 @@ Optional Features: --enable-parmetis Compile with the ParMetis library --enable-umfpack Compile with the UMFPACK direct solver library --enable-mkl Compile with the Intel MKL library + --enable-boost Compile with the Boost library --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] @@ -2169,6 +2170,31 @@ else fi +# Check whether --enable-boost or --disable-boost was given. +if test "${enable_boost+set}" = set; then + enableval="$enable_boost" + case "${enableval}" in + yes) boost=true ;; + no) boost=false ;; + *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-boost" >&5 +echo "$as_me: error: bad value ${enableval} for --enable-boost" >&2;} + { (exit 1); exit 1; }; } ;; + esac +else + boost=false +fi; + + +if test $boost = true; then + ENABLE_BOOST_TRUE= + ENABLE_BOOST_FALSE='#' +else + ENABLE_BOOST_TRUE='#' + ENABLE_BOOST_FALSE= +fi + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4359,7 +4385,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4362 "configure"' > conftest.$ac_ext + echo '#line 4388 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5494,7 +5520,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5497:" \ +echo "$as_me:5523:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6557,11 +6583,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6560: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6586: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6564: \$? = $ac_status" >&5 + echo "$as_me:6590: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6825,11 +6851,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6828: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6854: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6832: \$? = $ac_status" >&5 + echo "$as_me:6858: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6929,11 +6955,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6932: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6958: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6936: \$? = $ac_status" >&5 + echo "$as_me:6962: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8398,7 +8424,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8401 "configure"' > conftest.$ac_ext + echo '#line 8427 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9295,7 +9321,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9298 "configure" +#line 9324 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9395,7 +9421,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9398 "configure" +#line 9424 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11738,11 +11764,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11741: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11767: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11745: \$? = $ac_status" >&5 + echo "$as_me:11771: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11842,11 +11868,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11845: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11871: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11849: \$? = $ac_status" >&5 + echo "$as_me:11875: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12378,7 +12404,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12381 "configure"' > conftest.$ac_ext + echo '#line 12407 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13436,11 +13462,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13439: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13465: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13443: \$? = $ac_status" >&5 + echo "$as_me:13469: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13540,11 +13566,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13543: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13569: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13547: \$? = $ac_status" >&5 + echo "$as_me:13573: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14989,7 +15015,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14992 "configure"' > conftest.$ac_ext + echo '#line 15018 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15767,11 +15793,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15770: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15796: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15774: \$? = $ac_status" >&5 + echo "$as_me:15800: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16035,11 +16061,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16038: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16064: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16042: \$? = $ac_status" >&5 + echo "$as_me:16068: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16139,11 +16165,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16142: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16168: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16146: \$? = $ac_status" >&5 + echo "$as_me:16172: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17608,7 +17634,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17611 "configure"' > conftest.$ac_ext + echo '#line 17637 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -19013,6 +19039,13 @@ echo "$as_me: error: conditional \"ENABLE_DUNE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_BOOST_TRUE}" && test -z "${ENABLE_BOOST_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_BOOST\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_BOOST\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -19605,6 +19638,8 @@ s,@ENABLE_MKL_FALSE@,$ENABLE_MKL_FALSE,;t t s,@DUNE_DIR@,$DUNE_DIR,;t t s,@ENABLE_DUNE_TRUE@,$ENABLE_DUNE_TRUE,;t t s,@ENABLE_DUNE_FALSE@,$ENABLE_DUNE_FALSE,;t t +s,@ENABLE_BOOST_TRUE@,$ENABLE_BOOST_TRUE,;t t +s,@ENABLE_BOOST_FALSE@,$ENABLE_BOOST_FALSE,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t diff --git a/AMDiS/configure.ac b/AMDiS/configure.ac index cff86ad2e4dbf51068ce47cf9ea95463b03812d4..a56b93adab81ab9619145c7401212976386f692d 100644 --- a/AMDiS/configure.ac +++ b/AMDiS/configure.ac @@ -85,6 +85,16 @@ AC_ARG_WITH(dune, [ --with-dune=DUNE_DIR], dunedir=$withval, dunedir=no) AC_SUBST(DUNE_DIR, $dunedir) AM_CONDITIONAL(ENABLE_DUNE, test $dunedir != no) +AC_ARG_ENABLE(boost, + [ --enable-boost Compile with the Boost library], + [case "${enableval}" in + yes) boost=true ;; + no) boost=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-boost) ;; + esac],[boost=false]) +AM_CONDITIONAL(ENABLE_BOOST, test $boost = true) + + AC_PROG_CC AC_PROG_CXX AC_PROG_LIBTOOL