From: wolf Date: Fri, 6 Apr 2001 12:45:38 +0000 (+0000) Subject: Move extra F77 libs to instead of , since they appear in different places of the... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb303c143e66d10ffa9c5b7a2040531a4cb8c043;p=dealii-svn.git Move extra F77 libs to instead of , since they appear in different places of the linker command line. In the old way, we couldnt link with F77 code parts on Linux. git-svn-id: https://svn.dealii.org/trunk@4388 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index f0cd15feae..459703edde 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.62 +# From configure.in Revision: 1.63 @@ -2271,7 +2271,7 @@ if test "x$F77" != "x" ; then F77FLAGSO="$F77FLAGSO -fPIC" fi - F77LDFLAGS="-lg2c" + LIBS="$LIBS -lg2c" else @@ -2281,7 +2281,7 @@ if test "x$F77" != "x" ; then echo "$ac_t""compiler is AIX Fortran77" 1>&6 F77FLAGSG="$FFLAGS -g" F77FLAGSO="$FFLAGS -O3 -w" - F77LDFLAGS="-lxlf90" + LIBS="$LIBS -lxlf90" else @@ -2293,7 +2293,7 @@ if test "x$F77" != "x" ; then F77_VERSION="SunF77" F77FLAGSG="$FFLAGS -silent -g" F77FLAGSO="$FFLAGS -silent -O3 -w" - F77LDFLAGS="-lF77 -lsunmath -lM77" + LIBSS="$LIBS -lF77 -lsunmath -lM77" if test $enableshared = yes ; then F77FLAGSG="$F77FLAGSG -PIC" @@ -2308,7 +2308,7 @@ if test "x$F77" != "x" ; then F77_VERSION="MIPSproF77" F77FLAGSG="$FFLAGS -ansi -g" F77FLAGSO="$FFLAGS -O3 -woffall" - F77LDFLAGS="-lftn" + LIBSS="$LIBS -lftn" if test $enableshared = yes ; then F77FLAGSG="$F77FLAGSG -shared -KPIC" @@ -2333,10 +2333,11 @@ fi + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2340: checking for $ac_word" >&5 +echo "configure:2341: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2374,7 +2375,7 @@ fi echo $ac_n "checking for HSL subroutines""... $ac_c" 1>&6 -echo "configure:2378: checking for HSL subroutines" >&5 +echo "configure:2379: checking for HSL subroutines" >&5 hsl_subroutines="" if test -r contrib/hsl/source/ma27.f ; then hsl_subroutines="$hsl_subroutines MA27" @@ -2409,7 +2410,7 @@ if test "${with_blas+set}" = set; then withval="$with_blas" if test "$withval" != no ; then echo $ac_n "checking for BLAS""... $ac_c" 1>&6 -echo "configure:2413: checking for BLAS" >&5 +echo "configure:2414: checking for BLAS" >&5 if test -r "$withval" ; then echo "$ac_t""found" 1>&6 else @@ -2425,7 +2426,7 @@ EOF else echo $ac_n "checking for daxpy_ in -lblas""... $ac_c" 1>&6 -echo "configure:2429: checking for daxpy_ in -lblas" >&5 +echo "configure:2430: checking for daxpy_ in -lblas" >&5 ac_lib_var=`echo blas'_'daxpy_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2433,7 +2434,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lblas -lg2c $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2479,7 +2480,7 @@ if test "${with_lapack+set}" = set; then withval="$with_lapack" if test "$withval" != no ; then echo $ac_n "checking for LAPACK""... $ac_c" 1>&6 -echo "configure:2483: checking for LAPACK" >&5 +echo "configure:2484: checking for LAPACK" >&5 if test -r "$withval" ; then echo "$ac_t""found" 1>&6 else @@ -2495,7 +2496,7 @@ EOF else echo $ac_n "checking for dgels_ in -llapack""... $ac_c" 1>&6 -echo "configure:2499: checking for dgels_ in -llapack" >&5 +echo "configure:2500: checking for dgels_ in -llapack" >&5 ac_lib_var=`echo lapack'_'dgels_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2503,7 +2504,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llapack $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2584,7 +2585,7 @@ else fi echo $ac_n "checking for kdoc""... $ac_c" 1>&6 -echo "configure:2588: checking for kdoc" >&5 +echo "configure:2589: checking for kdoc" >&5 if test "$kdocdir" != ${DEAL2_DIR}/contrib/kdoc/bin ; then if test -r $kdocdir/kdoc ; then echo "$ac_t""found" 1>&6 @@ -2620,7 +2621,7 @@ if test "$docxx" = to-be-determined ; then # Extract the first word of ""doc++"", so it can be a program name with args. set dummy "doc++"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2624: checking for $ac_word" >&5 +echo "configure:2625: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_docxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2654,7 +2655,7 @@ fi else echo $ac_n "checking for doc++""... $ac_c" 1>&6 -echo "configure:2658: checking for doc++" >&5 +echo "configure:2659: checking for doc++" >&5 if test -x "$docxx" ; then echo "$ac_t""yes" 1>&6 else @@ -2677,16 +2678,16 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" echo $ac_n "checking for consistency of CXXFLAGSG flags""... $ac_c" 1>&6 -echo "configure:2681: checking for consistency of CXXFLAGSG flags" >&5 +echo "configure:2682: checking for consistency of CXXFLAGSG flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -2704,16 +2705,16 @@ rm -f conftest* CXXFLAGS="$CXXFLAGSO" echo $ac_n "checking for consistency of CXXFLAGSO flags""... $ac_c" 1>&6 -echo "configure:2708: checking for consistency of CXXFLAGSO flags" >&5 +echo "configure:2709: checking for consistency of CXXFLAGSO flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 diff --git a/deal.II/configure.in b/deal.II/configure.in index 968ebce433..3b7c8f5123 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -553,7 +553,7 @@ if test "x$F77" != "x" ; then dnl Then we have to set the set of libraries we have to link with dnl when linking C++ and Fortran code with the C++ compiler. For dnl g77, this is only libg2c - F77LDFLAGS="-lg2c" + LIBS="$LIBS -lg2c" else @@ -565,7 +565,7 @@ if test "x$F77" != "x" ; then AC_MSG_RESULT(compiler is AIX Fortran77) F77FLAGSG="$FFLAGS -g" F77FLAGSO="$FFLAGS -O3 -w" - F77LDFLAGS="-lxlf90" + LIBS="$LIBS -lxlf90" dnl Note: presently, we don't support shared libs on AIX, so we don't need dnl to set -PIC or the like for this compiler (nonetheless, I couldn't find @@ -583,7 +583,7 @@ if test "x$F77" != "x" ; then F77_VERSION="SunF77" F77FLAGSG="$FFLAGS -silent -g" F77FLAGSO="$FFLAGS -silent -O3 -w" - F77LDFLAGS="-lF77 -lsunmath -lM77" + LIBSS="$LIBS -lF77 -lsunmath -lM77" dnl If necessary, add shared lib flags if test $enableshared = yes ; then @@ -601,7 +601,7 @@ if test "x$F77" != "x" ; then F77_VERSION="MIPSproF77" F77FLAGSG="$FFLAGS -ansi -g" F77FLAGSO="$FFLAGS -O3 -woffall" - F77LDFLAGS="-lftn" + LIBSS="$LIBS -lftn" dnl If necessary, add shared lib flags if test $enableshared = yes ; then @@ -626,6 +626,7 @@ AC_SUBST(F77_VERSION) AC_SUBST(F77FLAGSO) AC_SUBST(F77FLAGSG) AC_SUBST(F77LDFLAGS) +AC_SUBST(LIBS) dnl Find path to perl