(jm_MACROS): Add a test to see if -lm is required

[gnulib.git] / m4 / strftime.m4

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index ad12ddb..caeb21f 100644 (file)
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,4 +1,4 @@
-#serial 12
+#serial 15
 
 dnl This macro is intended to be used solely in this file.
 dnl These are the prerequisite macros for GNU's strftime.c replacement.
@@ -16,7 +16,7 @@ AC_DEFUN(_jm_STRFTIME_PREREQS,
 
  AC_CHECK_FUNCS(mblen mbrlen)
 
- AC_CHECK_MEMBER(struct tm.tm_gmtoff,
+ AC_CHECK_MEMBER([struct tm.tm_gmtoff],
                  [AC_DEFINE(HAVE_TM_GMTOFF, 1,
                             [Define if struct tm has the tm_gmtoff member.])],
                  ,
@@ -77,6 +77,11 @@ main ()
   time_t t = 738367; /* Fri Jan  9 13:06:07 1970 */
   tm = gmtime (&t);
 
+  /* Undefine this in case the configure-time putenv test has defined it
+     to something else.  The use we make of this function here doesn't
+     require the added functionality of the replacement one.  */
+#undef putenv
+
   /* This is necessary to make strftime give consistent zone strings and
      e.g., seconds since the epoch (%s).  */
   putenv ("TZ=GMT0");
@@ -141,8 +146,7 @@ main ()
             jm_cv_func_working_gnu_strftime=no)
   ])
   if test $jm_cv_func_working_gnu_strftime = no; then
-    AC_SUBST(LIBOBJS)
-    LIBOBJS="$LIBOBJS strftime.$ac_objext"
+    AC_LIBOBJ(strftime)
     AC_DEFINE_UNQUOTED(strftime, gnu_strftime,
       [Define to gnu_strftime if the replacement function should be used.])
   fi