From e0771fc0d4cbcf230a1bb89851d3b20eb6fff637 Mon Sep 17 00:00:00 2001 From: rwild Date: Mon, 7 Jul 2008 19:16:18 +0000 Subject: [PATCH] libgfortran/ * acinclude.m4 (LIBGFOR_CHECK_GTHR_DEFAULT): Fix configure cache variable name. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137592 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/ChangeLog | 6 ++++++ libgfortran/acinclude.m4 | 6 +++--- libgfortran/configure | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6e3a729fc7a..18bd7b1189a 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2008-07-07 Ralf Wildenhues + + * acinclude.m4 (LIBGFOR_CHECK_GTHR_DEFAULT): Fix configure cache + variable name. + * configure: Regenerate. + 2008-07-01 Jerry DeLisle PR fortran/36676 diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4 index d1994b49d90..9f8ae54fab6 100644 --- a/libgfortran/acinclude.m4 +++ b/libgfortran/acinclude.m4 @@ -86,10 +86,10 @@ if (foovar > 10) return __sync_add_and_fetch (&foovar, -1);], dnl Check if threads are supported. AC_DEFUN([LIBGFOR_CHECK_GTHR_DEFAULT], [ AC_CACHE_CHECK([configured target thread model], - target_thread_file, [ -target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`]) + libgfor_cv_target_thread_file, [ +libgfor_cv_target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`]) - if test $target_thread_file != single; then + if test $libgfor_cv_target_thread_file != single; then AC_DEFINE(HAVE_GTHR_DEFAULT, 1, [Define if the compiler has a thread header that is non single.]) fi]) diff --git a/libgfortran/configure b/libgfortran/configure index 176632426b8..0bd9a22d43f 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -33157,16 +33157,16 @@ _ACEOF echo "$as_me:$LINENO: checking configured target thread model" >&5 echo $ECHO_N "checking configured target thread model... $ECHO_C" >&6 -if test "${target_thread_file+set}" = set; then +if test "${libgfor_cv_target_thread_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` +libgfor_cv_target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` fi -echo "$as_me:$LINENO: result: $target_thread_file" >&5 -echo "${ECHO_T}$target_thread_file" >&6 +echo "$as_me:$LINENO: result: $libgfor_cv_target_thread_file" >&5 +echo "${ECHO_T}$libgfor_cv_target_thread_file" >&6 - if test $target_thread_file != single; then + if test $libgfor_cv_target_thread_file != single; then cat >>confdefs.h <<\_ACEOF #define HAVE_GTHR_DEFAULT 1 -- 2.11.0