From 5ea4b61d7cc6ec45d07c87877a1e030e9a8703c0 Mon Sep 17 00:00:00 2001 From: kanschat Date: Fri, 8 Sep 2006 20:28:31 +0000 Subject: [PATCH] remove double definition of HAVE_UMFPACK and HAVE_LIBUMFPACK git-svn-id: https://svn.dealii.org/trunk@13861 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 2 +- deal.II/base/include/base/config.h.in | 5 +---- deal.II/configure | 2 +- deal.II/lac/source/sparse_direct.cc | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 9d158d5534..46930cf0ed 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -5097,7 +5097,7 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl USE_CONTRIB_UMFPACK='yes' AC_MSG_RESULT(using included version) fi - AC_DEFINE(HAVE_UMFPACK,1,[UMFPACK is $1]) + AC_DEFINE(HAVE_LIBUMFPACK,1,[UMFPACK is $1]) ]) diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index ff1feb69b5..20b61d05b4 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -241,7 +241,7 @@ libstdc++ interface. */ #undef HAVE_LIBSTDCXX_DEMANGLER -/* Define to 1 if you have the `umfpack' library (-lumfpack). */ +/* UMFPACK is $withval */ #undef HAVE_LIBUMFPACK /* Define to 1 if you have the `z' library (-lz). */ @@ -289,9 +289,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* UMFPACK is $withval */ -#undef HAVE_UMFPACK - /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H diff --git a/deal.II/configure b/deal.II/configure index 0ac8fa484f..9cfc7e4a3c 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -11890,7 +11890,7 @@ echo "${ECHO_T}using included version" >&6 fi cat >>confdefs.h <<\_ACEOF -#define HAVE_UMFPACK 1 +#define HAVE_LIBUMFPACK 1 _ACEOF diff --git a/deal.II/lac/source/sparse_direct.cc b/deal.II/lac/source/sparse_direct.cc index 0a3384219f..85f4bd5204 100644 --- a/deal.II/lac/source/sparse_direct.cc +++ b/deal.II/lac/source/sparse_direct.cc @@ -60,7 +60,7 @@ #endif // include UMFPACK file. -#ifdef HAVE_UMFPACK +#ifdef HAVE_LIBUMFPACK extern "C" { # include } @@ -1630,7 +1630,7 @@ initialize (const SparsityPattern &) {} -#ifdef HAVE_UMFPACK +#ifdef HAVE_LIBUMFPACK SparseDirectUMFPACK::SparseDirectUMFPACK () : -- 2.39.5