yann@521: diff -Naurd mpfr-2.3.1-a/acinclude.m4 mpfr-2.3.1-b/acinclude.m4 yann@521: --- mpfr-2.3.1-a/acinclude.m4 2008-01-23 13:36:46.000000000 +0000 yann@521: +++ mpfr-2.3.1-b/acinclude.m4 2008-01-23 13:36:46.000000000 +0000 yann@521: @@ -286,6 +286,9 @@ yann@521: dnl important to run the test below. yann@521: if test "$enable_thread_safe" = yes; then yann@521: AC_CACHE_CHECK([for TLS support], mpfr_cv_working_tls, [ yann@521: +saved_CPPFLAGS="$CPPFLAGS" yann@521: +# The -I$srcdir is necessary when objdir is different from srcdir. yann@521: +CPPFLAGS="$CPPFLAGS -I$srcdir" yann@521: AC_RUN_IFELSE([ yann@521: #define MPFR_USE_THREAD_SAFE 1 yann@521: #include "mpfr-thread.h" yann@521: @@ -297,6 +300,7 @@ yann@521: [AC_MSG_RESULT(no) yann@521: AC_MSG_ERROR([please configure with --disable-thread-safe])], yann@521: [mpfr_cv_working_tls="cannot test, assume yes"]) yann@521: +CPPFLAGS="$saved_CPPFLAGS" yann@521: ]) yann@521: fi yann@521: ]) yann@521: diff -Naurd mpfr-2.3.1-a/configure mpfr-2.3.1-b/configure yann@521: --- mpfr-2.3.1-a/configure 2008-01-29 08:51:07.000000000 +0000 yann@521: +++ mpfr-2.3.1-b/configure 2008-05-10 23:49:37.000000000 +0000 yann@521: @@ -7528,6 +7528,9 @@ yann@521: echo $ECHO_N "(cached) $ECHO_C" >&6 yann@521: else yann@521: yann@521: +saved_CPPFLAGS="$CPPFLAGS" yann@521: +# The -I$srcdir is necessary when objdir is different from srcdir. yann@521: +CPPFLAGS="$CPPFLAGS -I$srcdir" yann@521: if test "$cross_compiling" = yes; then yann@521: mpfr_cv_working_tls="cannot test, assume yes" yann@521: else yann@521: @@ -7578,6 +7581,7 @@ yann@521: fi yann@521: yann@521: yann@521: +CPPFLAGS="$saved_CPPFLAGS" yann@521: yann@521: fi yann@521: { echo "$as_me:$LINENO: result: $mpfr_cv_working_tls" >&5 yann@521: @@ -9278,7 +9282,7 @@ yann@521: ;; yann@521: *-*-irix6*) yann@521: # Find out which ABI we are using. yann@521: - echo '#line 9281 "configure"' > conftest.$ac_ext yann@521: + echo '#line 9285 "configure"' > conftest.$ac_ext yann@521: if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 yann@521: (eval $ac_compile) 2>&5 yann@521: ac_status=$? yann@521: @@ -11103,11 +11107,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:11106: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:11110: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>conftest.err) yann@521: ac_status=$? yann@521: cat conftest.err >&5 yann@521: - echo "$as_me:11110: \$? = $ac_status" >&5 yann@521: + echo "$as_me:11114: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s "$ac_outfile"; then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: # So say no if there are warnings other than the usual output. yann@521: @@ -11393,11 +11397,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:11396: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:11400: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>conftest.err) yann@521: ac_status=$? yann@521: cat conftest.err >&5 yann@521: - echo "$as_me:11400: \$? = $ac_status" >&5 yann@521: + echo "$as_me:11404: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s "$ac_outfile"; then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: # So say no if there are warnings other than the usual output. yann@521: @@ -11497,11 +11501,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:11500: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:11504: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>out/conftest.err) yann@521: ac_status=$? yann@521: cat out/conftest.err >&5 yann@521: - echo "$as_me:11504: \$? = $ac_status" >&5 yann@521: + echo "$as_me:11508: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s out/conftest2.$ac_objext yann@521: then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: @@ -13859,7 +13863,7 @@ yann@521: lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 yann@521: lt_status=$lt_dlunknown yann@521: cat > conftest.$ac_ext < conftest.$ac_ext <&5) yann@521: + (eval echo "\"\$as_me:16386: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>conftest.err) yann@521: ac_status=$? yann@521: cat conftest.err >&5 yann@521: - echo "$as_me:16386: \$? = $ac_status" >&5 yann@521: + echo "$as_me:16390: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s "$ac_outfile"; then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: # So say no if there are warnings other than the usual output. yann@521: @@ -16483,11 +16487,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:16486: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:16490: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>out/conftest.err) yann@521: ac_status=$? yann@521: cat out/conftest.err >&5 yann@521: - echo "$as_me:16490: \$? = $ac_status" >&5 yann@521: + echo "$as_me:16494: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s out/conftest2.$ac_objext yann@521: then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: @@ -18060,11 +18064,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:18063: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:18067: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>conftest.err) yann@521: ac_status=$? yann@521: cat conftest.err >&5 yann@521: - echo "$as_me:18067: \$? = $ac_status" >&5 yann@521: + echo "$as_me:18071: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s "$ac_outfile"; then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: # So say no if there are warnings other than the usual output. yann@521: @@ -18164,11 +18168,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:18167: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:18171: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>out/conftest.err) yann@521: ac_status=$? yann@521: cat out/conftest.err >&5 yann@521: - echo "$as_me:18171: \$? = $ac_status" >&5 yann@521: + echo "$as_me:18175: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s out/conftest2.$ac_objext yann@521: then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: @@ -20364,11 +20368,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:20367: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:20371: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>conftest.err) yann@521: ac_status=$? yann@521: cat conftest.err >&5 yann@521: - echo "$as_me:20371: \$? = $ac_status" >&5 yann@521: + echo "$as_me:20375: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s "$ac_outfile"; then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: # So say no if there are warnings other than the usual output. yann@521: @@ -20654,11 +20658,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:20657: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:20661: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>conftest.err) yann@521: ac_status=$? yann@521: cat conftest.err >&5 yann@521: - echo "$as_me:20661: \$? = $ac_status" >&5 yann@521: + echo "$as_me:20665: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s "$ac_outfile"; then yann@521: # The compiler can only warn and ignore the option if not recognized yann@521: # So say no if there are warnings other than the usual output. yann@521: @@ -20758,11 +20762,11 @@ yann@521: -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ yann@521: -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ yann@521: -e 's:$: $lt_compiler_flag:'` yann@521: - (eval echo "\"\$as_me:20761: $lt_compile\"" >&5) yann@521: + (eval echo "\"\$as_me:20765: $lt_compile\"" >&5) yann@521: (eval "$lt_compile" 2>out/conftest.err) yann@521: ac_status=$? yann@521: cat out/conftest.err >&5 yann@521: - echo "$as_me:20765: \$? = $ac_status" >&5 yann@521: + echo "$as_me:20769: \$? = $ac_status" >&5 yann@521: if (exit $ac_status) && test -s out/conftest2.$ac_objext yann@521: then yann@521: # The compiler can only warn and ignore the option if not recognized