From 1a645b8807a2e55372a02ec50d71a8134968626d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Tue, 22 Jul 2008 13:39:32 +0000 Subject: added check for fftw3; use config.h for extended configuration svn path=/trunk/externals/iem/iemmatrix/; revision=10203 --- src/config.h.in | 10 ++++++++++ src/configure.ac | 12 ++++++++---- src/iemmatrix.h | 5 +++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 src/config.h.in diff --git a/src/config.h.in b/src/config.h.in new file mode 100644 index 0000000..1f8be77 --- /dev/null +++ b/src/config.h.in @@ -0,0 +1,10 @@ +#ifndef CONFIG_H_ +#define CONFIG_H_ + + +/* do we have fftw3 installed? */ +#undef HAVE_FFTW3_H + + + +#endif /* CONFIG_H_ */ diff --git a/src/configure.ac b/src/configure.ac index 6b6320c..c36746e 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,6 +1,10 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(iemmatrix.c) +AC_CONFIG_HEADER(config.h) +DFLAGS="${DFLAGS} -DHAVE_CONFIG_H" + + dnl Checks for programs. AC_PROG_CC @@ -63,7 +67,7 @@ AC_CHECK_LIB(m, main) dnl Replace `main' with a function in -lpthread: dnl AC_CHECK_LIB(pthread, main) dnl Replace `main' with a function in -lstk: -dnl AC_CHECK_LIB(stk, main, STK=yes) +AC_CHECK_LIB(fftw3, fftw_destroy_plan) if test "x$with_pd" != "x"; then @@ -92,7 +96,7 @@ AC_CHECK_LIB(pd, nullfn) dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h) +AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h fftw3.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_HEADER_TIME @@ -208,7 +212,7 @@ then -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -shared -rdata_shared" EXT=pd_irix6 - dnl DFLAGS="-DUNIX -DIRIX6" + dnl DFLAGS="-DUNIX -DIRIX6 ${DFLAGS}" STRIPFLAGS="--strip-unneeded" if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); @@ -224,7 +228,7 @@ then LDFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared" EXT=pd_irix5 - dnl DFLAGS="-DUNIX -DIRIX5" + dnl DFLAGS="-DUNIX -DIRIX5 ${DFLAGS}" STRIPFLAGS="--strip-unneeded" if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); diff --git a/src/iemmatrix.h b/src/iemmatrix.h index 2e9eb13..5021ed0 100644 --- a/src/iemmatrix.h +++ b/src/iemmatrix.h @@ -53,6 +53,11 @@ #include "m_pd.h" + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + #define VERSION "0.1" -- cgit v1.2.1