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