X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrptime.m4;h=d48cacd7e7a220aea60558096c35921cabba2f81;hb=39e1adf83f9afbbc1ab9edbd6ca3d509c1f1bec4;hp=e1236b933987fc538a2a29ab47423c1eda871477;hpb=88c14dcf4d4df04f3c12f7d506484993850c55ad;p=gnulib.git

diff --git a/m4/strptime.m4 b/m4/strptime.m4
index e1236b933..d48cacd7e 100644
--- a/m4/strptime.m4
+++ b/m4/strptime.m4
@@ -1,12 +1,24 @@
-# strptime.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# strptime.m4 serial 6
+dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRPTIME],
 [
+  AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
   AC_REQUIRE([AC_C_RESTRICT])
-  AC_REPLACE_FUNCS(strptime)
+  AC_CHECK_FUNCS_ONCE([strptime])
+  if test $ac_cv_func_strptime != yes; then
+    HAVE_STRPTIME=0
+    AC_LIBOBJ([strptime])
+    gl_PREREQ_STRPTIME
+  fi
+])
+
+# Prerequisites of lib/strptime.c.
+AC_DEFUN([gl_PREREQ_STRPTIME],
+[
   AC_REQUIRE([gl_TM_GMTOFF])
+  :
 ])