Mercurial > octave-nkf
changeset 10721:4906ccf5d95e
use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 23 Jun 2010 11:21:51 +0200 |
| parents | 998d7ba68009 |
| children | e5a80597792b |
| files | ChangeLog configure.ac mkoctfile.cc.in mkoctfile.in |
| diffstat | 4 files changed, 31 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 22 12:39:56 2010 -0700 +++ b/ChangeLog Wed Jun 23 11:21:51 2010 +0200 @@ -1,3 +1,10 @@ +2010-06-23 Jaroslav Hajek <highegg@gmail.com> + + * configure.ac: Temporarily include F77_INTEGER_8_FLAG in FFLAGS for + BLAS checking. + * mkoctfile.in: Include F77_INTEGER_8_FLAG in ALL_FFLAGS. + * mkoctfile.cc.in: Ditto. + 2010-05-18 Jaroslav Hajek <highegg@gmail.com> * NEWS: Update.
--- a/configure.ac Tue Jun 22 12:39:56 2010 -0700 +++ b/configure.ac Wed Jun 23 11:21:51 2010 +0200 @@ -942,18 +942,33 @@ AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) ### Checks for BLAS and LAPACK libraries: + +## Need to adjust FFLAGS to include correct integer size. +save_FFLAGS="$FFLAGS" +FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" + ACX_BLAS_WITH_F77_FUNC([:], [:]) ACX_LAPACK([:], [:]) +## Restore FFLAGS. +FFLAGS="$save_FFLAGS" + +if test "x$acx_blas_f77_func_ok" = "xno"; then + if $USE_64_BIT_IDX_T && test "$acx_blas_integer_size_ok" = "no" ; then + ## Attempt to be more informative. + AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.]) + else + AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.]) + fi +fi + if test x$acx_blas_ok = xno || test x$acx_lapack_ok = xno; then AC_MSG_ERROR([You are required to have BLAS and LAPACK libraries]) fi -if test "x$acx_blas_f77_func_ok" = "xno"; then - AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler]) -fi - -# Check for the qrupdate library +### Check for the qrupdate library +## No need to adjust FFLAGS because only link is attempted. +## Must supply proper LIBS, however. save_LIBS="$LIBS" LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS"
--- a/mkoctfile.cc.in Tue Jun 22 12:39:56 2010 -0700 +++ b/mkoctfile.cc.in Wed Jun 23 11:21:51 2010 +0200 @@ -236,8 +236,9 @@ vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%); vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%); vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LFLAGS); + vars["F77_INTEGER8_FLAG"] = get_variable ("F77_INTEGER8_FLAG", %OCTAVE_CONF_F77_INTEGER8_FLAG%); - vars["ALL_FFLAGS"] = vars["FFLAGS"]; + vars["ALL_FFLAGS"] = vars["FFLAGS"] + " " + vars["F77_INTEGER8_FLAG"]; vars["ALL_CFLAGS"] = vars["INCFLAGS"] + " " + vars["XTRA_CFLAGS"] + " " + vars["CFLAGS"];
--- a/mkoctfile.in Tue Jun 22 12:39:56 2010 -0700 +++ b/mkoctfile.in Wed Jun 23 11:21:51 2010 +0200 @@ -103,8 +103,9 @@ : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%} : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%} : ${LFLAGS=$DEFAULT_LFLAGS} +: ${F77_INTEGER_8_FLAG=%F77_INTEGER_8_FLAG%} -: ${ALL_FFLAGS="$FFLAGS"} +: ${ALL_FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"} : ${ALL_CFLAGS="$INCFLAGS $XTRA_CFLAGS $CFLAGS"}