Mercurial > octave-libtiff

comparison configure.ac @ 15150:2eb789da13c3 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
periodic merge of default to gui
author John W. Eaton <jwe@octave.org>
date Fri, 10 Aug 2012 18:07:24 -0400
parents 089b98bdaebf 142e377e7e28
children 141b0b108292
comparison
equal deleted inserted replaced
15139:bfc220d1de67 15150:2eb789da13c3
264 ])], have_msvc=yes, have_msvc=no) 264 ])], have_msvc=yes, have_msvc=no)
265 AC_MSG_RESULT([$have_msvc]) 265 AC_MSG_RESULT([$have_msvc])
266 ;; 266 ;;
267 esac 267 esac
268 268
269 ### gnulib initialization 269 ### gnulib initialization: part 1
270 ### Must take place immediately after a compiler is determined
270 271
271 gl_EARLY 272 gl_EARLY
272 gl_INIT
273 273
274 ### Check version number when using gcc. 274 ### Check version number when using gcc.
275 275
276 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \ 276 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \
277 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//'` 277 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//'`
548 548
549 if test -z "$F77"; then 549 if test -z "$F77"; then
550 AC_MSG_ERROR([in order to build Octave, you must have a compatible Fortran compiler or wrapper script for f2c that functions as a Fortran compiler installed and in your path. See the file INSTALL for more information.]) 550 AC_MSG_ERROR([in order to build Octave, you must have a compatible Fortran compiler or wrapper script for f2c that functions as a Fortran compiler installed and in your path. See the file INSTALL for more information.])
551 fi 551 fi
552 552
553 OCTAVE_CHECK_FORTRAN_HAVE_ISNAN 553 OCTAVE_CHECK_FUNC_FORTRAN_ISNAN
554 F77_ISNAN_MACRO= 554 F77_ISNAN_MACRO=
555 if test "x$octave_cv_fortran_have_isnan" = xno; then 555 if test "x$octave_cv_func_fortran_isnan" = xno; then
556 AC_MSG_NOTICE([substituting ISNAN(X) with X.NE.X in Fortran sources]) 556 AC_MSG_NOTICE([substituting ISNAN(X) with X.NE.X in Fortran sources])
557 F77_ISNAN_MACRO="s|ISNAN(\(@<:@^)@:>@*\))|(\1.NE.\1)|" 557 F77_ISNAN_MACRO="s|ISNAN(\(@<:@^)@:>@*\))|(\1.NE.\1)|"
558 fi 558 fi
559 AC_SUBST(F77_ISNAN_MACRO) 559 AC_SUBST(F77_ISNAN_MACRO)
560 560
561 OCTAVE_CHECK_FORTRAN_INTEGER_SIZE 561 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER
562 if test "x$octave_cv_fortran_integer_size" = xno; then 562 if test "x$octave_cv_sizeof_fortran_integer" = xno; then
563 if $USE_64_BIT_IDX_T; then 563 if $USE_64_BIT_IDX_T; then
564 case "$F77" in 564 case "$F77" in
565 *gfortran*) 565 *gfortran*)
566 case "$F77_INTEGER_8_FLAG" in 566 case "$F77_INTEGER_8_FLAG" in
567 *-fdefault-integer-8*) 567 *-fdefault-integer-8*)
575 ;; 575 ;;
576 *) 576 *)
577 AC_MSG_NOTICE([adding -fdefault-integer-8 to F77_INTEGER_8_FLAG]) 577 AC_MSG_NOTICE([adding -fdefault-integer-8 to F77_INTEGER_8_FLAG])
578 F77_INTEGER_8_FLAG="-fdefault-integer-8" 578 F77_INTEGER_8_FLAG="-fdefault-integer-8"
579 ## Invalidate the cache and try again. 579 ## Invalidate the cache and try again.
580 $as_unset octave_cv_fortran_integer_size 580 $as_unset octave_cv_sizeof_fortran_integer
581 ;; 581 ;;
582 esac 582 esac
583 ;; 583 ;;
584 esac 584 esac
585 ;; 585 ;;
586 esac 586 esac
587 if test -z "$octave_cv_fortran_integer_size"; then 587 if test -z "$octave_cv_sizeof_fortran_integer"; then
588 OCTAVE_CHECK_FORTRAN_INTEGER_SIZE 588 OCTAVE_CHECK_SIZEOF_FORTRAN_INTEGER
589 fi 589 fi
590 if test "x$octave_cv_fortran_integer_size" = xno; then 590 if test "x$octave_cv_sizeof_fortran_integer" = xno; then
591 AC_MSG_ERROR([in order to build Octave with 64-bit indexing support your Fortran compiler must have an option for setting the default integer size to 8 bytes. See the file INSTALL for more information.]) 591 AC_MSG_ERROR([in order to build Octave with 64-bit indexing support your Fortran compiler must have an option for setting the default integer size to 8 bytes. See the file INSTALL for more information.])
592 fi 592 fi
593 else 593 else
594 AC_MSG_ERROR([your Fortran compiler must have an option to make integers the same size as octave_idx_type ($OCTAVE_IDX_TYPE). See the file INSTALL for more information.]) 594 AC_MSG_ERROR([your Fortran compiler must have an option to make integers the same size as octave_idx_type ($OCTAVE_IDX_TYPE). See the file INSTALL for more information.])
595 fi 595 fi
605 AC_SUBST(F77_FLOAT_STORE_FLAG) 605 AC_SUBST(F77_FLOAT_STORE_FLAG)
606 ]) 606 ])
607 607
608 ### Check for the Qhull library 608 ### Check for the Qhull library
609 609
610 OCTAVE_CHECK_LIBRARY(qhull, QHull, 610 OCTAVE_CHECK_LIB(qhull, QHull,
611 [Qhull library not found -- this will result in loss of functionality of some geometry functions.], 611 [Qhull library not found -- this will result in loss of functionality of some geometry functions.],
612 [libqhull/libqhull.h qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], [qh_qhull], [], [], 612 [libqhull/libqhull.h qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], [qh_qhull], [], [],
613 [warn_qhull= 613 [warn_qhull=
614 OCTAVE_CHECK_QHULL_VERSION 614 OCTAVE_CHECK_QHULL_VERSION
615 OCTAVE_CHECK_QHULL_OK([TEXINFO_QHULL="@set HAVE_QHULL" 615 OCTAVE_CHECK_LIB_QHULL_OK([TEXINFO_QHULL="@set HAVE_QHULL"
616 AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], [ 616 AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], [
617 warn_qhull="Qhull library found, but does not seem to work properly -- this will result in loss of functionality of some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])]) 617 warn_qhull="Qhull library found, but does not seem to work properly -- this will result in loss of functionality of some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])])
618 618
619 ### Check for PCRE regex library. 619 ### Check for PCRE regex library.
620 620
658 AC_MSG_ERROR([$pcre_fail_msg]) 658 AC_MSG_ERROR([$pcre_fail_msg])
659 fi 659 fi
660 660
661 ### Check for ZLIB library. 661 ### Check for ZLIB library.
662 662
663 OCTAVE_CHECK_LIBRARY(z, ZLIB, 663 OCTAVE_CHECK_LIB(z, ZLIB,
664 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.], 664 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.],
665 [zlib.h], [gzclearerr]) 665 [zlib.h], [gzclearerr])
666 666
667 ### Check for the LLVM library 667 ### Check for the LLVM library
668 dnl 668 dnl
757 757
758 save_CPPFLAGS="$CPPFLAGS" 758 save_CPPFLAGS="$CPPFLAGS"
759 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" 759 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS"
760 save_LIBS="$LIBS" 760 save_LIBS="$LIBS"
761 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" 761 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS"
762 OCTAVE_CHECK_LIBRARY(hdf5, HDF5, 762 OCTAVE_CHECK_LIB(hdf5, HDF5,
763 [HDF5 library not found. Octave will not be able to save or load HDF5 data files.], 763 [HDF5 library not found. Octave will not be able to save or load HDF5 data files.],
764 [hdf5.h], [H5Gget_num_objs], [], [], 764 [hdf5.h], [H5Gget_num_objs], [], [],
765 [warn_hdf5= 765 [warn_hdf5=
766 OCTAVE_HDF5_HAS_ENFORCED_16_API 766 OCTAVE_CHECK_HDF5_HAS_VER_16_API
767 TEXINFO_HDF5="@set HAVE_HDF5" 767 TEXINFO_HDF5="@set HAVE_HDF5"
768 AC_DEFINE(HAVE_HDF5, 1, [Define to 1 if HDF5 is available and newer than version 1.6.]) 768 AC_DEFINE(HAVE_HDF5, 1,
769 [Define to 1 if HDF5 is available and newer than version 1.6.])
769 if test "$have_msvc" = "yes"; then 770 if test "$have_msvc" = "yes"; then
770 OCTAVE_HDF5_DLL 771 OCTAVE_CHECK_LIB_HDF5_DLL
771 fi 772 fi
772 ]) 773 ])
773 CPPFLAGS="$save_CPPFLAGS" 774 CPPFLAGS="$save_CPPFLAGS"
774 LIBS="$save_LIBS" 775 LIBS="$save_LIBS"
775 776
776 ### Check for FFTW library. Default to Fortran FFTPACK if it is not available. 777 ### Check for FFTW library. Default to Fortran FFTPACK if it is not available.
777 778
778 ## Check for FFTW header and library. 779 ## Check for FFTW header and library.
779 OCTAVE_CHECK_LIBRARY(fftw3, FFTW3, 780 OCTAVE_CHECK_LIB(fftw3, FFTW3,
780 [FFTW3 library not found. The slower FFTPACK library will be used instead.], 781 [FFTW3 library not found. The slower FFTPACK library will be used instead.],
781 [fftw3.h], [fftw_plan_dft_1d]) 782 [fftw3.h], [fftw_plan_dft_1d])
782 783
783 OCTAVE_CHECK_LIBRARY(fftw3f, FFTW3F, 784 OCTAVE_CHECK_LIB(fftw3f, FFTW3F,
784 [FFTW3F library not found. The slower FFTPACK library will be used instead.], 785 [FFTW3F library not found. The slower FFTPACK library will be used instead.],
785 [fftw3.h], [fftwf_plan_dft_1d]) 786 [fftw3.h], [fftwf_plan_dft_1d])
786 787
787 AM_CONDITIONAL([AMCOND_HAVE_FFTW], 788 AM_CONDITIONAL([AMCOND_HAVE_FFTW],
788 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) 789 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"])
795 796
796 save_CPPFLAGS="$CPPFLAGS" 797 save_CPPFLAGS="$CPPFLAGS"
797 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" 798 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS"
798 save_LIBS="$LIBS" 799 save_LIBS="$LIBS"
799 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" 800 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS"
800 OCTAVE_CHECK_LIBRARY(glpk, GLPK, 801 OCTAVE_CHECK_LIB(glpk, GLPK,
801 [GLPK library not found. The glpk function for solving linear programs will be disabled.], 802 [GLPK library not found. The glpk function for solving linear programs will be disabled.],
802 [glpk/glpk.h glpk.h], [_glp_lpx_simplex]) 803 [glpk/glpk.h glpk.h], [_glp_lpx_simplex])
803 LIBS="$save_LIBS" 804 LIBS="$save_LIBS"
804 CPPFLAGS="$save_CPPFLAGS" 805 CPPFLAGS="$save_CPPFLAGS"
805 806
807 808
808 save_CPPFLAGS="$CPPFLAGS" 809 save_CPPFLAGS="$CPPFLAGS"
809 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS" 810 CPPFLAGS="$Z_CPPFLAGS $CPPFLAGS"
810 save_LIBS="$LIBS" 811 save_LIBS="$LIBS"
811 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS" 812 LIBS="$Z_LDFLAGS $Z_LIBS $LIBS"
812 OCTAVE_CHECK_LIBRARY(curl, cURL, 813 OCTAVE_CHECK_LIB(curl, cURL,
813 [cURL library not found. The ftp objects, urlread and urlwrite functions will be disabled.], 814 [cURL library not found. The ftp objects, urlread and urlwrite functions will be disabled.],
814 [curl/curl.h], [curl_easy_escape]) 815 [curl/curl.h], [curl_easy_escape])
815 LIBS="$save_LIBS" 816 LIBS="$save_LIBS"
816 CPPFLAGS="$save_CPPFLAGS" 817 CPPFLAGS="$save_CPPFLAGS"
817 818
922 fi], 923 fi],
923 [check_opengl=true]) 924 [check_opengl=true])
924 925
925 ## Check for OpenGL library 926 ## Check for OpenGL library
926 if $check_opengl; then 927 if $check_opengl; then
927 OCTAVE_OPENGL 928 OCTAVE_CHECK_LIB_OPENGL
928 fi 929 fi
929 930
930 GRAPHICS_LIBS= 931 GRAPHICS_LIBS=
931 GRAPHICS_CFLAGS= 932 GRAPHICS_CFLAGS=
932 933
1173 1174
1174 ## No need to adjust FFLAGS because only link is attempted. 1175 ## No need to adjust FFLAGS because only link is attempted.
1175 ## Must supply proper LIBS, however. 1176 ## Must supply proper LIBS, however.
1176 save_LIBS="$LIBS" 1177 save_LIBS="$LIBS"
1177 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" 1178 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS"
1178 OCTAVE_CHECK_LIBRARY(qrupdate, qrupdate, 1179 OCTAVE_CHECK_LIB(qrupdate, qrupdate,
1179 [qrupdate not found. The QR & Cholesky updating functions will be slow.], 1180 [qrupdate not found. The QR & Cholesky updating functions will be slow.],
1180 [], 1181 [],
1181 [sqr1up], 1182 [sqr1up],
1182 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) 1183 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions])
1183 1184
1196 fi 1197 fi
1197 LIBS="$save_LIBS" 1198 LIBS="$save_LIBS"
1198 1199
1199 ### Check for AMD library 1200 ### Check for AMD library
1200 1201
1201 OCTAVE_CHECK_LIBRARY(amd, AMD, 1202 OCTAVE_CHECK_LIB(amd, AMD,
1202 [AMD library not found. This will result in some lack of functionality for sparse matrices.], 1203 [AMD library not found. This will result in some lack of functionality for sparse matrices.],
1203 [suitesparse/amd.h ufsparse/amd.h amd/amd.h amd.h], 1204 [suitesparse/amd.h ufsparse/amd.h amd/amd.h amd.h],
1204 [amd_postorder], 1205 [amd_postorder],
1205 [], [don't use AMD library, disable some sparse matrix functionality]) 1206 [], [don't use AMD library, disable some sparse matrix functionality])
1206 1207
1207 ### Check for CAMD library 1208 ### Check for CAMD library
1208 1209
1209 OCTAVE_CHECK_LIBRARY(camd, CAMD, 1210 OCTAVE_CHECK_LIB(camd, CAMD,
1210 [CAMD library not found. This will result in some lack of functionality for sparse matrices.], 1211 [CAMD library not found. This will result in some lack of functionality for sparse matrices.],
1211 [suitesparse/camd.h ufsparse/camd.h amd/camd.h camd.h], 1212 [suitesparse/camd.h ufsparse/camd.h amd/camd.h camd.h],
1212 [camd_postorder], 1213 [camd_postorder],
1213 [], [don't use CAMD library, disable some sparse matrix functionality]) 1214 [], [don't use CAMD library, disable some sparse matrix functionality])
1214 1215
1215 ### Check for COLAMD library 1216 ### Check for COLAMD library
1216 1217
1217 OCTAVE_CHECK_LIBRARY(colamd, COLAMD, 1218 OCTAVE_CHECK_LIB(colamd, COLAMD,
1218 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.], 1219 [COLAMD library not found. This will result in some lack of functionality for sparse matrices.],
1219 [suitesparse/colamd.h ufsparse/colamd.h amd/colamd.h colamd.h], 1220 [suitesparse/colamd.h ufsparse/colamd.h amd/colamd.h colamd.h],
1220 [colamd], 1221 [colamd],
1221 [], [don't use COLAMD library, disable some sparse matrix functionality]) 1222 [], [don't use COLAMD library, disable some sparse matrix functionality])
1222 1223
1223 ### Check for CCOLAMD library 1224 ### Check for CCOLAMD library
1224 1225
1225 OCTAVE_CHECK_LIBRARY(ccolamd, CCOLAMD, 1226 OCTAVE_CHECK_LIB(ccolamd, CCOLAMD,
1226 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.], 1227 [CCOLAMD library not found. This will result in some lack of functionality for sparse matrices.],
1227 [suitesparse/ccolamd.h ufsparse/ccolamd.h amd/ccolamd.h ccolamd.h], 1228 [suitesparse/ccolamd.h ufsparse/ccolamd.h amd/ccolamd.h ccolamd.h],
1228 [ccolamd], 1229 [ccolamd],
1229 [], [don't use CCOLAMD library, disable some sparse matrix functionality]) 1230 [], [don't use CCOLAMD library, disable some sparse matrix functionality])
1230 1231
1231 ### Check for CHOLMOD library. If your cholmod library requires cblas, 1232 ### Check for CHOLMOD library. If your cholmod library requires cblas,
1232 ### then you will need to configure with --with-cholmod="-lcholmod -lcblas". 1233 ### then you will need to configure with --with-cholmod="-lcholmod -lcblas".
1233 1234
1234 save_LIBS="$LIBS" 1235 save_LIBS="$LIBS"
1235 LIBS="$COLAMD_LDFLAGS $COLAMD_LIBS $AMD_LDFLAGS $AMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" 1236 LIBS="$COLAMD_LDFLAGS $COLAMD_LIBS $AMD_LDFLAGS $AMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS"
1236 OCTAVE_CHECK_LIBRARY(cholmod, CHOLMOD, 1237 OCTAVE_CHECK_LIB(cholmod, CHOLMOD,
1237 [CHOLMOD library not found. This will result in some lack of functionality for sparse matrices.], 1238 [CHOLMOD library not found. This will result in some lack of functionality for sparse matrices.],
1238 [suitesparse/cholmod.h ufsparse/cholmod.h cholmod/cholmod.h cholmod.h], 1239 [suitesparse/cholmod.h ufsparse/cholmod.h cholmod/cholmod.h cholmod.h],
1239 [cholmod_start], 1240 [cholmod_start],
1240 [], [don't use CHOLMOD library, disable some sparse matrix functionality]) 1241 [], [don't use CHOLMOD library, disable some sparse matrix functionality])
1241 LIBS="$save_LIBS" 1242 LIBS="$save_LIBS"
1242 1243
1243 ### Check for CXSparse library 1244 ### Check for CXSparse library
1244 1245
1245 OCTAVE_CHECK_LIBRARY(cxsparse, CXSparse, 1246 OCTAVE_CHECK_LIB(cxsparse, CXSparse,
1246 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.], 1247 [CXSparse library not found. This will result in some lack of functionality for sparse matrices.],
1247 [suitesparse/cs.h ufsparse/cs.h amd/cs.h cs.h], 1248 [suitesparse/cs.h ufsparse/cs.h amd/cs.h cs.h],
1248 [cs_di_sqr], 1249 [cs_di_sqr],
1249 [C++], [don't use CXSparse library, disable some sparse matrix functionality]) 1250 [C++], [don't use CXSparse library, disable some sparse matrix functionality])
1250 1251
1252 1253
1253 save_LIBS="$LIBS" 1254 save_LIBS="$LIBS"
1254 save_CPPFLAGS="$CPPFLAGS" 1255 save_CPPFLAGS="$CPPFLAGS"
1255 LIBS="$AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" 1256 LIBS="$AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
1256 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS" 1257 CPPFLAGS="$AMD_CPPFLAGS $CPPFLAGS"
1257 OCTAVE_CHECK_LIBRARY(umfpack, UMFPACK, 1258 OCTAVE_CHECK_LIB(umfpack, UMFPACK,
1258 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], 1259 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.],
1259 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], 1260 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h],
1260 [umfpack_zi_get_determinant], 1261 [umfpack_zi_get_determinant],
1261 [], [don't use UMFPACK, disable some sparse matrix functionality]) 1262 [], [don't use UMFPACK, disable some sparse matrix functionality])
1262 CPPFLAGS="$save_CPPFLAGS" 1263 CPPFLAGS="$save_CPPFLAGS"
1265 if test -z "$UMFPACK_LIBS"; then 1266 if test -z "$UMFPACK_LIBS"; then
1266 ## Invalidate the cache and try again with -lcblas. 1267 ## Invalidate the cache and try again with -lcblas.
1267 $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant 1268 $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant
1268 save_LIBS="$LIBS" 1269 save_LIBS="$LIBS"
1269 LIBS="-lcblas $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" 1270 LIBS="-lcblas $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
1270 OCTAVE_CHECK_LIBRARY(umfpack, UMFPACK, 1271 OCTAVE_CHECK_LIB(umfpack, UMFPACK,
1271 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], 1272 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.],
1272 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], 1273 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h],
1273 [umfpack_zi_get_determinant], 1274 [umfpack_zi_get_determinant],
1274 [], [don't use UMFPACK, disable some sparse matrix functionality]) 1275 [], [don't use UMFPACK, disable some sparse matrix functionality])
1275 if test -n "$UMFPACK_LIBS"; then 1276 if test -n "$UMFPACK_LIBS"; then
1279 fi 1280 fi
1280 1281
1281 if test -n "$UMFPACK_LIBS"; then 1282 if test -n "$UMFPACK_LIBS"; then
1282 save_LIBS="$LIBS"; 1283 save_LIBS="$LIBS";
1283 LIBS="$UMFPACK_LIBS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" 1284 LIBS="$UMFPACK_LIBS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
1284 OCTAVE_UMFPACK_SEPERATE_SPLIT 1285 OCTAVE_UMFPACK_SEPARATE_SPLIT
1285 LIBS="$save_LIBS" 1286 LIBS="$save_LIBS"
1286 fi 1287 fi
1287 1288
1288 ### Check for ARPACK library. 1289 ### Check for ARPACK library.
1289 1290
1290 save_LIBS="$LIBS" 1291 save_LIBS="$LIBS"
1291 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS" 1292 LIBS="$LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS"
1292 OCTAVE_CHECK_LIBRARY(arpack, ARPACK, 1293 OCTAVE_CHECK_LIB(arpack, ARPACK,
1293 [ARPACK not found. The eigs function will be disabled.], 1294 [ARPACK not found. The eigs function will be disabled.],
1294 [], 1295 [],
1295 [dseupd], 1296 [dseupd],
1296 [Fortran 77], [don't use the ARPACK library, disable eigs function], 1297 [Fortran 77], [don't use the ARPACK library, disable eigs function],
1297 [warn_arpack= 1298 [warn_arpack=
1298 OCTAVE_CHECK_ARPACK_OK([ 1299 OCTAVE_CHECK_LIB_ARPACK_OK([
1299 AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], [ 1300 AC_DEFINE(HAVE_ARPACK, 1, [Define to 1 if ARPACK is available.])], [
1300 warn_arpack="ARPACK library found, but does not seem to work properly -- disabling eigs function"])]) 1301 warn_arpack="ARPACK library found, but does not seem to work properly -- disabling eigs function"])])
1301 LIBS="$save_LIBS" 1302 LIBS="$save_LIBS"
1302 1303
1303 ### Check for readline library. 1304 ### Check for readline library.
1833 1834
1834 ## Does reinterpret_cast fail for function pointers? 1835 ## Does reinterpret_cast fail for function pointers?
1835 OCTAVE_CXX_BROKEN_REINTERPRET_CAST 1836 OCTAVE_CXX_BROKEN_REINTERPRET_CAST
1836 1837
1837 ## Check if C++ compiler allows placement delete. 1838 ## Check if C++ compiler allows placement delete.
1838 OCTAVE_PLACEMENT_DELETE 1839 OCTAVE_CXX_PLACEMENT_DELETE
1839 1840
1840 ## Check if C++ compiler can auto allocate variable sized arrays. 1841 ## Check if C++ compiler can auto allocate variable sized arrays.
1841 OCTAVE_DYNAMIC_AUTO_ARRAYS 1842 OCTAVE_CXX_DYNAMIC_AUTO_ARRAYS
1842 1843
1843 ## Check that C compiler and libraries support IEEE754 data format. 1844 ## Check that C compiler and libraries support IEEE754 data format.
1844 OCTAVE_IEEE754_DATA_FORMAT 1845 OCTAVE_IEEE754_DATA_FORMAT
1845 1846
1846 ## Is C++ runtime library ISO compliant? 1847 ## Is C++ runtime library ISO compliant?
1861 ## Does the C compiler handle alloca() and const correctly? 1862 ## Does the C compiler handle alloca() and const correctly?
1862 AC_FUNC_ALLOCA 1863 AC_FUNC_ALLOCA
1863 1864
1864 ## Does the C compiler support Automake subdir-objects option? 1865 ## Does the C compiler support Automake subdir-objects option?
1865 AM_PROG_CC_C_O 1866 AM_PROG_CC_C_O
1867
1868 ### gnulib initialization: part 2
1869 ### After all include and path modifications have taken place
1870 ### and at the same priority level as function checks.
1871
1872 gl_INIT
1866 1873
1867 ### Checks for functions and variables. 1874 ### Checks for functions and variables.
1868 1875
1869 AC_CHECK_FUNCS(basename canonicalize_file_name \ 1876 AC_CHECK_FUNCS(basename canonicalize_file_name \
1870 chmod dup2 endgrent endpwent execvp expm1 expm1f fork \ 1877 chmod dup2 endgrent endpwent execvp expm1 expm1f fork \
1901 ]) 1908 ])
1902 AC_LANG_POP(C++) 1909 AC_LANG_POP(C++)
1903 1910
1904 ## Look in <cmath> for the IEEE functions isnan, isinf, isfinite that we need. 1911 ## Look in <cmath> for the IEEE functions isnan, isinf, isfinite that we need.
1905 1912
1906 OCTAVE_CMATH_FUNC(isnan) 1913 OCTAVE_CHECK_FUNC_CMATH(isnan)
1907 OCTAVE_CMATH_FUNC(isinf) 1914 OCTAVE_CHECK_FUNC_CMATH(isinf)
1908 OCTAVE_CMATH_FUNC(isfinite) 1915 OCTAVE_CHECK_FUNC_CMATH(isfinite)
1909 1916
1910 dnl Would like to get rid of this cruft, and just have 1917 dnl Would like to get rid of this cruft, and just have
1911 dnl 1918 dnl
1912 dnl AC_CHECK_FUNCS(finite isnan isinf) 1919 dnl AC_CHECK_FUNCS(finite isnan isinf)
1913 dnl 1920 dnl
1986 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, [Define to 1 if your struct rusage only has time information.]) 1993 AC_DEFINE(RUSAGE_TIMES_ONLY, 1, [Define to 1 if your struct rusage only has time information.])
1987 ;; 1994 ;;
1988 esac 1995 esac
1989 1996
1990 ## Check for CGDisplayBitsPerPixel function on Mac OSX systems with Carbon 1997 ## Check for CGDisplayBitsPerPixel function on Mac OSX systems with Carbon
1991 OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL 1998 if test $have_framework_carbon = "yes"; then
1999 OCTAVE_CARBON_CGDISPLAYBITSPERPIXEL
2000 fi
1992 2001
1993 OCTAVE_SMART_PUTENV 2002 OCTAVE_SMART_PUTENV
1994 2003
1995 AC_CHECK_FUNCS(getpwnam, [], [AC_CHECK_LIB(sun, getpwnam)]) 2004 AC_CHECK_FUNCS(getpwnam, [], [AC_CHECK_LIB(sun, getpwnam)])
1996 2005
1997 AC_FUNC_CLOSEDIR_VOID 2006 AC_FUNC_CLOSEDIR_VOID
1998 2007
1999 ## Return type of matherr() 2008 ## Check return type of matherr()
2000 AC_MSG_CHECKING([for struct exception in math.h]) 2009 AC_CACHE_CHECK([for struct exception in math.h],
2001 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], 2010 [octave_cv_func_matherr_type],
2002 [[struct exception *x; x->type; x->name;]])], 2011 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
2003 [AC_MSG_RESULT(yes) 2012 #include <math.h>
2004 AC_DEFINE(EXCEPTION_IN_MATH, 1, 2013 ]], [[
2005 [Define to 1 if your math.h declares struct exception for matherr().])], 2014 struct exception *x;
2006 [AC_MSG_RESULT(no)]) 2015 x->type;
2007 2016 x->name;
2017 ]])],
2018 octave_cv_func_matherr_type=yes,
2019 octave_cv_func_matherr_type=no)
2020 ])
2021 if test $octave_cv_func_matherr_type = "yes"; then
2022 AC_DEFINE(EXCEPTION_IN_MATH, 1,
2023 [Define to 1 if math.h declares struct exception for matherr().])
2024 fi
2025
2008 ## Signal stuff. 2026 ## Signal stuff.
2009 2027
2010 AC_CHECK_DECLS([sys_siglist], [], [], 2028 AC_CHECK_DECLS([sys_siglist], [], [],
2011 [#include <signal.h> 2029 [#include <signal.h>
2012 /* NetBSD declares sys_siglist in unistd.h. */ 2030 /* NetBSD declares sys_siglist in unistd.h. */