From: Wolfgang Bangerth Date: Mon, 6 Feb 2006 15:35:37 +0000 (+0000) Subject: Regenerate X-Git-Tag: v8.0.0~12444 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9abf7eefaa342577113f87a118232bab801f9cf2;p=dealii.git Regenerate git-svn-id: https://svn.dealii.org/trunk@12235 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 b03247ec38..1834f624be 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -288,6 +288,13 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Make sure PETSc doesn't re-define the underscore through the preprocessor, + since this interferes with boost. PETSc redefines the underscore to be + "__gterr =", but then forgets to undef this thing. Boost simply wants to + concatenate the underscore with another string to form a class name, which + then of course isn't valid any more. See mails in early Feb 2006. */ +#undef PETSC_SKIP_UNDERSCORE_CHKERR + /* If already available, do not define at all. Otherwise, define to __func__ if that is available. In all other cases, indicate that no information about the present function is available for this compiler. */ diff --git a/deal.II/configure b/deal.II/configure index 1f07455c35..c09d4739fb 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -9383,7 +9383,14 @@ cat >>confdefs.h <<\_ACEOF #define DEAL_II_USE_PETSC 1 _ACEOF + DEAL_II_DEFINE_DEAL_II_USE_PETSC=DEAL_II_USE_PETSC + + +cat >>confdefs.h <<\_ACEOF +#define PETSC_SKIP_UNDERSCORE_CHKERR 1 +_ACEOF + fi