Mercurial > octave-nkf
comparison build-aux/common.mk @ 15969:139f4b19a3ac
build: Improve detection of FFTW multi-threading
* build-aux/common.mk: Remove FFTW3_THREADS_LIBS and FFTW3F_THREADS_LIB.
* m4/acinclude.m4 (OCTAVE_CHECK_FFTW_THREADS): New macro to encapsulate
checking for multi-threading support in the FFTW library.
* configure.ac: Call it.
author | Mike Miller <mtmiller@ieee.org> |
---|---|
date | Mon, 21 Jan 2013 01:58:07 -0500 |
parents | f6d755f2ae9e |
children | e27d9b9b71f4 |
comparison
equal
deleted
inserted
replaced
15966:d56dd6794a20 | 15969:139f4b19a3ac |
---|---|
218 FFTW3F_LDFLAGS = @FFTW3F_LDFLAGS@ | 218 FFTW3F_LDFLAGS = @FFTW3F_LDFLAGS@ |
219 FFTW3F_LIBS = @FFTW3F_LIBS@ | 219 FFTW3F_LIBS = @FFTW3F_LIBS@ |
220 | 220 |
221 FFTW_XCPPFLAGS = $(FFTW3_CPPFLAGS) $(FFTW3F_CPPFLAGS) | 221 FFTW_XCPPFLAGS = $(FFTW3_CPPFLAGS) $(FFTW3F_CPPFLAGS) |
222 FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS) | 222 FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS) |
223 FFTW_XLIBS = $(FFTW3_THREADS_LIBS) $(FFTW3F_THREADS_LIBS) $(FFTW3_LIBS) $(FFTW3F_LIBS) | 223 FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS) |
224 | 224 |
225 FT2_CFLAGS = @FT2_CFLAGS@ | 225 FT2_CFLAGS = @FT2_CFLAGS@ |
226 FT2_LIBS = @FT2_LIBS@ | 226 FT2_LIBS = @FT2_LIBS@ |
227 | 227 |
228 GLPK_CPPFLAGS = @GLPK_CPPFLAGS@ | 228 GLPK_CPPFLAGS = @GLPK_CPPFLAGS@ |