From: wolf Date: Mon, 6 May 2002 13:11:09 +0000 (+0000) Subject: Regenerate. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bc2277e9351e506dcccb9be5616d3f00b407830;p=dealii-svn.git Regenerate. git-svn-id: https://svn.dealii.org/trunk@5825 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index f2b015b1d5..baab8808fc 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -63,6 +63,11 @@ directory for a description of this bug. */ #undef DEAL_II_MEMBER_OP_TEMPLATE_INST +/* Defined if the compiler refuses to allow the explicit specialization of + static member variables. For the exact failure mode, look at aclocal.m4 in + the top-level directory. */ +#undef DEAL_II_MEMBER_VAR_SPECIALIZATION_BUG + /* Minor version number of deal.II */ #undef DEAL_II_MINOR diff --git a/deal.II/configure b/deal.II/configure index 15ffab0b83..1222317079 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.111 . +# From configure.in Revision: 1.112 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53a. # @@ -4337,6 +4337,72 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + + echo "$as_me:$LINENO: checking for member variable specialization bug" >&5 +echo $ECHO_N "checking for member variable specialization bug... $ECHO_C" >&6 + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + CXXFLAGS="$CXXFLAGSG" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + + template struct T { + static const int i; + }; + + template <> const int T<1>::i; + template <> const int T<1>::i = 1; + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + echo "$as_me:$LINENO: result: yes. using workaround" >&5 +echo "${ECHO_T}yes. using workaround" >&6 + +cat >>confdefs.h <<\_ACEOF +#define DEAL_II_MEMBER_VAR_SPECIALIZATION_BUG 1 +_ACEOF + + fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -4441,7 +4507,7 @@ cat conftest.$ac_ext >&5 echo "$as_me:$LINENO: result: not available" >&5 echo "${ECHO_T}not available" >&6 - x="(not available)" + x="\"(not available)\"" fi rm -f conftest.$ac_objext conftest.$ac_ext