From: Guido Kanschat Date: Wed, 2 Feb 2005 19:34:25 +0000 (+0000) Subject: unified FORTRAN libs? X-Git-Tag: v8.0.0~14599 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a3e0f4ca31f780924b5ea97763066571480ce76;p=dealii.git unified FORTRAN libs? git-svn-id: https://svn.dealii.org/trunk@9891 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index fc38478bb3..2ac022666c 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4167,7 +4167,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_HSL, dnl if test "x$hsl_subroutines" != "x" ; then AC_MSG_RESULT($hsl_subroutines) USE_CONTRIB_HSL=yes - AC_SUBST(HSL_LIB,'$(LIBDIR)/libhsl$(lib-suffix)') + LIBS="-lhsl $LIBS" AC_SUBST(HSL_INCLUDE_DIR,'-I$D/contrib/hsl/include') AC_SUBST(NEEDS_F77LIBS,"yes") else @@ -4205,6 +4205,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TECPLOT, dnl test -r "$TECPLOT_INCLUDE_DIR/TECIO.h") ; then AC_DEFINE(DEAL_II_HAVE_TECPLOT, 1, [Flag indicating whether the library shall be compiled to use the Tecplot interface]) + LIBS="$TECPLOT_LIB $LIBS" fi ]) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 94a46d3376..bf89e16abb 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -34,8 +34,7 @@ LDFLAGS = @LDFLAGS@ F77 = @F77@ F77-VERSION = @F77_VERSION@ F77LIBS = @F77LIBS@ -NEEDS_F77LIBS = @NEEDS_F77LIBS@ -LIBS = @LIBS@ @TECPLOT_LIB@ @HSL_LIB@ +LIBS = @LIBS@ LIBDIR = $D/lib PERL = @PERL@ enable-multithreading= @enablemultithreading@ @@ -59,12 +58,6 @@ USE_CONTRIB_UMFPACK = @USE_CONTRIB_UMFPACK@ TARGET = @target@ -# if FORTRAN sublibs are used, add F77 libs to linker flags -ifeq ($(NEEDS_F77LIBS),yes) - LDFLAGS += $(F77LDFLAGS) - LIBS += $(F77LIBS) -endif - ###################################################### # now configuration for compiler flags, pathes, etc diff --git a/deal.II/configure b/deal.II/configure index 2ec9d206ad..5f001b71b0 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.183 . +# From configure.in Revision: 1.184 . # 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 CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB NEEDS_F77LIBS HSL_LIB HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR TECPLOT_LIB 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 DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC 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 CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR 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 DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1352,7 +1352,7 @@ echo "${ECHO_T}Configuring deal.II version $DEAL_II_VERSION" >&6 - +LDFLAGS="-L$DEAL_II_PATH/lib $LDFLAGS" DEAL2_DIR=$DEAL_II_PATH @@ -8984,8 +8984,7 @@ _ACEOF echo "$as_me:$LINENO: result: $hsl_subroutines" >&5 echo "${ECHO_T}$hsl_subroutines" >&6 USE_CONTRIB_HSL=yes - HSL_LIB='$(LIBDIR)/libhsl$(lib-suffix)' - + LIBS="-lhsl $LIBS" HSL_INCLUDE_DIR='-I$D/contrib/hsl/include' NEEDS_F77LIBS="yes" @@ -9002,6 +9001,7 @@ if test "x$NEEDS_F77LIBS" != "x" ; then echo "$as_me:$LINENO: result: Adding FORTRAN libraries $F77LIBS" >&5 echo "${ECHO_T}Adding FORTRAN libraries $F77LIBS" >&6 LIBS="$LIBS $F77LIBS" + LDFLAGS="$F77FLAGS $LDFLAGS" fi @@ -9065,12 +9065,12 @@ cat >>confdefs.h <<\_ACEOF #define DEAL_II_HAVE_TECPLOT 1 _ACEOF + LIBS="$TECPLOT_LIB $LIBS" fi - echo "$as_me:$LINENO: checking for PETSc library directory" >&5 echo $ECHO_N "checking for PETSc library directory... $ECHO_C" >&6 @@ -10622,11 +10622,9 @@ s,@AR@,$AR,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@NEEDS_F77LIBS@,$NEEDS_F77LIBS,;t t -s,@HSL_LIB@,$HSL_LIB,;t t s,@HSL_INCLUDE_DIR@,$HSL_INCLUDE_DIR,;t t s,@USE_CONTRIB_HSL@,$USE_CONTRIB_HSL,;t t s,@TECPLOT_INCLUDE_DIR@,$TECPLOT_INCLUDE_DIR,;t t -s,@TECPLOT_LIB@,$TECPLOT_LIB,;t t s,@USE_CONTRIB_PETSC@,$USE_CONTRIB_PETSC,;t t s,@DEAL_II_PETSC_DIR@,$DEAL_II_PETSC_DIR,;t t s,@DEAL_II_PETSC_ARCH@,$DEAL_II_PETSC_ARCH,;t t diff --git a/deal.II/configure.in b/deal.II/configure.in index f3106342a3..95ff61c81a 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -63,7 +63,7 @@ AC_SUBST(DEAL_II_VERSION) AC_SUBST(DEAL_II_MAJOR) AC_SUBST(DEAL_II_MINOR) AC_SUBST(DEAL_II_PATH) - +LDFLAGS="-L$DEAL_II_PATH/lib $LDFLAGS" dnl For backward compatibility, also have DEAL2_DIR alias DEAL_II_PATH DEAL2_DIR=$DEAL_II_PATH @@ -366,6 +366,7 @@ dnl ------------------------------------------------------------- if test "x$NEEDS_F77LIBS" != "x" ; then AC_MSG_RESULT(Adding FORTRAN libraries $F77LIBS) LIBS="$LIBS $F77LIBS" + LDFLAGS="$F77FLAGS $LDFLAGS" fi dnl ------------------------------------------------------------- @@ -374,7 +375,6 @@ dnl ------------------------------------------------------------- DEAL_II_CONFIGURE_TECPLOT AC_SUBST(TECPLOT_INCLUDE_DIR) -AC_SUBST(TECPLOT_LIB) DEAL_II_CONFIGURE_PETSC AC_SUBST(USE_CONTRIB_PETSC)