]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
remove double definition of HAVE_UMFPACK and HAVE_LIBUMFPACK
authorkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Sep 2006 20:28:31 +0000 (20:28 +0000)
committerkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 8 Sep 2006 20:28:31 +0000 (20:28 +0000)
git-svn-id: https://svn.dealii.org/trunk@13861 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/base/include/base/config.h.in
deal.II/configure
deal.II/lac/source/sparse_direct.cc

index 9d158d553491cc6c39817735ffb3ea0d8258f698..46930cf0ed96cb3b0600e90c5c7c5b884b32c33f 100644 (file)
@@ -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])
 ])
 
 
index ff1feb69b5d00a36be279d9648b5d13249fbc67e..20b61d05b49951602deaacf167f37158629a5ec6 100644 (file)
    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). */
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* UMFPACK is $withval */
-#undef HAVE_UMFPACK
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
index 0ac8fa484ff9d81c3b325e8b23b772ef09aeeb2c..9cfc7e4a3c6d6d3a5c4a3d5587c4720bcfc64a61 100755 (executable)
@@ -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
 
 
index 0a3384219f2c722ed2c9be93751bb25a4a5a9778..85f4bd520417cb896681b4b6c6b343372d96a490 100644 (file)
@@ -60,7 +60,7 @@
 #endif
 
 // include UMFPACK file.
-#ifdef HAVE_UMFPACK
+#ifdef HAVE_LIBUMFPACK
 extern "C" {
 #  include <umfpack.h>
 }
@@ -1630,7 +1630,7 @@ initialize (const SparsityPattern &)
 {}
 
 
-#ifdef HAVE_UMFPACK
+#ifdef HAVE_LIBUMFPACK
 
 SparseDirectUMFPACK::SparseDirectUMFPACK ()
                 :

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.