]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Don't put -lhsl into the link flags, since the path to the deal.II libs may not be...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 2 Feb 2005 19:54:12 +0000 (19:54 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 2 Feb 2005 19:54:12 +0000 (19:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@9892 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/common/Make.global_options.in
deal.II/configure

index 2ac022666c4041aa018dbf56f69439997e7c2012..f7a42447c20f82a629bc51143806eacccecf68d7 100644 (file)
@@ -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
index bf89e16abb18c4cb800c9f6063ae12a257256089..0c742ca051001d4b3fb7bc4a2d5ab76bfde49899 100644 (file)
@@ -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)
index 5f001b71b01167e862e04b4086a693c6a8441af4..0b86de7bb9c047b824b1f7cb275889a9da6176e2 100755 (executable)
@@ -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"

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.