1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235
|
Author: Paul Brossier
Last-Update: 2008-05-14 11:23:40 +0200
Description: Adapt to modern autoconf
--- fftw-2.1.3.orig/configure.in
+++ fftw-2.1.3/configure.in
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(fftw/planner.c)
AM_INIT_AUTOMAKE(fftw, 2.1.3)
+AM_MAINTAINER_MODE
dnl This is the version info according to the libtool versioning system.
dnl It does *not* correspond to the release number.
@@ -23,7 +24,7 @@
AC_ARG_ENABLE(float, [ --enable-float compile fftw for single precision], enable_float=$enableval, enable_float=no)
if test "$enable_float" = "yes"; then
- AC_DEFINE(FFTW_ENABLE_FLOAT)
+ AC_DEFINE(FFTW_ENABLE_FLOAT,1,[Compile fftw for single precision])
fi
FFTW_PREFIX=""
@@ -42,38 +43,39 @@
FFTW_PREFIX="$ok"
AC_MSG_RESULT($FFTW_PREFIX)
fi
-ACX_SUBST_XXX(FFTW_PREFIX)
+dnl ACX_SUBST_XXX(FFTW_PREFIX)
AC_SUBST(FFTW_PREFIX)
FFTW_PREFIX1="xyz"
if test -n "$FFTW_PREFIX"; then
FFTW_PREFIX1="$FFTW_PREFIX"
fi
-ACX_SUBST_XXX(FFTW_PREFIX1)
+dnl ACX_SUBST_XXX(FFTW_PREFIX1)
+AC_SUBST(FFTW_PREFIX1)
AC_ARG_ENABLE(i386-hacks, [ --enable-i386-hacks enable gcc/x86 specific performance hacks], ok=$enableval, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(FFTW_ENABLE_I386_HACKS)
+ AC_DEFINE(FFTW_ENABLE_I386_HACKS,1,[enable gcc/x86 specific performance hacks])
fi
AC_ARG_ENABLE(pentium-timer, [ --enable-pentium-timer enable high resolution Pentium timer], ok=$enableval, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER)
+ AC_DEFINE(FFTW_ENABLE_PENTIUM_TIMER,1,[enable high resolution Pentium timer])
fi
AC_ARG_ENABLE(debug, [ --enable-debug compile fftw with extra runtime checks for debugging], ok=$enableval, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(FFTW_DEBUG)
+ AC_DEFINE(FFTW_DEBUG,1,[Define to compile fftw with extra runtime checks for debugging])
fi
AC_ARG_ENABLE(debug-alignment, [ --enable-debug-alignment enable runtime checks for alignment on x86], ok=$enableval, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(FFTW_DEBUG_ALIGNMENT)
+ AC_DEFINE(FFTW_DEBUG_ALIGNMENT,1,[Define to enable runtime checks for alignement onx86])
fi
AC_ARG_ENABLE(vec-recurse, [ --enable-vec-recurse enable experimental performance hack], ok=$enableval, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE)
+ AC_DEFINE(FFTW_ENABLE_VECTOR_RECURSE,1,[Define to enable experimental performance hack])
fi
dnl -----------------------------------------------------------------------
@@ -87,7 +89,7 @@
ACX_PROG_CC_EGCS
AC_PROG_INSTALL
AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+# AC_PROG_RANLIB
AC_PROG_LN_S
AM_PROG_LIBTOOL
AC_CHECK_PROG(PERL, perl, perl, echo perl)
@@ -110,7 +112,7 @@
dnl -----------------------------------------------------------------------
AC_SUBST(SHARED_VERSION_INFO)
-AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION")
+AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION", [Fftw Version])
# Get the version number that will be appended to shared libraries:
SHARED_VERSION=`echo $SHARED_VERSION_INFO | awk -F':' '{ print $1 "." $3 "." $2 }'`
@@ -118,7 +120,7 @@
ACX_PROG_CC_MAXOPT
-ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK), [
+ACX_GCC_ALIGNS_STACK(AC_DEFINE(FFTW_GCC_ALIGNS_STACK,1,[Gcc align stack]), [
if test "$enable_i386_hacks" = yes; then
if test "${acx_gcc_stack_align_bug-no}" = yes; then
# we are using a gcc with a stack alignment bug, and we should
@@ -171,7 +173,7 @@
AC_TRY_LINK([#include <math.h>
], if (!isnan(3.14159)) isnan(2.7183);, ok=yes, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(HAVE_ISNAN)
+ AC_DEFINE(HAVE_ISNAN,1,[Have isnan])
fi
AC_MSG_RESULT(${ok})
@@ -184,7 +186,7 @@
#endif
], [hrtime_t foobar;], ok=yes, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(HAVE_HRTIME_T)
+ AC_DEFINE(HAVE_HRTIME_T,1,[Have hrtime_t type])
fi
AC_MSG_RESULT(${ok})
@@ -193,7 +195,7 @@
AC_ARG_ENABLE(unsafe-mulmod, [ --enable-unsafe-mulmod risk overflow for large prime sizes], enable_unsafe_mulmod=$enableval, enable_unsafe_mulmod=no)
if test "$enable_unsafe_mulmod" = "yes"; then
- AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD)
+ AC_DEFINE(FFTW_ENABLE_UNSAFE_MULMOD,1,[Risk overflow for large prime sizes])
fi
@@ -218,7 +220,7 @@
if test -z "$THREADLIBS"; then
AC_CHECK_LIB(pthreads, pthread_attr_init,
[THREADLIBS="-lpthreads"
- AC_DEFINE(FFTW_USING_POSIX_THREADS)])
+ AC_DEFINE(FFTW_USING_POSIX_THREADS,1,[Using Posix threads])])
fi
# Normally (e.g. on Linux), POSIX threads are in -lpthread.
# We can't just use AC_CHECK_LIB, though, because DEC lossage
@@ -233,7 +235,7 @@
LIBS="$save_LIBS"
if test "$ok" = "yes"; then
THREADLIBS="-lpthread"
- AC_DEFINE(FFTW_USING_POSIX_THREADS)
+ AC_DEFINE(FFTW_USING_POSIX_THREADS,1,[Using Posix threads])
fi
AC_MSG_RESULT(${ok})
fi
@@ -242,12 +244,12 @@
if test -z "$THREADLIBS"; then
AC_CHECK_LIB(pthread, pthread_join,
[THREADLIBS="-lpthread"
- AC_DEFINE(FFTW_USING_POSIX_THREADS)])
+ AC_DEFINE(FFTW_USING_POSIX_THREADS,1,[Using Posix threads])])
fi
if test -z "$THREADLIBS"; then
AC_CHECK_FUNC(pthread_create,
[THREADLIBS=" "
- AC_DEFINE(FFTW_USING_POSIX_THREADS)])
+ AC_DEFINE(FFTW_USING_POSIX_THREADS,1,[Using Posix threads])])
fi
if test -n "$THREADLIBS"; then
# detect AIX lossage: threads are created detached by default
@@ -257,7 +259,7 @@
[int attr=PTHREAD_CREATE_UNDETACHED;],
ok=yes, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(HAVE_PTHREAD_CREATE_UNDETACHED)
+ AC_DEFINE(HAVE_PTHREAD_CREATE_UNDETACHED,1,[Have pthread create undetached])
fi
AC_MSG_RESULT(${ok})
@@ -271,7 +273,7 @@
# do this as well, especially if cc_r is not available.)
AC_MSG_CHECKING([if special flags are required for pthreads])
ok=no
- AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_CANONICAL_HOST
case "${host_cpu}-${host_os}" in
*-aix*) CFLAGS="-D_THREAD_SAFE $CFLAGS"
ok="-D_THREAD_SAFE";;
@@ -284,32 +286,32 @@
if test -z "$THREADLIBS"; then
AC_CHECK_LIB(thread, thr_create,
[THREADLIBS="-lthread"
- AC_DEFINE(FFTW_USING_SOLARIS_THREADS)])
+ AC_DEFINE(FFTW_USING_SOLARIS_THREADS,1,[Using Solaris threads])])
fi
# Mach C threads:
if test -z "$THREADLIBS"; then
AC_CHECK_FUNC(cthread_fork,
[THREADLIBS=" "
- AC_DEFINE(FFTW_USING_MACH_THREADS)])
+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach threads])])
AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h)
fi
if test -z "$THREADLIBS"; then
AC_CHECK_LIB(cthread, cthread_fork,
[THREADLIBS="-lcthread"
- AC_DEFINE(FFTW_USING_MACH_THREADS)])
+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach threads])])
AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h)
fi
if test -z "$THREADLIBS"; then
AC_CHECK_LIB(cthreads, cthread_fork,
[THREADLIBS="-lcthreads"
- AC_DEFINE(FFTW_USING_MACH_THREADS)])
+ AC_DEFINE(FFTW_USING_MACH_THREADS,1,[Using Mach threads])])
AC_CHECK_HEADERS(mach/cthreads.h cthreads.h cthread.h)
fi
# BeOS threads:
if test -z "$THREADLIBS"; then
AC_CHECK_FUNC(spawn_thread,
[THREADLIBS=" "
- AC_DEFINE(FFTW_USING_BEOS_THREADS)])
+ AC_DEFINE(FFTW_USING_BEOS_THREADS,1,[Using BeOS threads])])
fi
if test -z "$THREADLIBS"; then
AC_MSG_ERROR(couldn't find threads library for --enable-threads)
@@ -335,9 +337,9 @@
if test "$enable_mpi" = "yes"; then
save_CC="$CC"
CC="$MPICC"
- if test -z "$MPILIBS"; then
- AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])
- fi
+ #if test -z "$MPILIBS"; then
+ # AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])
+ #fi
if test -z "$MPILIBS"; then
AC_CHECK_LIB(mpi, MPI_Init, [MPILIBS="-lmpi"])
fi
@@ -352,7 +354,7 @@
AC_MSG_CHECKING([for MPI_Comm_f2c])
ok=yes
AC_TRY_LINK([#include <mpi.h>
- ], MPI_Comm_f2c(0);, AC_DEFINE(HAVE_MPI_COMM_F2C), ok=no)
+ ], MPI_Comm_f2c(0);, AC_DEFINE(HAVE_MPI_COMM_F2C,1,[Have MPI_Comm_f2c]), ok=no)
AC_MSG_RESULT($ok)
fi
CC="$save_CC"
|