comparison oct-conf-post.in.h @ 16332:5293cee91891

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 d63878346099
comparison
equal deleted inserted replaced
16331:8b70f6118a5e 16332:5293cee91891
110 #define OCTAVE_INT_USE_LONG_DOUBLE 110 #define OCTAVE_INT_USE_LONG_DOUBLE
111 #endif 111 #endif
112 112
113 #define OCTAVE_EMPTY_CPP_ARG 113 #define OCTAVE_EMPTY_CPP_ARG
114 114
115 /* Octave is currently unable to use FFTW unless both float
116 and double versions are available. */
117 #if defined (HAVE_FFTW3) && defined (HAVE_FFTW3F)
118 #define HAVE_FFTW
119 #endif
120
121 /* Backward compatibility. */
122 #if defined (HAVE_Z)
123 #define HAVE_ZLIB
124 #endif
125
126 /* oct-dlldefs.h */ 115 /* oct-dlldefs.h */
127 116
128 #if defined (_MSC_VER) 117 #if defined (_MSC_VER)
129 #define OCTAVE_EXPORT __declspec(dllexport) 118 #define OCTAVE_EXPORT __declspec(dllexport)
130 #define OCTAVE_IMPORT __declspec(dllimport) 119 #define OCTAVE_IMPORT __declspec(dllimport)