Mercurial > hg > octave-nkf

diff mkoctfile.in @ 9538:d0239bddf621

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use OCTAVE_CHECK_LIB to check for zlib
author John W. Eaton <jwe@octave.org>
date Mon, 17 Aug 2009 19:52:18 -0400
parents eee9b3150446
children 0d4613a736e9
line wrap: on
line diff
--- a/mkoctfile.in
+++ b/mkoctfile.in
@@ -93,7 +93,10 @@
 : ${READLINE_LIBS=-lreadline}
 : ${LIBCRUFT=-lcruft}
 : ${BLAS_LIBS=%OCTAVE_CONF_BLAS_LIBS%}
-: ${FFTW_LIBS=%OCTAVE_CONF_FFTW_LIBS%}
+: ${FFTW3_LDFLAGS=%OCTAVE_CONF_FFTW3_LDFLAGS%}
+: ${FFTW3_LIBS=%OCTAVE_CONF_FFTW3_LIBS%}
+: ${FFTW3F_LDFLAGS=%OCTAVE_CONF_FFTW3F_LDFLAGS%}
+: ${FFTW3F_LIBS=%OCTAVE_CONF_FFTW3F_LIBS%}
 : ${LIBS=%OCTAVE_CONF_LIBS%}
 : ${FLIBS=%OCTAVE_CONF_FLIBS%}
 : ${LD_CXX=%OCTAVE_CONF_LD_CXX%}
@@ -113,6 +116,8 @@
 
 # Local variables.
 
+FFTW_LIBS="$FFTW3_LDFLAGS $FFTW3_LIBS $FFTW3F_LDFLAGS $FFTW3F_LIBS"
+
 usage_msg="usage: mkoctfile [options] file ..."
 
 version_msg="mkoctfile, version $OCTAVE_VERSION"