From d4de829c81dfe6bda0a88667d05c9feec627ef3a Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 2 Feb 2005 19:54:12 +0000 Subject: [PATCH] Don't put -lhsl into the link flags, since the path to the deal.II libs may not be part of LD_LIBRARY_PATH git-svn-id: https://svn.dealii.org/trunk@9892 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 1 - deal.II/common/Make.global_options.in | 5 +++++ deal.II/configure | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 2ac022666c..f7a42447c2 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4167,7 +4167,6 @@ AC_DEFUN(DEAL_II_CONFIGURE_HSL, dnl if test "x$hsl_subroutines" != "x" ; then AC_MSG_RESULT($hsl_subroutines) USE_CONTRIB_HSL=yes - LIBS="-lhsl $LIBS" AC_SUBST(HSL_INCLUDE_DIR,'-I$D/contrib/hsl/include') AC_SUBST(NEEDS_F77LIBS,"yes") else diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index bf89e16abb..0c742ca051 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -87,6 +87,11 @@ 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_LIB@ +ifeq ($(USE_CONTRIB_HSL),yes) + lib-lac.o += $(LIBDIR)/libhsl$(lib-suffix) + lib-lac.g += $(LIBDIR)/libhsl$(lib-suffix) +endif + lib-deal2-1d.o = $(LIBDIR)/libdeal_II_1d$(lib-suffix) lib-deal2-2d.o = $(LIBDIR)/libdeal_II_2d$(lib-suffix) lib-deal2-3d.o = $(LIBDIR)/libdeal_II_3d$(lib-suffix) diff --git a/deal.II/configure b/deal.II/configure index 5f001b71b0..0b86de7bb9 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.184 . +# From configure.in Revision: 1.185 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -8984,7 +8984,6 @@ _ACEOF echo "$as_me:$LINENO: result: $hsl_subroutines" >&5 echo "${ECHO_T}$hsl_subroutines" >&6 USE_CONTRIB_HSL=yes - LIBS="-lhsl $LIBS" HSL_INCLUDE_DIR='-I$D/contrib/hsl/include' NEEDS_F77LIBS="yes" -- 2.39.5