From: wolf Date: Tue, 31 Aug 2004 15:04:25 +0000 (+0000) Subject: $(lib-suffix) already contains the dot, of so necessary. and we don't build X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4e4ab0d27d5ccd159bcf6a534d8fa4cde9cdaee;p=dealii-svn.git $(lib-suffix) already contains the dot, of so necessary. and we don't build debug versions of umfpack. git-svn-id: https://svn.dealii.org/trunk@9597 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 20bd8eae4f..2d4088decf 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4300,8 +4300,7 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl if test "x$1" != "xyes" ; then AC_MSG_RESULT(external version not yet supported) else - UMFPACK_LIB='$(LIBDIR)/liblac_umfpack.$(lib-suffix)' - UMFPACK_LIBG='$(LIBDIR)/liblac_umfpack.g.$(lib-suffix)' + UMFPACK_LIB='$(LIBDIR)/liblac_umfpack$(lib-suffix)' UMFPACK_INCLUDE_DIR='-I$D/contrib/umfpack/UMFPACK/Include' AC_MSG_RESULT(using included version) fi diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 9ce146dc30..5a6707a4fd 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -84,7 +84,7 @@ lib-base.o = $(LIBDIR)/libbase$(lib-suffix) lib-base.g = $(LIBDIR)/libbase.g$(lib-suffix) lib-lac.o = $(LIBDIR)/liblac$(lib-suffix) @UMFPACK_LIB@ -lib-lac.g = $(LIBDIR)/liblac.g$(lib-suffix) @UMFPACK_LIBG@ +lib-lac.g = $(LIBDIR)/liblac.g$(lib-suffix) @UMFPACK_LIB@ lib-deal2-1d.o = $(LIBDIR)/libdeal_II_1d$(lib-suffix) lib-deal2-2d.o = $(LIBDIR)/libdeal_II_2d$(lib-suffix) diff --git a/deal.II/configure.in b/deal.II/configure.in index 02f33bce7a..5b8a0585f4 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -343,7 +343,6 @@ AC_ARG_WITH(umfpack, Default is not to use UMFPack], DEAL_II_WITH_UMFPACK($withval)) AC_SUBST(UMFPACK_LIB) -AC_SUBST(UMFPACK_LIBG) AC_SUBST(UMFPACK_INCLUDE_DIR) dnl Check for LAPACK