diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 7a401983c29..c2c93879058 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-24  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR libfortran/32841
+	* acinclude.m4: Don't use HAVE_MATH_H.
+	* configure: Regenerate.
+
 2008-02-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libfortran/35132
diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
index 6cc10408d96..44380615526 100644
--- a/libgfortran/acinclude.m4
+++ b/libgfortran/acinclude.m4
@@ -204,9 +204,7 @@ AC_DEFUN([LIBGFOR_CHECK_FOR_BROKEN_ISFINITE], [
   libgfor_check_for_broken_isfinite_save_LIBS=$LIBS
   LIBS="$LIBS -lm"
   AC_TRY_RUN([
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 #include <float.h>
 int main ()
 {
@@ -237,9 +235,7 @@ AC_DEFUN([LIBGFOR_CHECK_FOR_BROKEN_ISNAN], [
   libgfor_check_for_broken_isnan_save_LIBS=$LIBS
   LIBS="$LIBS -lm"
   AC_TRY_RUN([
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 #include <float.h>
 int main ()
 {
@@ -288,9 +284,7 @@ AC_DEFUN([LIBGFOR_CHECK_FOR_BROKEN_FPCLASSIFY], [
   libgfor_check_for_broken_fpclassify_save_LIBS=$LIBS
   LIBS="$LIBS -lm"
   AC_TRY_RUN([
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 #include <float.h>
 int main ()
 {
diff --git a/libgfortran/configure b/libgfortran/configure
index 4622d5e3848..ce49eb072c2 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -867,13 +867,13 @@ echo X"$0" |
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
+  if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r "$srcdir/$ac_unique_file"; then
+if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
@@ -882,7 +882,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then
    { (exit 1); exit 1; }; }
   fi
 fi
-(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
    { (exit 1); exit 1; }; }
 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -31991,9 +31991,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 #include <float.h>
 int main ()
 {
@@ -32066,9 +32064,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 #include <float.h>
 int main ()
 {
@@ -32159,9 +32155,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-#ifdef HAVE_MATH_H
 #include <math.h>
-#endif
 #include <float.h>
 int main ()
 {