X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmkstemp.m4;h=82e1ce5853b643219769b5009cc40773f9332d91;hb=5e576318cdb5628381e4082c3f4a29c1e97f27a8;hp=a7c12d8891b8e5d08eed48b4a199e866fff4d6be;hpb=fb687fad4c51f1514db604ea9a2eca2d7b6dfea2;p=gnulib.git

diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index a7c12d889..82e1ce585 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,31 +1,28 @@
-#serial 1
+#serial 6
 
-# On some systems (e.g., HPUX-10.20), mkstemp has the silly limit that it
-# can create no more than 26 files from a given template.  Other systems
-# lack mkstemp altogether.  On either type of system, arrange to use the
-# replacement function.
-AC_DEFUN([UTILS_FUNC_MKSTEMP],
+# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
+# silly limit that it can create no more than 26 files from a given template.
+# Other systems lack mkstemp altogether.
+# On OSF1/Tru64 V4.0F, the system-provided mkstemp function can create
+# only 32 files per process.
+# On systems like the above, arrange to use the replacement function.
+AC_DEFUN([gl_FUNC_MKSTEMP],
 [dnl
   AC_REPLACE_FUNCS(mkstemp)
   if test $ac_cv_func_mkstemp = no; then
-    utils_cv_func_mkstemp_limitations=yes
+    gl_cv_func_mkstemp_limitations=yes
   else
     AC_CACHE_CHECK([for mkstemp limitations],
-      utils_cv_func_mkstemp_limitations,
+      gl_cv_func_mkstemp_limitations,
       [
-	utils_tmpdir_mkstemp=mkst-$$$$
-	# Arrange for deletion-upon-exception of this temporary directory.
-	ac_clean_files="$ac_clean_files $utils_tmpdir_mkstemp"
-	mkdir $utils_tmpdir_mkstemp
-
 	AC_TRY_RUN([
 #         include <stdlib.h>
 	  int main ()
 	  {
 	    int i;
-	    for (i = 0; i < 30; i++)
+	    for (i = 0; i < 70; i++)
 	      {
-		char template[] = "$utils_tmpdir_mkstemp/aXXXXXX";
+		char template[] = "conftestXXXXXX";
 		int fd = mkstemp (template);
 		if (fd == -1)
 		  exit (1);
@@ -34,20 +31,36 @@ AC_DEFUN([UTILS_FUNC_MKSTEMP],
 	    exit (0);
 	  }
 	  ],
-	utils_cv_func_mkstemp_limitations=no,
-	utils_cv_func_mkstemp_limitations=yes,
-	utils_cv_func_mkstemp_limitations=yes
+	gl_cv_func_mkstemp_limitations=no,
+	gl_cv_func_mkstemp_limitations=yes,
+	gl_cv_func_mkstemp_limitations=yes
 	)
-
-	rm -rf $utils_tmpdir_mkstemp
       ]
     )
   fi
 
-  if test $utils_cv_func_mkstemp_limitations = yes; then
+  if test $gl_cv_func_mkstemp_limitations = yes; then
     AC_LIBOBJ(mkstemp)
     AC_LIBOBJ(tempname)
     AC_DEFINE(mkstemp, rpl_mkstemp,
       [Define to rpl_mkstemp if the replacement function should be used.])
+    gl_PREREQ_MKSTEMP
+    gl_PREREQ_TEMPNAME
   fi
 ])
+
+# Prerequisites of lib/mkstemp.c.
+AC_DEFUN([gl_PREREQ_MKSTEMP],
+[
+])
+
+# Prerequisites of lib/tempname.c.
+AC_DEFUN([gl_PREREQ_TEMPNAME],
+[
+  AC_REQUIRE([AC_HEADER_STAT])
+  AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h)
+  AC_CHECK_HEADERS(stdint.h)
+  AC_CHECK_FUNCS(__secure_getenv gettimeofday)
+  AC_CHECK_DECLS_ONCE(getenv)
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+])