From b9bc162a7e4db4b6a8c711cd54d4f059a3b3a782 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth
Date: Sun, 29 Aug 2010 20:55:37 +0000
Subject: [PATCH] Allow setting CXXFLAGSG and CXXFLAGSO at have it be picked up
by ./configure.
git-svn-id: https://svn.dealii.org/trunk@21783 0785d39b-7218-0410-832d-ea1e28bc413d
---
deal.II/aclocal.m4 | 65 ++++++++++++---------
deal.II/configure | 124 +++++++++++++++++-----------------------
deal.II/doc/readme.html | 4 ++
3 files changed, 96 insertions(+), 97 deletions(-)
diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 9c9c8fa310..9bc616adfc 100644
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -351,13 +351,24 @@ dnl
dnl -------------------------------------------------------------
AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
[
+ dnl If CXXFLAGSG or CXXFLAGSO are not set, then initialize them with
+ dnl CXXFLAGS
+ if test "x$CXXFLAGSG" = "x" ; then
+ CXXFLAGSG="$CXXFLAGS" ;
+ fi
+
+ if test "x$CXXFLAGSO" = "x" ; then
+ CXXFLAGSO="$CXXFLAGS" ;
+ fi
+
dnl In no case do we want to induce BOOST to use deprecated header files
- CXXFLAGS="$CXXFLAGS -DBOOST_NO_HASH -DBOOST_NO_SLIST"
+ CXXFLAGSG="$CXXFLAGSG -DBOOST_NO_HASH -DBOOST_NO_SLIST"
+ CXXFLAGSO="$CXXFLAGSO -DBOOST_NO_HASH -DBOOST_NO_SLIST"
dnl First the flags for gcc compilers
if test "$GXX" = yes ; then
- CXXFLAGSO="$CXXFLAGS -O2 -funroll-loops -funroll-all-loops -fstrict-aliasing -Wuninitialized -felide-constructors -ftemplate-depth-128"
- CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -Wsynth -Wsign-compare -Wswitch -ftemplate-depth-128"
+ CXXFLAGSO="$CXXFLAGSO -O2 -funroll-loops -funroll-all-loops -fstrict-aliasing -Wuninitialized -felide-constructors -ftemplate-depth-128"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -Wsynth -Wsign-compare -Wswitch -ftemplate-depth-128"
dnl BOOST uses long long, so don't warn about this
CXXFLAGSG="$CXXFLAGSG -Wno-long-long"
@@ -524,8 +535,8 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
case "$GXX_VERSION" in
ibm_xlc)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -check=bounds -info=all -qrtti=all -qsuppress=1540-2907"
- CXXFLAGSO="$CXXFLAGS -O2 -w -qansialias -qrtti=all -qsuppress=1540-2907"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -check=bounds -info=all -qrtti=all -qsuppress=1540-2907"
+ CXXFLAGSO="$CXXFLAGSO -O2 -w -qansialias -qrtti=all -qsuppress=1540-2907"
CXXFLAGSPIC="-qpic"
LDFLAGSPIC="-qpic"
;;
@@ -539,14 +550,14 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
dnl The indicated enumeration value is out of "int" range.
dnl cc-1485 CC: WARNING File = /usr/include/CC/iomanip, Line = 122
dnl This form for taking the address of a member function is nonstandard.
- CXXFLAGSG="$CXXFLAGS -DDEBUG -D__sgi__ -no_auto_include -ansiW -woff 1429,1066,1485"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -D__sgi__ -no_auto_include -ansiW -woff 1429,1066,1485"
dnl Disable some compiler warnings, that warn about variables
dnl which are used in Assert templates but not in optimized mode
dnl cc-1174 CC: full_matrix.templates.h, Line = 1461
dnl The variable "typical_diagonal_element" was declared but never referenced.
dnl cc-1552 CC: WARNING File = source/data_out_base.cc, Line = 3493
dnl The variable "ierr" is set but never used.
- CXXFLAGSO="$CXXFLAGS -D__sgi__ -O2 -no_auto_include -woff 1174,1552"
+ CXXFLAGSO="$CXXFLAGSO -D__sgi__ -O2 -no_auto_include -woff 1174,1552"
CXXFLAGSPIC="-KPIC"
LDFLAGSPIC="-KPIC"
dnl Avoid output of prelinker (-quiet_prelink)
@@ -570,15 +581,15 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
dnl Exception handling is also standard in later versions, as is rtti
case "$GXX_VERSION" in
intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9)
- CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -DDEBUG -inline_debug_info"
- CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -unroll"
+ CXXFLAGSG="$CXXFLAGSG -Kc++eh -Krtti -DDEBUG -inline_debug_info"
+ CXXFLAGSO="$CXXFLAGSO -Kc++eh -Krtti -O2 -unroll"
CXXFLAGSPIC="-KPIC"
LDFLAGSPIC="-KPIC"
;;
intel_icc*)
- CXXFLAGSG="$CXXFLAGS -DDEBUG"
- CXXFLAGSO="$CXXFLAGS -O2 -unroll"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG"
+ CXXFLAGSO="$CXXFLAGSO -O2 -unroll"
CXXFLAGSPIC="-fPIC"
LDFLAGS="$LDFLAGS -lstdc++ -lpthread"
LDFLAGSPIC="-fPIC"
@@ -722,8 +733,8 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
dnl otherwise not all templates are instantiated (also some from the
dnl standards library are missing).
- CXXFLAGSG="$CXXFLAGS -model ansi -std strict_ansi -w1 -msg_display_number -timplicit_local -DDEBUG"
- CXXFLAGSO="$CXXFLAGS -model ansi -std strict_ansi -w2 -msg_display_number -timplicit_local -fast"
+ CXXFLAGSG="$CXXFLAGSG -model ansi -std strict_ansi -w1 -msg_display_number -timplicit_local -DDEBUG"
+ CXXFLAGSO="$CXXFLAGSO -model ansi -std strict_ansi -w2 -msg_display_number -timplicit_local -fast"
for i in 11 175 236 237 381 487 1136 1156 111 1182 265 450 ; do
CXXFLAGSG="$CXXFLAGSG -msg_disable $i"
@@ -745,8 +756,8 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
sun_workshop | sun_forte)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -w"
- CXXFLAGSO="$CXXFLAGS -w"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -w"
+ CXXFLAGSO="$CXXFLAGSO -w"
CXXFLAGSPIC="-KPIC"
LDFLAGSPIC="-G"
@@ -793,29 +804,29 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
dnl somewhere in BOOST with BOOST_ASSERT. I have no idea
dnl what happens here
dnl #284: "NULL references not allowed"
- CXXFLAGSG="$CXXFLAGS -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
- CXXFLAGSO="$CXXFLAGS -fast -O2 --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
+ CXXFLAGSO="$CXXFLAGSO -fast -O2 --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
CXXFLAGSPIC="-Kpic"
;;
kai_cc)
- CXXFLAGSG="$CXXFLAGS --strict -D__KAI_STRICT --max_pending_instantiations 32 --display_error_number -g +K0 --no_implicit_typename"
- CXXFLAGSO="$CXXFLAGS +K3 -O2 --abstract_float --abstract_pointer -w --display_error_number --max_pending_instantiations 32 --display_error_number"
+ CXXFLAGSG="$CXXFLAGSG --strict -D__KAI_STRICT --max_pending_instantiations 32 --display_error_number -g +K0 --no_implicit_typename"
+ CXXFLAGSO="$CXXFLAGSO +K3 -O2 --abstract_float --abstract_pointer -w --display_error_number --max_pending_instantiations 32 --display_error_number"
CXXFLAGSPIC="-fPIC"
;;
hp_aCC)
dnl ??? disable warning 655 (about all-inlined functions) which
dnl triggers for each and every of our DeclExceptionX calls ???
- CXXFLAGSG="$CXXFLAGS -g1 -AA +p"
- CXXFLAGSO="$CXXFLAGS -z +O2 -AA"
+ CXXFLAGSG="$CXXFLAGSG -g1 -AA +p"
+ CXXFLAGSO="$CXXFLAGSO -z +O2 -AA"
CXXFLAGSPIC="+Z"
# for linking shared libs, -b is also necessary...
;;
borland_bcc)
- CXXFLAGSG="$CXXFLAGS -q -DDEBUG -w -w-use -w-amp -w-prc"
- CXXFLAGSO="$CXXFLAGS -q -O2"
+ CXXFLAGSG="$CXXFLAGSG -q -DDEBUG -w -w-use -w-amp -w-prc"
+ CXXFLAGSO="$CXXFLAGSO -q -O2"
CXXFLAGSPIC=""
LDFLAGSPIC=""
AC_MSG_ERROR(Attention! deal.II is not known to work with Borland C++!
@@ -823,13 +834,13 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl
;;
pathscale_cc)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -g"
- CXXFLAGSO="$CXXFLAGS -O3"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -g"
+ CXXFLAGSO="$CXXFLAGSO -O3"
;;
*)
- CXXFLAGSG="$CXXFLAGS -DDEBUG"
- CXXFLAGSO="$CXXFLAGS -O2"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG"
+ CXXFLAGSO="$CXXFLAGSO -O2"
AC_MSG_RESULT(Unknown C++ compiler - using generic options)
;;
esac
diff --git a/deal.II/configure b/deal.II/configure
index f67fe50999..c9101a877b 100755
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 21727 .
+# From configure.in Revision: 21759 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for deal.II 6.4.pre.
#
@@ -3955,11 +3955,20 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$CXXFLAGS -DBOOST_NO_HASH -DBOOST_NO_SLIST"
+ if test "x$CXXFLAGSG" = "x" ; then
+ CXXFLAGSG="$CXXFLAGS" ;
+ fi
+
+ if test "x$CXXFLAGSO" = "x" ; then
+ CXXFLAGSO="$CXXFLAGS" ;
+ fi
+
+ CXXFLAGSG="$CXXFLAGSG -DBOOST_NO_HASH -DBOOST_NO_SLIST"
+ CXXFLAGSO="$CXXFLAGSO -DBOOST_NO_HASH -DBOOST_NO_SLIST"
if test "$GXX" = yes ; then
- CXXFLAGSO="$CXXFLAGS -O2 -funroll-loops -funroll-all-loops -fstrict-aliasing -Wuninitialized -felide-constructors -ftemplate-depth-128"
- CXXFLAGSG="$CXXFLAGS -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -Wsynth -Wsign-compare -Wswitch -ftemplate-depth-128"
+ CXXFLAGSO="$CXXFLAGSO -O2 -funroll-loops -funroll-all-loops -fstrict-aliasing -Wuninitialized -felide-constructors -ftemplate-depth-128"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Woverloaded-virtual -Wsynth -Wsign-compare -Wswitch -ftemplate-depth-128"
CXXFLAGSG="$CXXFLAGSG -Wno-long-long"
@@ -4407,15 +4416,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
case "$GXX_VERSION" in
ibm_xlc)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -check=bounds -info=all -qrtti=all -qsuppress=1540-2907"
- CXXFLAGSO="$CXXFLAGS -O2 -w -qansialias -qrtti=all -qsuppress=1540-2907"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -check=bounds -info=all -qrtti=all -qsuppress=1540-2907"
+ CXXFLAGSO="$CXXFLAGSO -O2 -w -qansialias -qrtti=all -qsuppress=1540-2907"
CXXFLAGSPIC="-qpic"
LDFLAGSPIC="-qpic"
;;
MIPSpro*)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -D__sgi__ -no_auto_include -ansiW -woff 1429,1066,1485"
- CXXFLAGSO="$CXXFLAGS -D__sgi__ -O2 -no_auto_include -woff 1174,1552"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -D__sgi__ -no_auto_include -ansiW -woff 1429,1066,1485"
+ CXXFLAGSO="$CXXFLAGSO -D__sgi__ -O2 -no_auto_include -woff 1174,1552"
CXXFLAGSPIC="-KPIC"
LDFLAGSPIC="-KPIC"
LDFLAGS="$LDFLAGS -quiet_prelink -woff 131"
@@ -4427,15 +4436,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
intel_icc*)
case "$GXX_VERSION" in
intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9)
- CXXFLAGSG="$CXXFLAGS -Kc++eh -Krtti -DDEBUG -inline_debug_info"
- CXXFLAGSO="$CXXFLAGS -Kc++eh -Krtti -O2 -unroll"
+ CXXFLAGSG="$CXXFLAGSG -Kc++eh -Krtti -DDEBUG -inline_debug_info"
+ CXXFLAGSO="$CXXFLAGSO -Kc++eh -Krtti -O2 -unroll"
CXXFLAGSPIC="-KPIC"
LDFLAGSPIC="-KPIC"
;;
intel_icc*)
- CXXFLAGSG="$CXXFLAGS -DDEBUG"
- CXXFLAGSO="$CXXFLAGS -O2 -unroll"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG"
+ CXXFLAGSO="$CXXFLAGSO -O2 -unroll"
CXXFLAGSPIC="-fPIC"
LDFLAGS="$LDFLAGS -lstdc++ -lpthread"
LDFLAGSPIC="-fPIC"
@@ -4528,8 +4537,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
compaq_cxx)
- CXXFLAGSG="$CXXFLAGS -model ansi -std strict_ansi -w1 -msg_display_number -timplicit_local -DDEBUG"
- CXXFLAGSO="$CXXFLAGS -model ansi -std strict_ansi -w2 -msg_display_number -timplicit_local -fast"
+ CXXFLAGSG="$CXXFLAGSG -model ansi -std strict_ansi -w1 -msg_display_number -timplicit_local -DDEBUG"
+ CXXFLAGSO="$CXXFLAGSO -model ansi -std strict_ansi -w2 -msg_display_number -timplicit_local -fast"
for i in 11 175 236 237 381 487 1136 1156 111 1182 265 450 ; do
CXXFLAGSG="$CXXFLAGSG -msg_disable $i"
@@ -4547,8 +4556,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
sun_workshop | sun_forte)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -w"
- CXXFLAGSO="$CXXFLAGS -w"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -w"
+ CXXFLAGSO="$CXXFLAGSO -w"
CXXFLAGSPIC="-KPIC"
LDFLAGSPIC="-G"
@@ -4586,44 +4595,42 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;;
portland_group)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
- CXXFLAGSO="$CXXFLAGS -fast -O2 --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
+ CXXFLAGSO="$CXXFLAGSO -fast -O2 --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284"
CXXFLAGSPIC="-Kpic"
;;
kai_cc)
- CXXFLAGSG="$CXXFLAGS --strict -D__KAI_STRICT --max_pending_instantiations 32 --display_error_number -g +K0 --no_implicit_typename"
- CXXFLAGSO="$CXXFLAGS +K3 -O2 --abstract_float --abstract_pointer -w --display_error_number --max_pending_instantiations 32 --display_error_number"
+ CXXFLAGSG="$CXXFLAGSG --strict -D__KAI_STRICT --max_pending_instantiations 32 --display_error_number -g +K0 --no_implicit_typename"
+ CXXFLAGSO="$CXXFLAGSO +K3 -O2 --abstract_float --abstract_pointer -w --display_error_number --max_pending_instantiations 32 --display_error_number"
CXXFLAGSPIC="-fPIC"
;;
hp_aCC)
- CXXFLAGSG="$CXXFLAGS -g1 -AA +p"
- CXXFLAGSO="$CXXFLAGS -z +O2 -AA"
+ CXXFLAGSG="$CXXFLAGSG -g1 -AA +p"
+ CXXFLAGSO="$CXXFLAGSO -z +O2 -AA"
CXXFLAGSPIC="+Z"
# for linking shared libs, -b is also necessary...
;;
borland_bcc)
- CXXFLAGSG="$CXXFLAGS -q -DDEBUG -w -w-use -w-amp -w-prc"
- CXXFLAGSO="$CXXFLAGS -q -O2"
+ CXXFLAGSG="$CXXFLAGSG -q -DDEBUG -w -w-use -w-amp -w-prc"
+ CXXFLAGSO="$CXXFLAGSO -q -O2"
CXXFLAGSPIC=""
LDFLAGSPIC=""
- { as_fn_set_status please remove this message
- from aclocal.m4 and call autoconf and configure. If you do not
- understand this
+ { as_fn_set_status please remove this message from aclocal.m4 and call autoconf and configure. If you do not understand this
as_fn_error "Attention! deal.II is not known to work with Borland C++!
If you intend to port it to Borland C++" "$LINENO" 5; }
;;
pathscale_cc)
- CXXFLAGSG="$CXXFLAGS -DDEBUG -g"
- CXXFLAGSO="$CXXFLAGS -O3"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG -g"
+ CXXFLAGSO="$CXXFLAGSO -O3"
;;
*)
- CXXFLAGSG="$CXXFLAGS -DDEBUG"
- CXXFLAGSO="$CXXFLAGS -O2"
+ CXXFLAGSG="$CXXFLAGSG -DDEBUG"
+ CXXFLAGSO="$CXXFLAGSO -O2"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unknown C++ compiler - using generic options" >&5
$as_echo "Unknown C++ compiler - using generic options" >&6; }
;;
@@ -5198,8 +5205,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;;
*)
- as_fn_error "No threading compiler options for this C++ compiler
- specified at present" "$LINENO" 5
+ as_fn_error "No threading compiler options for this C++ compiler specified at present" "$LINENO" 5
exit 1
;;
esac
@@ -9190,8 +9196,7 @@ $as_echo "Unknown FORTRAN compiler has been disabled!" >&6; }
;;
*)
- as_fn_error "No compiler options for F77 compiler
- \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" "$LINENO" 5
+ as_fn_error "No compiler options for F77 compiler \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" "$LINENO" 5
;;
esac
@@ -10135,9 +10140,7 @@ $as_echo "$DEAL_II_TRILINOS_DIR" >&6; }
if test ! -d $DEAL_II_TRILINOS_DIR/include \
-o ! -d $DEAL_II_TRILINOS_DIR/lib ; then
- as_fn_error "The path to Trilinos specified in the TRILINOS_DIR
- environment variable does not
- point to a complete Trilinos installation" "$LINENO" 5
+ as_fn_error "The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5
fi
DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include"
DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib"
@@ -10169,8 +10172,7 @@ $as_echo "explicitly disabled" >&6; }
$as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; }
if test ! -d $DEAL_II_TRILINOS_INCDIR ; then
- as_fn_error "Path to Trilinos specified with --with-trilinos-include does not
- point to a complete Trilinos installation" "$LINENO" 5
+ as_fn_error "Path to Trilinos specified with --with-trilinos-include does not point to a complete Trilinos installation" "$LINENO" 5
fi
fi
@@ -10183,8 +10185,7 @@ else
$as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; }
if test ! -d $DEAL_II_TRILINOS_INCDIR ; then
- as_fn_error "The path to Trilinos includes specified in the TRILINOS_INCDIR
- environment variable does not point to a valid directory" "$LINENO" 5
+ as_fn_error "The path to Trilinos includes specified in the TRILINOS_INCDIR environment variable does not point to a valid directory" "$LINENO" 5
fi
else
if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then
@@ -10219,8 +10220,7 @@ $as_echo "explicitly disabled" >&6; }
$as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; }
if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then
- as_fn_error "Path to Trilinos libraries with --with-trilinos-libs does not
- point to a valid directory" "$LINENO" 5
+ as_fn_error "Path to Trilinos libraries with --with-trilinos-libs does not point to a valid directory" "$LINENO" 5
fi
fi
@@ -10233,9 +10233,7 @@ else
$as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; }
if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then
- as_fn_error "The path to Trilinos specified in the TRILINOS_LIBDIR
- environment variable does not
- point to a complete Trilinos installation" "$LINENO" 5
+ as_fn_error "The path to Trilinos specified in the TRILINOS_LIBDIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5
fi
else
if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then
@@ -10304,19 +10302,16 @@ $as_echo "no" >&6; }
fi
if test "x${DEAL_II_TRILINOS_SHARED}${DEAL_II_TRILINOS_STATIC}" = "x" ; then
- as_fn_error "Unable to determine whether Trilinos uses shared or
- static libraries." "$LINENO" 5
+ as_fn_error "Unable to determine whether Trilinos uses shared or static libraries." "$LINENO" 5
fi
if test "x$enableshared" = "xyes" -a "x$DEAL_II_TRILINOS_SHARED" != "xyes" ; then
- as_fn_error "When building deal.II with shared libraries, Trilinos also
- needs to be built with shared libraries" "$LINENO" 5
+ as_fn_error "When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" "$LINENO" 5
fi
if test "x$enableshared" = "xno" -a "x$DEAL_II_TRILINOS_STATIC" != "xyes" ; then
- as_fn_error "When building deal.II with shared libraries, Trilinos also
- needs to be built with shared libraries" "$LINENO" 5
+ as_fn_error "When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" "$LINENO" 5
fi
if test "x$enableshared" = "xyes" ; then
@@ -10457,10 +10452,7 @@ _ACEOF
else
- as_fn_error "The Trilinos installation is missing one or more
- header files necessary for the deal.II Trilinos
- interfaces. Please re-install Trilinos with the missing
- Trilinos sub-packages enabled." "$LINENO" 5
+ as_fn_error "The Trilinos installation is missing one or more header files necessary for the deal.II Trilinos interfaces. Please re-install Trilinos with the missing Trilinos sub-packages enabled." "$LINENO" 5
fi
@@ -10516,7 +10508,7 @@ $as_echo "$DEAL_II_ARPACK_DIR" >&6; }
as_fn_error "Path to ARPACK specified with --with-arpack does not point to a complete ARPACK installation" "$LINENO" 5
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARPACK library architecture" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARPACK library architecture" >&5
$as_echo_n "checking for ARPACK library architecture... " >&6; }
ARPACK_ARCH=`cat $DEAL_II_ARPACK_DIR/ARmake.inc \
| grep "PLAT = " \
@@ -10645,8 +10637,6 @@ $as_echo "#define DEAL_II_USE_MUMPS 1" >>confdefs.h
-
-
if test "x$with_umfpack" != "x" -a "x$with_umfpack" != "xno" ; then
if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
with_blas="yes"
@@ -11272,8 +11262,7 @@ if test "${with_metis+set}" = set; then :
$as_echo "$DEAL_II_METIS_DIR" >&6; }
if test ! -d $DEAL_II_METIS_DIR/Lib ; then
- as_fn_error "Path to Metis specified with --with-metis does not
- point to a complete Metis installation" "$LINENO" 5
+ as_fn_error "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5
fi
DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR"
@@ -11287,9 +11276,7 @@ else
$as_echo "$DEAL_II_METIS_DIR" >&6; }
if test ! -d $DEAL_II_METIS_DIR/Lib ; then
- as_fn_error "The path to Metis specified in the METIS_DIR
- environment variable does not
- point to a complete Metis installation" "$LINENO" 5
+ as_fn_error "The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" "$LINENO" 5
fi
DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR"
else
@@ -11310,8 +11297,7 @@ if test "${with_metis_libs+set}" = set; then :
$as_echo "$DEAL_II_METIS_LIBDIR" >&6; }
if test ! -d $DEAL_II_METIS_LIBDIR ; then
- as_fn_error "Path to Metis specified with --with-metis does not
- point to a complete Metis installation" "$LINENO" 5
+ as_fn_error "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5
fi
else
@@ -11323,9 +11309,7 @@ else
$as_echo "$DEAL_II_METIS_LIBDIR" >&6; }
if test ! -d $DEAL_II_METIS_LIBDIR ; then
- as_fn_error "The path to Metis specified in the METIS_DIR
- environment variable does not
- point to a complete Metis installation" "$LINENO" 5
+ as_fn_error "The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" "$LINENO" 5
fi
else
if test "x$USE_CONTRIB_METIS" != "xyes" ; then
diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index 0cf4a10937..05fb2cafbc 100644
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -439,6 +439,10 @@
setenv LDFLAGS -pg
configure <configure-options>
+ The flags so set are used for both optimized and debug mode. If you want to
+ set flags for only one of these two cases, you should
+ set CXXFLAGSO
or CXXFLAGSG
, respectively.
+
--
2.39.5