X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmkstemp.m4;h=20d8a1b70151ef7197f52cb5f0d2459a02180afa;hb=41fc74b9ab67321453d103d056a6e8eb8897042a;hp=e58fdf82adafbcdf52a6d42a349abdb0e2e5dadc;hpb=6b35600aa75a122b58cf91345c202b741a97a347;p=gnulib.git

diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index e58fdf82a..20d8a1b70 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,6 +1,6 @@
-#serial 14
+#serial 17
 
-# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,6 +13,7 @@
 # On systems like the above, arrange to use the replacement function.
 AC_DEFUN([gl_FUNC_MKSTEMP],
 [
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([AC_SYS_LARGEFILE])
 
   AC_CACHE_CHECK([for working mkstemp],
@@ -28,9 +29,9 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
 	      large = 2147483647;
 	    for (i = 0; i < 70; i++)
 	      {
-		char template[] = "conftest.mkstemp/coXXXXXX";
+		char templ[] = "conftest.mkstemp/coXXXXXX";
 		int (*mkstemp_function) (char *) = mkstemp;
-		int fd = mkstemp_function (template);
+		int fd = mkstemp_function (templ);
 		if (fd < 0 || lseek (fd, large, SEEK_SET) != large)
 		  return 1;
 		close (fd);
@@ -43,12 +44,9 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
     ])
 
   if test $gl_cv_func_working_mkstemp != yes; then
-    AC_DEFINE([__MKSTEMP_PREFIX], [[rpl_]],
-      [Define to rpl_ if the mkstemp replacement function should be used.])
-    AC_LIBOBJ(mkstemp)
-    AC_LIBOBJ(tempname)
+    REPLACE_MKSTEMP=1
+    AC_LIBOBJ([mkstemp])
     gl_PREREQ_MKSTEMP
-    gl_PREREQ_TEMPNAME
   fi
 ])
 
@@ -56,10 +54,3 @@ AC_DEFUN([gl_FUNC_MKSTEMP],
 AC_DEFUN([gl_PREREQ_MKSTEMP],
 [
 ])
-
-# Prerequisites of lib/tempname.c.
-AC_DEFUN([gl_PREREQ_TEMPNAME],
-[
-  AC_CHECK_HEADERS_ONCE(sys/time.h)
-  AC_CHECK_FUNCS(__secure_getenv gettimeofday)
-])