Mercurial > hg > octave-lyh

comparison configure.ac @ 16332:5293cee91891

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
conditionally define HAVE_FFTW and HAVE_ZLIB in config.h * configure.ac: Conditionally define HAVE_FFTW and HAVE_ZLIB in config.h instead of defining them in oct-conf-post.h.
author John W. Eaton <jwe@octave.org>
date Sun, 17 Mar 2013 05:12:56 -0400
parents 306e0ac231d0
children effe80808118
comparison
equal deleted inserted replaced
16331:8b70f6118a5e 16332:5293cee91891
692 692
693 OCTAVE_CHECK_LIB(z, ZLIB, 693 OCTAVE_CHECK_LIB(z, ZLIB,
694 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.], 694 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.],
695 [zlib.h], [gzclearerr]) 695 [zlib.h], [gzclearerr])
696 696
697 ### Also define HAVE_ZLIB if libz is found.
698 if test $octave_cv_lib_z = yes; then
699 AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.])
700 fi
701
697 ### Check for the LLVM library 702 ### Check for the LLVM library
698 703
699 build_jit=no 704 build_jit=no
700 AC_ARG_ENABLE([jit], 705 AC_ARG_ENABLE([jit],
701 [AS_HELP_STRING([--enable-jit], 706 [AS_HELP_STRING([--enable-jit],
821 if test $build_fftw_threads = yes; then 826 if test $build_fftw_threads = yes; then
822 OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads) 827 OCTAVE_CHECK_FFTW_THREADS(fftw3, fftw_plan_with_nthreads)
823 OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads) 828 OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads)
824 fi 829 fi
825 830
831 ## Octave is currently unable to use FFTW unless both float
832 ## and double versions are available.
833
826 AM_CONDITIONAL([AMCOND_HAVE_FFTW], 834 AM_CONDITIONAL([AMCOND_HAVE_FFTW],
827 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"]) 835 [test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"])
836
837 if test -n "$FFTW3_LIBS" && test -n "$FFTW3F_LIBS"; then
838 AC_DEFINE(HAVE_FFTW, 1, [Define if you have both FFTW3 and FFTW3F libraries.])
839 fi
828 840
829 ## Subdirectory of liboctave/cruft to build if FFTW is not found. 841 ## Subdirectory of liboctave/cruft to build if FFTW is not found.
830 FFT_DIR="fftpack" 842 FFT_DIR="fftpack"
831 AC_SUBST(FFT_DIR) 843 AC_SUBST(FFT_DIR)
832 844