diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index fc7a2c4ca6dcdcf8f230c908f44c7ade95bdafd5..dbafd0c95891bd9d6c00e046489bbf48fc77a688 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-25  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	* acinclude.m4 (LIBGFOR_CHECK_FPSETMASK): Set shell variable
+	tested in configure.host.
+	* configure: Regenerate.
+
 2011-02-24  Janne Blomqvist  <jb@gcc.gnu.org>
 
 	PR libfortran/47802
diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
index 1bc1c7bbbfd05e8ba2357c9b31881b8b275c363b..395a1eabe99e7063ee3814cafb5bd73cca34bae0 100644
--- a/libgfortran/acinclude.m4
+++ b/libgfortran/acinclude.m4
@@ -244,6 +244,7 @@ AC_DEFUN([LIBGFOR_CHECK_FPSETMASK], [
     eval "libgfor_cv_have_fpsetmask=yes", eval "libgfor_cv_have_fpsetmask=no")
   ])
   if test x"$libgfor_cv_have_fpsetmask" = xyes; then
+    have_fpsetmask=yes
     AC_DEFINE(HAVE_FPSETMASK, 1, [Define if you have fpsetmask.])
   fi
 ])
diff --git a/libgfortran/configure b/libgfortran/configure
index 749cd00065100fbaa0dfd2cbfa5610ae4dfdd34a..13a079f9f245adc78c761a18399b9939742870ef 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -25395,6 +25395,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgfor_cv_have_fpsetmask" >&5
 $as_echo "$libgfor_cv_have_fpsetmask" >&6; }
   if test x"$libgfor_cv_have_fpsetmask" = xyes; then
+    have_fpsetmask=yes
 
 $as_echo "#define HAVE_FPSETMASK 1" >>confdefs.h