diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2011-08-24 18:46:25 -0700 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:37 +0100 |
| commit | 819a380195c63640e1f95058dc73596259ee49f5 (patch) | |
| tree | 49078511ee686dddf38413a544a3a5de3d66e69a /configure.ac | |
| parent | 3942b5dcae527b696e243ce6f7771cbb4ba6c907 (diff) | |
Improve check for FFTW
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 01a89553..9f5ab51b 100644 --- a/configure.ac +++ b/configure.ac @@ -230,18 +230,15 @@ AC_CHECK_LIB([rt], [clock_gettime], ]) -AC_CHECK_LIB([fftw3], [fftw_plan_dft_r2c_1d], +PKG_CHECK_MODULES([FFTW], [fftw3], [ - AC_DEFINE([HAVE_FFTW], [1], - [Define to 1 if FFTW is available.]) - FFTW_LIBS="-lfftw3" have_fftw=true + AC_DEFINE([HAVE_FFTW], [1], [Define to 1 if FFTW is available]) ], [ AC_MSG_WARN([ReAx indexing will not be available.]) have_fftw=false ]) - dnl Conditionals... AM_CONDITIONAL([HAVE_OPENCL], test x$have_opencl = xtrue) @@ -261,7 +258,7 @@ gl_IGNORE_UNUSED_LIBRARIES CFLAGS="$CFLAGS $HDF5_CFLAGS $GSL_CFLAGS $OPENCL_CFLAGS -pthread $GTK_CFLAGS" CFLAGS="$CFLAGS $LIBTIFF_CFLAGS -D_GNU_SOURCE $libPNG_CFLAGS $Cairo_CFLAGS" -CFLAGS="$CFLAGS $GDK_pixbuf_CFLAGS $GDK_pixbuf_2_CFLAGS" +CFLAGS="$CFLAGS $GDK_pixbuf_CFLAGS $GDK_pixbuf_2_CFLAGS $FFTW_CFLAGS" LIBS="$LIBS $HDF5_LIBS -lm -lz $GSL_LIBS $GTK_LIBS $OPENCL_LIBS -pthread" LIBS="$LIBS $LIBTIFF_LIBS $libPNG_LIBS $Cairo_LIBS $GDK_pixbuf_LIBS" |