From e36454cc13e0a8bb017b40d2e0f9b3f75f733658 Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE> Date: Mon, 13 Jul 2009 17:26:30 +0000 Subject: [PATCH] Really get rid for Fortran (unless requested). --- configure.ac | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index f521dd9..b413eb6 100644 --- a/configure.ac +++ b/configure.ac @@ -248,9 +248,7 @@ AM_PROG_CC_C_O AC_PROG_CPP AC_C_INLINE AC_PROG_CPP -AC_PROG_F77 AC_PROG_CXX - AC_PATH_PROG([CPP], [cpp], [], [/usr/bin:/lib:$PATH]) AC_DEFINE_UNQUOTED([CPP],["$CPP"],["Command which runs the C preprecessor"]) @@ -258,29 +256,32 @@ AC_DEFINE_UNQUOTED([CPP],["$CPP"],["Command which runs the C preprecessor"]) # Support for FORTRAN code in ALBERTA # -AC_F77_LIBRARY_LDFLAGS -AC_F77_WRAPPERS -AC_F77_FUNC([dnrm2],[DNRM2_F77_FUNC]) -AC_F77_FUNC([daxpy],[DAXPY_F77_FUNC]) -AC_F77_FUNC([dexpy],[DEXPY_F77_FUNC]) -AC_F77_FUNC([dmxpy],[DMXPY_F77_FUNC]) -AC_F77_FUNC([dcopy],[DCOPY_F77_FUNC]) -AC_F77_FUNC([ddot],[DDOT_F77_FUNC]) -AC_F77_FUNC([dscal],[DSCAL_F77_FUNC]) -AC_F77_FUNC([dswap],[DSWAP_F77_FUNC]) -AC_F77_FUNC([dxpay],[DXPAY_F77_FUNC]) -AC_F77_FUNC([drandn],[DRANDN_F77_FUNC]) -AC_F77_FUNC([gpskca],[GPSKCA_F77_FUNC]) -AC_SUBST([DNRM2_F77_FUNC]) -AC_SUBST([DAXPY_F77_FUNC]) -AC_SUBST([DEXPY_F77_FUNC]) -AC_SUBST([DMXPY_F77_FUNC]) -AC_SUBST([DCOPY_F77_FUNC]) -AC_SUBST([DDOT_F77_FUNC]) -AC_SUBST([DSCAL_F77_FUNC]) -AC_SUBST([DSWAP_F77_FUNC]) -AC_SUBST([DXPAY_F77_FUNC]) -AC_SUBST([DRANDN_F77_FUNC]) +if test "$USE_F77_BLAS" -eq 1; then + AC_PROG_F77 + AC_F77_LIBRARY_LDFLAGS + AC_F77_WRAPPERS + AC_F77_FUNC([dnrm2],[DNRM2_F77_FUNC]) + AC_F77_FUNC([daxpy],[DAXPY_F77_FUNC]) + AC_F77_FUNC([dexpy],[DEXPY_F77_FUNC]) + AC_F77_FUNC([dmxpy],[DMXPY_F77_FUNC]) + AC_F77_FUNC([dcopy],[DCOPY_F77_FUNC]) + AC_F77_FUNC([ddot],[DDOT_F77_FUNC]) + AC_F77_FUNC([dscal],[DSCAL_F77_FUNC]) + AC_F77_FUNC([dswap],[DSWAP_F77_FUNC]) + AC_F77_FUNC([dxpay],[DXPAY_F77_FUNC]) + AC_F77_FUNC([drandn],[DRANDN_F77_FUNC]) + AC_F77_FUNC([gpskca],[GPSKCA_F77_FUNC]) + AC_SUBST([DNRM2_F77_FUNC]) + AC_SUBST([DAXPY_F77_FUNC]) + AC_SUBST([DEXPY_F77_FUNC]) + AC_SUBST([DMXPY_F77_FUNC]) + AC_SUBST([DCOPY_F77_FUNC]) + AC_SUBST([DDOT_F77_FUNC]) + AC_SUBST([DSCAL_F77_FUNC]) + AC_SUBST([DSWAP_F77_FUNC]) + AC_SUBST([DXPAY_F77_FUNC]) + AC_SUBST([DRANDN_F77_FUNC]) +fi # # Debugging. Should come first because if not set we can forget about -- GitLab