yann@521
|
1 |
diff -Naurd mpfr-2.3.1-a/acinclude.m4 mpfr-2.3.1-b/acinclude.m4
|
yann@521
|
2 |
--- mpfr-2.3.1-a/acinclude.m4 2008-01-23 13:36:46.000000000 +0000
|
yann@521
|
3 |
+++ mpfr-2.3.1-b/acinclude.m4 2008-01-23 13:36:46.000000000 +0000
|
yann@521
|
4 |
@@ -286,6 +286,9 @@
|
yann@521
|
5 |
dnl important to run the test below.
|
yann@521
|
6 |
if test "$enable_thread_safe" = yes; then
|
yann@521
|
7 |
AC_CACHE_CHECK([for TLS support], mpfr_cv_working_tls, [
|
yann@521
|
8 |
+saved_CPPFLAGS="$CPPFLAGS"
|
yann@521
|
9 |
+# The -I$srcdir is necessary when objdir is different from srcdir.
|
yann@521
|
10 |
+CPPFLAGS="$CPPFLAGS -I$srcdir"
|
yann@521
|
11 |
AC_RUN_IFELSE([
|
yann@521
|
12 |
#define MPFR_USE_THREAD_SAFE 1
|
yann@521
|
13 |
#include "mpfr-thread.h"
|
yann@521
|
14 |
@@ -297,6 +300,7 @@
|
yann@521
|
15 |
[AC_MSG_RESULT(no)
|
yann@521
|
16 |
AC_MSG_ERROR([please configure with --disable-thread-safe])],
|
yann@521
|
17 |
[mpfr_cv_working_tls="cannot test, assume yes"])
|
yann@521
|
18 |
+CPPFLAGS="$saved_CPPFLAGS"
|
yann@521
|
19 |
])
|
yann@521
|
20 |
fi
|
yann@521
|
21 |
])
|
yann@521
|
22 |
diff -Naurd mpfr-2.3.1-a/configure mpfr-2.3.1-b/configure
|
yann@521
|
23 |
--- mpfr-2.3.1-a/configure 2008-01-29 08:51:07.000000000 +0000
|
yann@521
|
24 |
+++ mpfr-2.3.1-b/configure 2008-05-10 23:49:37.000000000 +0000
|
yann@521
|
25 |
@@ -7528,6 +7528,9 @@
|
yann@521
|
26 |
echo $ECHO_N "(cached) $ECHO_C" >&6
|
yann@521
|
27 |
else
|
yann@521
|
28 |
|
yann@521
|
29 |
+saved_CPPFLAGS="$CPPFLAGS"
|
yann@521
|
30 |
+# The -I$srcdir is necessary when objdir is different from srcdir.
|
yann@521
|
31 |
+CPPFLAGS="$CPPFLAGS -I$srcdir"
|
yann@521
|
32 |
if test "$cross_compiling" = yes; then
|
yann@521
|
33 |
mpfr_cv_working_tls="cannot test, assume yes"
|
yann@521
|
34 |
else
|
yann@521
|
35 |
@@ -7578,6 +7581,7 @@
|
yann@521
|
36 |
fi
|
yann@521
|
37 |
|
yann@521
|
38 |
|
yann@521
|
39 |
+CPPFLAGS="$saved_CPPFLAGS"
|
yann@521
|
40 |
|
yann@521
|
41 |
fi
|
yann@521
|
42 |
{ echo "$as_me:$LINENO: result: $mpfr_cv_working_tls" >&5
|
yann@521
|
43 |
@@ -9278,7 +9282,7 @@
|
yann@521
|
44 |
;;
|
yann@521
|
45 |
*-*-irix6*)
|
yann@521
|
46 |
# Find out which ABI we are using.
|
yann@521
|
47 |
- echo '#line 9281 "configure"' > conftest.$ac_ext
|
yann@521
|
48 |
+ echo '#line 9285 "configure"' > conftest.$ac_ext
|
yann@521
|
49 |
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
yann@521
|
50 |
(eval $ac_compile) 2>&5
|
yann@521
|
51 |
ac_status=$?
|
yann@521
|
52 |
@@ -11103,11 +11107,11 @@
|
yann@521
|
53 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
54 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
55 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
56 |
- (eval echo "\"\$as_me:11106: $lt_compile\"" >&5)
|
yann@521
|
57 |
+ (eval echo "\"\$as_me:11110: $lt_compile\"" >&5)
|
yann@521
|
58 |
(eval "$lt_compile" 2>conftest.err)
|
yann@521
|
59 |
ac_status=$?
|
yann@521
|
60 |
cat conftest.err >&5
|
yann@521
|
61 |
- echo "$as_me:11110: \$? = $ac_status" >&5
|
yann@521
|
62 |
+ echo "$as_me:11114: \$? = $ac_status" >&5
|
yann@521
|
63 |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
yann@521
|
64 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
65 |
# So say no if there are warnings other than the usual output.
|
yann@521
|
66 |
@@ -11393,11 +11397,11 @@
|
yann@521
|
67 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
68 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
69 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
70 |
- (eval echo "\"\$as_me:11396: $lt_compile\"" >&5)
|
yann@521
|
71 |
+ (eval echo "\"\$as_me:11400: $lt_compile\"" >&5)
|
yann@521
|
72 |
(eval "$lt_compile" 2>conftest.err)
|
yann@521
|
73 |
ac_status=$?
|
yann@521
|
74 |
cat conftest.err >&5
|
yann@521
|
75 |
- echo "$as_me:11400: \$? = $ac_status" >&5
|
yann@521
|
76 |
+ echo "$as_me:11404: \$? = $ac_status" >&5
|
yann@521
|
77 |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
yann@521
|
78 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
79 |
# So say no if there are warnings other than the usual output.
|
yann@521
|
80 |
@@ -11497,11 +11501,11 @@
|
yann@521
|
81 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
82 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
83 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
84 |
- (eval echo "\"\$as_me:11500: $lt_compile\"" >&5)
|
yann@521
|
85 |
+ (eval echo "\"\$as_me:11504: $lt_compile\"" >&5)
|
yann@521
|
86 |
(eval "$lt_compile" 2>out/conftest.err)
|
yann@521
|
87 |
ac_status=$?
|
yann@521
|
88 |
cat out/conftest.err >&5
|
yann@521
|
89 |
- echo "$as_me:11504: \$? = $ac_status" >&5
|
yann@521
|
90 |
+ echo "$as_me:11508: \$? = $ac_status" >&5
|
yann@521
|
91 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
yann@521
|
92 |
then
|
yann@521
|
93 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
94 |
@@ -13859,7 +13863,7 @@
|
yann@521
|
95 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
yann@521
|
96 |
lt_status=$lt_dlunknown
|
yann@521
|
97 |
cat > conftest.$ac_ext <<EOF
|
yann@521
|
98 |
-#line 13862 "configure"
|
yann@521
|
99 |
+#line 13866 "configure"
|
yann@521
|
100 |
#include "confdefs.h"
|
yann@521
|
101 |
|
yann@521
|
102 |
#if HAVE_DLFCN_H
|
yann@521
|
103 |
@@ -13959,7 +13963,7 @@
|
yann@521
|
104 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
yann@521
|
105 |
lt_status=$lt_dlunknown
|
yann@521
|
106 |
cat > conftest.$ac_ext <<EOF
|
yann@521
|
107 |
-#line 13962 "configure"
|
yann@521
|
108 |
+#line 13966 "configure"
|
yann@521
|
109 |
#include "confdefs.h"
|
yann@521
|
110 |
|
yann@521
|
111 |
#if HAVE_DLFCN_H
|
yann@521
|
112 |
@@ -16379,11 +16383,11 @@
|
yann@521
|
113 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
114 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
115 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
116 |
- (eval echo "\"\$as_me:16382: $lt_compile\"" >&5)
|
yann@521
|
117 |
+ (eval echo "\"\$as_me:16386: $lt_compile\"" >&5)
|
yann@521
|
118 |
(eval "$lt_compile" 2>conftest.err)
|
yann@521
|
119 |
ac_status=$?
|
yann@521
|
120 |
cat conftest.err >&5
|
yann@521
|
121 |
- echo "$as_me:16386: \$? = $ac_status" >&5
|
yann@521
|
122 |
+ echo "$as_me:16390: \$? = $ac_status" >&5
|
yann@521
|
123 |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
yann@521
|
124 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
125 |
# So say no if there are warnings other than the usual output.
|
yann@521
|
126 |
@@ -16483,11 +16487,11 @@
|
yann@521
|
127 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
128 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
129 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
130 |
- (eval echo "\"\$as_me:16486: $lt_compile\"" >&5)
|
yann@521
|
131 |
+ (eval echo "\"\$as_me:16490: $lt_compile\"" >&5)
|
yann@521
|
132 |
(eval "$lt_compile" 2>out/conftest.err)
|
yann@521
|
133 |
ac_status=$?
|
yann@521
|
134 |
cat out/conftest.err >&5
|
yann@521
|
135 |
- echo "$as_me:16490: \$? = $ac_status" >&5
|
yann@521
|
136 |
+ echo "$as_me:16494: \$? = $ac_status" >&5
|
yann@521
|
137 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
yann@521
|
138 |
then
|
yann@521
|
139 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
140 |
@@ -18060,11 +18064,11 @@
|
yann@521
|
141 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
142 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
143 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
144 |
- (eval echo "\"\$as_me:18063: $lt_compile\"" >&5)
|
yann@521
|
145 |
+ (eval echo "\"\$as_me:18067: $lt_compile\"" >&5)
|
yann@521
|
146 |
(eval "$lt_compile" 2>conftest.err)
|
yann@521
|
147 |
ac_status=$?
|
yann@521
|
148 |
cat conftest.err >&5
|
yann@521
|
149 |
- echo "$as_me:18067: \$? = $ac_status" >&5
|
yann@521
|
150 |
+ echo "$as_me:18071: \$? = $ac_status" >&5
|
yann@521
|
151 |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
yann@521
|
152 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
153 |
# So say no if there are warnings other than the usual output.
|
yann@521
|
154 |
@@ -18164,11 +18168,11 @@
|
yann@521
|
155 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
156 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
157 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
158 |
- (eval echo "\"\$as_me:18167: $lt_compile\"" >&5)
|
yann@521
|
159 |
+ (eval echo "\"\$as_me:18171: $lt_compile\"" >&5)
|
yann@521
|
160 |
(eval "$lt_compile" 2>out/conftest.err)
|
yann@521
|
161 |
ac_status=$?
|
yann@521
|
162 |
cat out/conftest.err >&5
|
yann@521
|
163 |
- echo "$as_me:18171: \$? = $ac_status" >&5
|
yann@521
|
164 |
+ echo "$as_me:18175: \$? = $ac_status" >&5
|
yann@521
|
165 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
yann@521
|
166 |
then
|
yann@521
|
167 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
168 |
@@ -20364,11 +20368,11 @@
|
yann@521
|
169 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
170 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
171 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
172 |
- (eval echo "\"\$as_me:20367: $lt_compile\"" >&5)
|
yann@521
|
173 |
+ (eval echo "\"\$as_me:20371: $lt_compile\"" >&5)
|
yann@521
|
174 |
(eval "$lt_compile" 2>conftest.err)
|
yann@521
|
175 |
ac_status=$?
|
yann@521
|
176 |
cat conftest.err >&5
|
yann@521
|
177 |
- echo "$as_me:20371: \$? = $ac_status" >&5
|
yann@521
|
178 |
+ echo "$as_me:20375: \$? = $ac_status" >&5
|
yann@521
|
179 |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
yann@521
|
180 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
181 |
# So say no if there are warnings other than the usual output.
|
yann@521
|
182 |
@@ -20654,11 +20658,11 @@
|
yann@521
|
183 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
184 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
185 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
186 |
- (eval echo "\"\$as_me:20657: $lt_compile\"" >&5)
|
yann@521
|
187 |
+ (eval echo "\"\$as_me:20661: $lt_compile\"" >&5)
|
yann@521
|
188 |
(eval "$lt_compile" 2>conftest.err)
|
yann@521
|
189 |
ac_status=$?
|
yann@521
|
190 |
cat conftest.err >&5
|
yann@521
|
191 |
- echo "$as_me:20661: \$? = $ac_status" >&5
|
yann@521
|
192 |
+ echo "$as_me:20665: \$? = $ac_status" >&5
|
yann@521
|
193 |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
yann@521
|
194 |
# The compiler can only warn and ignore the option if not recognized
|
yann@521
|
195 |
# So say no if there are warnings other than the usual output.
|
yann@521
|
196 |
@@ -20758,11 +20762,11 @@
|
yann@521
|
197 |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
yann@521
|
198 |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
yann@521
|
199 |
-e 's:$: $lt_compiler_flag:'`
|
yann@521
|
200 |
- (eval echo "\"\$as_me:20761: $lt_compile\"" >&5)
|
yann@521
|
201 |
+ (eval echo "\"\$as_me:20765: $lt_compile\"" >&5)
|
yann@521
|
202 |
(eval "$lt_compile" 2>out/conftest.err)
|
yann@521
|
203 |
ac_status=$?
|
yann@521
|
204 |
cat out/conftest.err >&5
|
yann@521
|
205 |
- echo "$as_me:20765: \$? = $ac_status" >&5
|
yann@521
|
206 |
+ echo "$as_me:20769: \$? = $ac_status" >&5
|
yann@521
|
207 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
yann@521
|
208 |
then
|
yann@521
|
209 |
# The compiler can only warn and ignore the option if not recognized
|