]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Only #define HAVE_LIBUMFPACK if we actually specified --with-umfpack* on the command...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 22 Oct 2008 03:58:02 +0000 (03:58 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 22 Oct 2008 03:58:02 +0000 (03:58 +0000)
git-svn-id: https://svn.dealii.org/trunk@17298 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index b4bd81079ba436e45e046994881eb318d5e78702..5d6af97932d2d7ba54ba55e16d88d942ff1d60d9 100644 (file)
@@ -5934,6 +5934,8 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
           UMFPACK_INCLUDE_DIR="-I$withval/Include"
           AC_MSG_RESULT(trying version at $withval)
         fi
+
+        AC_DEFINE(HAVE_LIBUMFPACK,1,[UMFPACK is $1])
      ])
 
   acx_umfpack=no
@@ -5955,6 +5957,10 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
         acx_umfpack=yes
      ])
 
+  if test "x$acx_umfpack" = "xyes" ; then
+    AC_DEFINE(HAVE_LIBUMFPACK,1,[UMFPACK is $1])
+  fi
+
   if test "x$UMFPACK_DIR" != "x" -a "x$acx_umfpack" == "xno" ; then
     dnl A pathname has been given to --with-umfpack but nothing
     dnl has been specified through the other two flags
@@ -6143,8 +6149,6 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
        fi
     fi 
   fi
-
-  AC_DEFINE(HAVE_LIBUMFPACK,1,[UMFPACK is $1])
 ])
 
 
index 847d84c0b07b200aba4e2ffb9c0d097599deced8..e4db705c70754c7637abd21660b5fc962c230da4 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 17277 .
+# From configure.in Revision: 17296 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for deal.II 6.2.pre.
 #
@@ -13872,6 +13872,12 @@ echo "${ECHO_T}using included version" >&6; }
 echo "${ECHO_T}trying version at $withval" >&6; }
         fi
 
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBUMFPACK 1
+_ACEOF
+
+
 fi
 
 
@@ -13896,6 +13902,14 @@ if test "${with_umfpack_libs+set}" = set; then
 fi
 
 
+  if test "x$acx_umfpack" = "xyes" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBUMFPACK 1
+_ACEOF
+
+  fi
+
   if test "x$UMFPACK_DIR" != "x" -a "x$acx_umfpack" == "xno" ; then
 
                 if test "x$DEAL_II_USE_INTERNAL_UMFPACK" != "xyes" ; then
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBUMFPACK 1
-_ACEOF
-
-
-
 
 
 

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.