From f12082494ab6cffbd4e7c8a8b32f0bc5bdb24ae2 Mon Sep 17 00:00:00 2001 From: guido Date: Thu, 2 Sep 2004 09:27:01 +0000 Subject: [PATCH] conditional make of umfpack; re-enable make of hsl git-svn-id: https://svn.dealii.org/trunk@9606 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 1 + deal.II/common/Make.global_options.in | 3 +++ deal.II/configure | 10 +++++----- deal.II/configure.in | 1 + deal.II/contrib/Makefile.in | 6 +++++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 2d4088decf..b49b3da6ca 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4302,6 +4302,7 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl else UMFPACK_LIB='$(LIBDIR)/liblac_umfpack$(lib-suffix)' UMFPACK_INCLUDE_DIR='-I$D/contrib/umfpack/UMFPACK/Include' + USE_CONTRIB_UMFPACK='yes' AC_MSG_RESULT(using included version) fi AC_DEFINE(HAVE_UMFPACK,1,[UMFPACK is $1]) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 5a6707a4fd..451b50bbc3 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -54,6 +54,9 @@ DEAL_II_PETSC_VERSION_SUBMINOR = @DEAL_II_PETSC_VERSION_SUBMINOR@ USE_CONTRIB_METIS = @USE_CONTRIB_METIS@ DEAL_II_METIS_DIR = @DEAL_II_METIS_DIR@ +USE_CONTRIB_HSL = @USE_CONTRIB_HSL@ +USE_CONTRIB_UMFPACK = @USE_CONTRIB_UMFPACK@ + TARGET = @target@ # if FORTRAN sublibs are used, add F77 libs to linker flags diff --git a/deal.II/configure b/deal.II/configure index 22fb632858..cf2d8a9c9e 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.175 . +# From configure.in Revision: 1.176 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -274,7 +274,7 @@ PACKAGE_BUGREPORT= ac_unique_file="deal.II" ac_subdirs_all="$ac_subdirs_all contrib tests" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD LDFLAGSPIC CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB TECPLOT_LIB TECPLOT_INCLUDE_DIR HSL_LIB HSL_INCLUDE_DIR NEEDS_F77LIBS USE_CONTRIB_HSL USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_LIBG UMFPACK_INCLUDE_DIR BLAS_LIB DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD LDFLAGSPIC CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB TECPLOT_LIB TECPLOT_INCLUDE_DIR HSL_LIB HSL_INCLUDE_DIR NEEDS_F77LIBS USE_CONTRIB_HSL USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK BLAS_LIB DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -8892,9 +8892,9 @@ echo $ECHO_N "checking UmfPack library... $ECHO_C" >&6 echo "$as_me:$LINENO: result: external version not yet supported" >&5 echo "${ECHO_T}external version not yet supported" >&6 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' + USE_CONTRIB_UMFPACK='yes' echo "$as_me:$LINENO: result: using included version" >&5 echo "${ECHO_T}using included version" >&6 fi @@ -10135,8 +10135,8 @@ s,@DEAL_II_DEFINE_DEAL_II_USE_PETSC@,$DEAL_II_DEFINE_DEAL_II_USE_PETSC,;t t s,@USE_CONTRIB_METIS@,$USE_CONTRIB_METIS,;t t s,@DEAL_II_METIS_DIR@,$DEAL_II_METIS_DIR,;t t s,@UMFPACK_LIB@,$UMFPACK_LIB,;t t -s,@UMFPACK_LIBG@,$UMFPACK_LIBG,;t t s,@UMFPACK_INCLUDE_DIR@,$UMFPACK_INCLUDE_DIR,;t t +s,@USE_CONTRIB_UMFPACK@,$USE_CONTRIB_UMFPACK,;t t s,@BLAS_LIB@,$BLAS_LIB,;t t s,@DOXYGEN@,$DOXYGEN,;t t s,@DOT@,$DOT,;t t diff --git a/deal.II/configure.in b/deal.II/configure.in index 5b8a0585f4..32c4fa155a 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -344,6 +344,7 @@ AC_ARG_WITH(umfpack, DEAL_II_WITH_UMFPACK($withval)) AC_SUBST(UMFPACK_LIB) AC_SUBST(UMFPACK_INCLUDE_DIR) +AC_SUBST(USE_CONTRIB_UMFPACK) dnl Check for LAPACK AC_CHECK_LIB(lapack, degsl_) diff --git a/deal.II/contrib/Makefile.in b/deal.II/contrib/Makefile.in index 1408047a83..941673990a 100644 --- a/deal.II/contrib/Makefile.in +++ b/deal.II/contrib/Makefile.in @@ -5,7 +5,7 @@ include ../common/Make.global_options # by default make sublibs -default: hsl umfpack +default: hsl ifeq ($(USE_CONTRIB_HSL),yes) hsl: @@ -19,8 +19,12 @@ hsl-clean: endif +ifeq ($(USE_CONTRIB_UMFPACK),yes) umfpack: cd umfpack ; $(MAKE) +else +umfpack: +endif # generic targets clean: hsl-clean -- 2.39.5