Mercurial > octave

comparison configure.ac @ 17989:4465699450c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Don't use internal macro variable ax_blas_f77_func_ok. * configure.ac: Don't use internal macro variable ax_blas_f77_func_ok.
author Rik <rik@octave.org>
date Sat, 23 Nov 2013 09:38:13 -0800
parents 437e51a0c25d
children 7c0f59b688fc
comparison
equal deleted inserted replaced
17988:d62570cfbab9 17989:4465699450c2
1290 ## Need to adjust FFLAGS to include correct integer size. 1290 ## Need to adjust FFLAGS to include correct integer size.
1291 save_FFLAGS="$FFLAGS" 1291 save_FFLAGS="$FFLAGS"
1292 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG" 1292 FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
1293 1293
1294 AX_BLAS_WITH_F77_FUNC([:], [:], 1294 AX_BLAS_WITH_F77_FUNC([:], [:],
1295 [ax_blas_f77_func_ok=yes 1295 [ax_blas_ok=yes
1296 AC_MSG_RESULT([yes assumed for cross compilation])]) 1296 AC_MSG_CHECKING([BLAS can be called from Fortran])
1297 AC_MSG_RESULT([yes assumed for cross compilation])])
1297 AX_LAPACK([:], [:]) 1298 AX_LAPACK([:], [:])
1298 1299
1299 ## Restore FFLAGS. 1300 ## Restore FFLAGS.
1300 FFLAGS="$save_FFLAGS" 1301 FFLAGS="$save_FFLAGS"
1301 1302
1302 ## If necessary, try again with -ff2c in FFLAGS 1303 ## If necessary, try again with -ff2c in FFLAGS
1303 if test $ax_blas_f77_func_ok = no; then 1304 if test $ax_blas_ok = no; then
1304 save_FFLAGS="$FFLAGS" 1305 save_FFLAGS="$FFLAGS"
1305 FFLAGS="-ff2c $FFLAGS $F77_INTEGER_8_FLAG" 1306 FFLAGS="-ff2c $FFLAGS $F77_INTEGER_8_FLAG"
1306 1307
1307 AX_BLAS_WITH_F77_FUNC([:], [:]) 1308 AX_BLAS_WITH_F77_FUNC([:], [:])
1308 AX_LAPACK([:], [:]) 1309 AX_LAPACK([:], [:])
1309 1310
1310 ## Restore FFLAGS, with -ff2c if that was helpful 1311 ## Restore FFLAGS, with -ff2c if that was helpful
1311 1312
1312 if test $ax_blas_f77_func_ok = no; then 1313 if test $ax_blas_ok = yes; then
1314 FFLAGS="-ff2c $save_FFLAGS"
1315 else
1313 FFLAGS="$save_FFLAGS" 1316 FFLAGS="$save_FFLAGS"
1314 else
1315 FFLAGS="-ff2c $save_FFLAGS"
1316 fi 1317 fi
1317 fi 1318 fi
1318 1319
1319 ## On OSX, try again with a wrapper library (without -ff2c!) 1320 ## On OSX, try again with a wrapper library (without -ff2c!)
1320 if test $ax_blas_f77_func_ok = no; then 1321 if test $ax_blas_ok = no; then
1321 case $host_os in 1322 case $host_os in
1322 darwin*) 1323 darwin*)
1323 ## test if wrapper functions help 1324 ## test if wrapper functions help
1324 octave_blaswrap_save_CFLAGS="$CFLAGS" 1325 octave_blaswrap_save_CFLAGS="$CFLAGS"
1325 CFLAGS="$CFLAGS -DUSE_BLASWRAP" 1326 CFLAGS="$CFLAGS -DUSE_BLASWRAP"
1344 rm -f blaswrap.$ac_objext], 1345 rm -f blaswrap.$ac_objext],
1345 [AC_MSG_FAILURE([cannot compile liboctave/cruft/misc/blaswrap.c])]) 1346 [AC_MSG_FAILURE([cannot compile liboctave/cruft/misc/blaswrap.c])])
1346 AC_LANG_POP(C) 1347 AC_LANG_POP(C)
1347 CFLAGS="$octave_blaswrap_save_CFLAGS" 1348 CFLAGS="$octave_blaswrap_save_CFLAGS"
1348 1349
1349 if test $ax_blas_f77_func_ok = no; then 1350 if test $ax_blas_ok = no; then
1350 BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS" 1351 BLAS_LIBS="$octave_blaswrap_save_BLAS_LIBS"
1351 else 1352 else
1352 ## wrapper in cruft, remove from BLAS_LIBS 1353 ## wrapper in cruft, remove from BLAS_LIBS
1353 BLAS_LIBS=`echo $BLAS_LIBS | $SED -e 's/blaswrap.[[^ ]]* //g'` 1354 BLAS_LIBS=`echo $BLAS_LIBS | $SED -e 's/blaswrap.[[^ ]]* //g'`
1354 AC_DEFINE(USE_BLASWRAP, 1, 1355 AC_DEFINE(USE_BLASWRAP, 1,
1356 fi 1357 fi
1357 ;; 1358 ;;
1358 esac 1359 esac
1359 fi 1360 fi
1360 1361
1361 if test $ax_blas_f77_func_ok = no; then 1362 if test $ax_blas_ok = no; then
1362 if test $USE_64_BIT_IDX_T = yes && test $ax_blas_integer_size_ok = no; then 1363 if test $USE_64_BIT_IDX_T = yes && test "$ax_blas_integer_size_ok" = no; then
1363 ## Attempt to be more informative. 1364 ## Attempt to be more informative.
1364 AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.]) 1365 AC_MSG_ERROR([BLAS doesn't seem to support 64-bit integers. This is incompatible with --enable-64.])
1365 else 1366 else
1366 AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.]) 1367 AC_MSG_ERROR([A BLAS library was detected but found incompatible with your Fortran 77 compiler settings.])
1367 fi 1368 fi