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
|
--- configure.in.orig 2003-03-24 16:01:13.000000000 +0900
+++ configure.in 2012-03-12 23:00:58.000000000 +0900
@@ -23,11 +23,13 @@
AC_ARG_WITH(gcc, [ --with-gcc use gcc instead of the native compiler cc], ok=$withval, ok=no)
if test "$ok" = "yes"; then
CC=gcc
+else
+ CC=$withval
fi
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],[],[desc])
fi
FFTW_PREFIX=""
@@ -56,27 +58,27 @@
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],[],[desc])
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],[],[desc])
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],[],[desc])
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],[],[desc])
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],[],[desc])
fi
dnl -----------------------------------------------------------------------
@@ -95,6 +97,7 @@
AM_PROG_LIBTOOL
AC_CHECK_PROG(PERL, perl, perl, echo perl)
AC_SUBST(PERL)
+AC_SUBST(CC)
dnl -----------------------------------------------------------------------
@@ -115,7 +118,7 @@
dnl -----------------------------------------------------------------------
AC_SUBST(SHARED_VERSION_INFO)
-AC_DEFINE_UNQUOTED(FFTW_VERSION, "$VERSION")
+AC_DEFINE_UNQUOTED([FFTW_VERSION], "$VERSION",[Version])
# Get the version number that will be appended to shared libraries:
SHARED_VERSION=`echo $SHARED_VERSION_INFO | awk -F':' '{ print $1 "." $3 "." $2 }'`
@@ -123,7 +126,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],[],[desc]), [
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
@@ -183,7 +186,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],[],[desc])
fi
AC_MSG_RESULT(${ok})
@@ -196,7 +199,7 @@
#endif
], [hrtime_t foobar;], ok=yes, ok=no)
if test "$ok" = "yes"; then
- AC_DEFINE(HAVE_HRTIME_T)
+ AC_DEFINE([HAVE_HRTIME_T],[],[desc])
fi
AC_MSG_RESULT(${ok})
@@ -205,7 +208,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],[],[desc])
fi
@@ -243,7 +246,7 @@
if test -z "$THREADLIBS"; then
AC_MSG_ERROR([don't know how to enable OpenMP])
fi
- AC_DEFINE(FFTW_USING_OPENMP_THREADS)
+ AC_DEFINE([FFTW_USING_OPENMP_THREADS],[],[desc])
fi
if test "$with_sgimp"x != nox; then
AC_MSG_CHECKING(how to enable SGI MP)
@@ -261,7 +264,7 @@
if test -z "$THREADLIBS"; then
AC_MSG_ERROR([don't know how to enable SGI MP])
fi
- AC_DEFINE(FFTW_USING_SGIMP_THREADS)
+ AC_DEFINE([FFTW_USING_SGIMP_THREADS],[],[desc])
fi
# POSIX threads, the default choice:
@@ -270,38 +273,38 @@
ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS "
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
- AC_DEFINE(FFTW_USING_POSIX_THREADS)])
+ AC_DEFINE([FFTW_USING_POSIX_THREADS],[],[desc])])
fi
# Solaris threads:
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],[],[desc])])
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],[],[desc])])
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],[],[desc])])
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],[],[desc])])
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],[],[desc])])
fi
if test -z "$THREADLIBS"; then
AC_MSG_ERROR(couldn't find threads library for --enable-threads)
@@ -334,7 +337,7 @@
CC="$MPICC"
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],[],[desc])], [ok=no])
AC_MSG_RESULT($ok)
CC="$save_CC"
else
|
