Factor out common code in gl_FUNC_STRTOD.

diff --git a/ChangeLog b/ChangeLog
index 5570b818537c59bb2556b9f2b5ea797da7b607e6..47fe5b480922b9c3435089a72b2fd5bd037f9c73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-14  Ben Pfaff  <blp@cs.stanford.edu>
+
+       * m4/strtod.m4 (gl_FUNC_STRTOD): Factor out common code.
+
 2010-06-15  Bruno Haible  <bruno@clisp.org>
 
        * m4/strtod.m4 (gl_FUNC_STRTOD): Stop using AC_FUNC_STRTOD.

diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 00b8e64b41cb001348f561c9e6eedb2951ae951a..36b5d2dd8acc762071c7df8ab6eed989bd78c09f 100644 (file)
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -15,9 +15,6 @@ AC_DEFUN([gl_FUNC_STRTOD],
   AC_CHECK_DECLS_ONCE([strtod])
   if test $ac_cv_have_decl_strtod != yes; then
     HAVE_STRTOD=0
-    gl_PREREQ_STRTOD
-    dnl Use undocumented macro to set POW_LIB correctly.
-    _AC_LIBOBJ_STRTOD
   else
     AC_CACHE_CHECK([whether strtod obeys C99], [gl_cv_func_strtod_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -101,11 +98,13 @@ numeric_equal (double x, double y)
         [gl_cv_func_strtod_works="guessing no"])])
     if test "$gl_cv_func_strtod_works" != yes; then
       REPLACE_STRTOD=1
-      gl_PREREQ_STRTOD
-      dnl Use undocumented macro to set POW_LIB correctly.
-      _AC_LIBOBJ_STRTOD
     fi
   fi
+  if test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1; then
+    gl_PREREQ_STRTOD
+    dnl Use undocumented macro to set POW_LIB correctly.
+    _AC_LIBOBJ_STRTOD
+  fi
 ])
 
 # Prerequisites of lib/strtod.c.