diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index abbfdd19a3404c811de328859e3faece059e09a6..1a1f937c6bb2e517593c3479adfae872cb4c503c 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-24  John David Anglin  <danglin@gcc.gnu.org>
+
+	* configure.ac: Guard include of <ieeefp.h>.
+	* configure: Rebuilt.
+
 2014-11-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR bootstrap/63784
diff --git a/libgfortran/configure b/libgfortran/configure
index dc68af54dbd14da307608a136fc41a394201be44..a19cb9e1069e50932c3de823cb8bc1f6b3ff1286 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -26067,7 +26067,9 @@ $as_echo "#define HAVE_FPSETMASK 1" >>confdefs.h
   fi
 
 ac_fn_c_check_type "$LINENO" "fp_except" "ac_cv_type_fp_except" "
+#ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
+#endif
 #include <math.h>
 
 "
@@ -26080,7 +26082,9 @@ _ACEOF
 
 fi
 ac_fn_c_check_type "$LINENO" "fp_except_t" "ac_cv_type_fp_except_t" "
+#ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
+#endif
 #include <math.h>
 
 "
@@ -26094,7 +26098,9 @@ _ACEOF
 fi
 
 ac_fn_c_check_type "$LINENO" "fp_rnd" "ac_cv_type_fp_rnd" "
+#ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
+#endif
 #include <math.h>
 
 "
@@ -26107,7 +26113,9 @@ _ACEOF
 
 fi
 ac_fn_c_check_type "$LINENO" "fp_rnd_t" "ac_cv_type_fp_rnd_t" "
+#ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
+#endif
 #include <math.h>
 
 "
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index ada74e3318ab5c0285ba79f6bdbb01408a2a30eb..b9386c2c5ec61f94a06dfb4c6e92bcdb95a091cc 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -524,11 +524,15 @@ fi
 # Check for SysV fpsetmask
 LIBGFOR_CHECK_FPSETMASK
 AC_CHECK_TYPES([fp_except,fp_except_t], [], [], [[
+#ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
+#endif
 #include <math.h>
 ]])
 AC_CHECK_TYPES([fp_rnd,fp_rnd_t], [], [], [[
+#ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
+#endif
 #include <math.h>
 ]])