Mercurial > octave

comparison configure.ac @ 31122:1077a1c277fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Use caching for Fortran values in configure. * configure.ac: Rename ax_blas_integer_size to ax_cv_blas_integer_size. * octave_blas_f77_func.m4: Use AC_CACHE_CHECK macro for Fortran values. Rename values from "ax_blas_..." to "ax_cv_blas_..." to comply with requirement for "_cv_" in configure cache naming.
author Rik <rik@octave.org>
date Wed, 06 Jul 2022 22:03:13 -0700
parents cb03340f298f
children 1d819b308578
comparison
equal deleted inserted replaced
31121:bb63f6bf9b51 31122:1077a1c277fb
779 779
780 if test $ax_blas_ok = no || test $ax_lapack_ok = no; then 780 if test $ax_blas_ok = no || test $ax_lapack_ok = no; then
781 AC_MSG_ERROR([BLAS and LAPACK libraries are required]) 781 AC_MSG_ERROR([BLAS and LAPACK libraries are required])
782 fi 782 fi
783 783
784 case $ax_blas_integer_size in 784 case $ax_cv_blas_integer_size in
785 4) 785 4)
786 HAVE_64_BIT_BLAS=no 786 HAVE_64_BIT_BLAS=no
787 ;; 787 ;;
788 8) 788 8)
789 HAVE_64_BIT_BLAS=yes 789 HAVE_64_BIT_BLAS=yes
792 AC_MSG_ERROR([unrecognized BLAS library integer size]) 792 AC_MSG_ERROR([unrecognized BLAS library integer size])
793 ;; 793 ;;
794 esac 794 esac
795 795
796 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER 796 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER
797 if test $octave_cv_sizeof_fortran_integer -ne $ax_blas_integer_size; then 797 if test $octave_cv_sizeof_fortran_integer -ne $ax_cv_blas_integer_size; then
798 if test $ax_blas_integer_size -eq 8; then 798 if test $ax_cv_blas_integer_size -eq 8; then
799 case $F77 in 799 case $F77 in
800 *gfortran*) 800 *gfortran*)
801 case $F77_INTEGER_8_FLAG in 801 case $F77_INTEGER_8_FLAG in
802 *-fdefault-integer-8*) 802 *-fdefault-integer-8*)
803 ;; 803 ;;
823 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER 823 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER
824 fi 824 fi
825 fi 825 fi
826 ## We intentionally don't attempt to fix things up if the default 826 ## We intentionally don't attempt to fix things up if the default
827 ## Fortran integer size is 8 but BLAS appears to use 4-byte integers. 827 ## Fortran integer size is 8 but BLAS appears to use 4-byte integers.
828 if test $octave_cv_sizeof_fortran_integer -ne $ax_blas_integer_size; then 828 if test $octave_cv_sizeof_fortran_integer -ne $ax_cv_blas_integer_size; then
829 AC_MSG_ERROR([your Fortran compiler must have an option for setting the default integer size to be the same size as your BLAS library uses ($ax_blas_integer_size bytes). See the file INSTALL for more information.]) 829 AC_MSG_ERROR([your Fortran compiler must have an option for setting the default integer size to be the same size as your BLAS library uses ($ax_cv_blas_integer_size bytes). See the file INSTALL for more information.])
830 fi 830 fi
831 fi 831 fi
832 AC_SUBST(F77_INTEGER_8_FLAG) 832 AC_SUBST(F77_INTEGER_8_FLAG)
833 833
834 case $octave_cv_sizeof_fortran_integer in 834 case $octave_cv_sizeof_fortran_integer in