.

git-svn-id: https://svn.dealii.org/trunk@5705 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 b5e808a3da231391f7e11249ba6e0fff220886b3..035dbe6e722568a4064319b591ce7c0991fb04f2 100644 (file)
--- a/deal.II/base/include/base/config.h.in
+++ b/deal.II/base/include/base/config.h.in
@@ -1,4 +1,4 @@
-/* base/include/base/config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* base/include/base/config.h.in.  Generated from configure.in by autoheader.  */
 //----------------------------  config.h  ---------------------------
 //    $Id$
 //    Version: $Name$
@@ -28,15 +28,11 @@
 // environment, contact the authors of the library.
 
 
-
 /* Backward compatibility support for functions and classes that do not take
    an explicit mapping variable, but rather use a default Q1 mapping instead
    */
 #undef DEAL_II_COMPAT_MAPPING
 
-/* Define if you have the rand_r function */
-#undef DEAL_II_DECLARE_LRAND48
-
 /* Flag indicating whether the library shall be compiled to use the Tecplot
    interface */
 #undef DEAL_II_HAVE_TECPLOT
@@ -68,6 +64,12 @@
    */
 #undef DEAL_II_TEMPLATE_SPEC_ACCESS_WORKAROUND
 
+/* Define if we have to work around a bug in icc in which the compiler refuses
+   to consider a template when given a pointer to a constant member function.
+   See the aclocal.m4 file in the top-level directory for a description of
+   this bug. */
+#undef DEAL_II_TEMPL_CONST_MEM_PTR_BUG
+
 /* Flag indicating whether the library shall be compiler for multithreaded
    applications */
 #undef DEAL_II_USE_MT
@@ -78,7 +80,7 @@
 /* Define if the compiler provides __builtin_expect */
 #undef HAVE_BUILTIN_EXPECT
 
-/* Define if you have the `gethostname' function. */
+/* Define to 1 if you have the `gethostname' function. */
 #undef HAVE_GETHOSTNAME
 
 /* Availability of the MA27 algorithm from HSL */
@@ -115,6 +117,21 @@
    by the preprocessor variable. */
 #undef NO_HAVE_GETRUSAGE
 
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
 /* Define if we have to work around a bug in IBM's xlC compiler. See the
    aclocal.m4 file in the top-level directory for a description of this bug.
    */

diff --git a/deal.II/configure b/deal.II/configure
index 91123fe37a96744d9148607558f87c9aadc10615..52dab8d0e6e864ea39f5264a502bee0cd30cb540 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.104 .
+# From configure.in Revision: 1.105 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53a.
 #
@@ -3839,6 +3839,75 @@ _ACEOF
 
 
 
+  echo "$as_me:$LINENO: checking for templates and pointers to const member functions bug" >&5
+echo $ECHO_N "checking for templates and pointers to const member functions 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 <class Class> void encapsulate (void (Class::*fun_ptr)());
+
+       struct X {
+         void bar () const;
+       };
+
+       void foo () {
+         encapsulate(&X::bar);
+       };
+
+#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_TEMPL_CONST_MEM_PTR_BUG 1
+_ACEOF
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+
   echo "$as_me:$LINENO: checking for std::iterator class" >&5
 echo $ECHO_N "checking for std::iterator class... $ECHO_C" >&6
   ac_ext=cc