From: bangerth Date: Wed, 22 Oct 2008 03:58:02 +0000 (+0000) Subject: Only #define HAVE_LIBUMFPACK if we actually specified --with-umfpack* on the command... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7390613e0787028874473951c9d858748df7a7e;p=dealii-svn.git Only #define HAVE_LIBUMFPACK if we actually specified --with-umfpack* on the command line. Hopefully this is the last problem with the recent patch... git-svn-id: https://svn.dealii.org/trunk@17298 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b4bd81079b..5d6af97932 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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]) ]) diff --git a/deal.II/configure b/deal.II/configure index 847d84c0b0..e4db705c70 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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 @@ -15114,12 +15128,6 @@ fi fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUMFPACK 1 -_ACEOF - - -