diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index de3eaa06434..e87d14a2ebb 100644
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-19  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/46520
+	* configure.ac: Do not call AC_CHECK_LIB for gcc_no_link.
+	* configure: Regenerate
+
 2010-12-13  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/46625
diff --git a/libquadmath/configure b/libquadmath/configure
index eb370580beb..078b4101ab4 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -11748,7 +11748,10 @@ esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrtl in -lm" >&5
+# If available, sqrtl and cbrtl speed up the calculation -
+# but they are not required
+if test x$gcc_no_link != xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrtl in -lm" >&5
 $as_echo_n "checking for sqrtl in -lm... " >&6; }
 if test "${ac_cv_lib_m_sqrtl+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11793,7 +11796,7 @@ $as_echo "#define HAVE_SQRTL 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cbrtl in -lm" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cbrtl in -lm" >&5
 $as_echo_n "checking for cbrtl in -lm... " >&6; }
 if test "${ac_cv_lib_m_cbrtl+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -11838,6 +11841,18 @@ $as_echo "#define HAVE_CBRTL 1" >>confdefs.h
 
 fi
 
+else
+  if test "x$ac_cv_lib_m_sqrtl" = x""yes; then
+
+$as_echo "#define HAVE_SQRTL 1" >>confdefs.h
+
+  fi
+  if test "x$ac_cv_lib_m_cbrtl" = x""yes; then
+
+$as_echo "#define HAVE_CBRTL 1" >>confdefs.h
+
+  fi
+fi
 
 # Check for symbol versioning (copied from libssp).
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symbol versioning is supported" >&5
diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac
index 56b1fcb2792..68b5cf8924c 100644
--- a/libquadmath/configure.ac
+++ b/libquadmath/configure.ac
@@ -109,8 +109,19 @@ esac
 AC_SUBST(toolexecdir)
 AC_SUBST(toolexeclibdir)
 
-AC_CHECK_LIB([m],[sqrtl],[AC_DEFINE([HAVE_SQRTL],[1],[libm includes sqrtl])])
-AC_CHECK_LIB([m],[cbrtl],[AC_DEFINE([HAVE_CBRTL],[1],[libm includes cbrtl])])
+# If available, sqrtl and cbrtl speed up the calculation -
+# but they are not required
+if test x$gcc_no_link != xyes; then
+  AC_CHECK_LIB([m],[sqrtl],[AC_DEFINE([HAVE_SQRTL],[1],[libm includes sqrtl])])
+  AC_CHECK_LIB([m],[cbrtl],[AC_DEFINE([HAVE_CBRTL],[1],[libm includes cbrtl])])
+else
+  if test "x$ac_cv_lib_m_sqrtl" = x""yes; then
+    AC_DEFINE([HAVE_SQRTL],[1],[libm includes sqrtl])  
+  fi
+  if test "x$ac_cv_lib_m_cbrtl" = x""yes; then
+    AC_DEFINE([HAVE_CBRTL],[1],[libm includes cbrtl])  
+  fi
+fi
 
 # Check for symbol versioning (copied from libssp).
 AC_MSG_CHECKING([whether symbol versioning is supported])