Mercurial > hg > octave-nkf

comparison configure.ac @ 14144:834df9f10963 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove ARPACK files from sources and restore configure checks for external ARPACK library * libcruft/arpack: Remove directory and all files. * libcruft/Makefile.am: Don't include arpack/module.mk. * m4/acinclude.m4 (OCTAVE_CHECK_ARPACK_OK): New macro. * configure.ac: Check for ARPACK. Use OCTAVE_CHECK_ARPACK_OK to test for known bug. * build-aux/common.mk (ARPACK_CPPFLAGS, ARPACK_LDFLAGS, ARPACK_LIBS): Restore variables. (do_subst_config_vals): Substitute them. * eigs-base.cc: Use HAVE_ARPACK again. * sparse/svds.m: Use "testif HAVE_ARPACK" instead of "test". * DLD-FUNCTIONS/eigs.cc (Feigs): Restore HAVE_ARPACK conditionals. Use "testif HAVE_ARPACK" instead of "test". * toplev.cc (octave_config_info): Restore ARPACK_CPPFLAGS, ARPACK_LDFLAGS, ARPACK_LIBS to the struct. * oct-conf.h.in (OCTAVE_CONF_ARPACK_CPPFLAGS, OCTAVE_CONF_ARPACK_LDFLAGS, OCTAVE_CONF_ARPACK_LIBS): Restore #defines.
author John W. Eaton <jwe@octave.org>
date Tue, 03 Jan 2012 20:12:38 -0500
parents 72c96de7a403
children f15007a6c642
comparison
equal deleted inserted replaced
14143:04dcbb8fb880 14144:834df9f10963
1170 save_LIBS="$LIBS"; 1170 save_LIBS="$LIBS";
1171 LIBS="$UMFPACK_LIBS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" 1171 LIBS="$UMFPACK_LIBS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
1172 OCTAVE_UMFPACK_SEPERATE_SPLIT 1172 OCTAVE_UMFPACK_SEPERATE_SPLIT
1173 LIBS="$save_LIBS" 1173 LIBS="$save_LIBS"
1174 fi 1174 fi
1175
1176 save_LIBS="$LIBS"
1177 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS"
1178 OCTAVE_CHECK_LIBRARY(arpack, ARPACK,
1179 [ARPACK not found. The eigs function will be disabled.],
1180 [],
1181 [dseupd],
1182 [Fortran 77], [don't use the ARPACK library, disable eigs function],
1183 [warn_arpack=
1184 OCTAVE_CHECK_ARPACK_OK([
1185 AC_DEFINE(HAVE_ARPACK, 1, [Define if ARPACK is available.])], [
1186 warn_arpack="ARPACK library found, but seems not to work properly -- disabling eigs function"])])
1187 LIBS="$save_LIBS"
1175 1188
1176 ### Enable dynamic linking. --enable-shared implies this, so 1189 ### Enable dynamic linking. --enable-shared implies this, so
1177 ### --enable-dl is only need if you are only building static libraries 1190 ### --enable-dl is only need if you are only building static libraries
1178 ### and want to try dynamic linking too (works on some systems, for 1191 ### and want to try dynamic linking too (works on some systems, for
1179 ### example, OS X and Windows). 1192 ### example, OS X and Windows).
2148 LIBS: $LIBS 2161 LIBS: $LIBS
2149 2162
2150 AMD CPPFLAGS: $AMD_CPPFLAGS 2163 AMD CPPFLAGS: $AMD_CPPFLAGS
2151 AMD LDFLAGS: $AMD_LDFLAGS 2164 AMD LDFLAGS: $AMD_LDFLAGS
2152 AMD libraries: $AMD_LIBS 2165 AMD libraries: $AMD_LIBS
2166 ARPACK CPPFLAGS: $ARPACK_CPPFLAGS
2167 ARPACK LDFLAGS: $ARPACK_LDFLAGS
2168 ARPACK libraries: $ARPACK_LIBS
2153 BLAS libraries: $BLAS_LIBS 2169 BLAS libraries: $BLAS_LIBS
2154 CAMD CPPFLAGS: $CAMD_CPPFLAGS 2170 CAMD CPPFLAGS: $CAMD_CPPFLAGS
2155 CAMD LDFLAGS: $CAMD_LDFLAGS 2171 CAMD LDFLAGS: $CAMD_LDFLAGS
2156 CAMD libraries: $CAMD_LIBS 2172 CAMD libraries: $CAMD_LIBS
2157 CARBON libraries: $CARBON_LIBS 2173 CARBON libraries: $CARBON_LIBS
2393 AC_MSG_WARN([code with 8 byte signed INTEGER values. This option]) 2409 AC_MSG_WARN([code with 8 byte signed INTEGER values. This option])
2394 AC_MSG_WARN([should be specified in the F77_INTEGER_8_FLAG variable]) 2410 AC_MSG_WARN([should be specified in the F77_INTEGER_8_FLAG variable])
2395 AC_MSG_WARN([Make. This should work automatically for gfortran. If]) 2411 AC_MSG_WARN([Make. This should work automatically for gfortran. If])
2396 AC_MSG_WARN([you use another compiler, you will need to set this]) 2412 AC_MSG_WARN([you use another compiler, you will need to set this])
2397 AC_MSG_WARN([variable on the configure command line. You must also]) 2413 AC_MSG_WARN([variable on the configure command line. You must also])
2398 AC_MSG_WARN([compile the BLAS, LAPACK, QRUPDATE, and SuiteSparse]) 2414 AC_MSG_WARN([compile the ARPACK, BLAS, LAPACK, QRUPDATE, and SuiteSparse])
2399 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.]) 2415 AC_MSG_WARN([libraries to use 8 byte signed integers for array indexing.])
2400 AC_MSG_WARN([]) 2416 AC_MSG_WARN([])
2401 warn_msg_printed=true 2417 warn_msg_printed=true
2402 fi 2418 fi
2403 2419