X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmkstemp.m4;h=fb6cfcdf7b5773d50ad16c0905cd6678ba129a66;hb=5cc13c0f36d18dd428c7cceebd30ff8de6e2ff1e;hp=0322da3498cb4fb1aba611d4f4f2cd8cdba8bdb0;hpb=40fc0427a65230122dbbf0e7c42edbe24e14602f;p=gnulib.git

diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index 0322da349..fb6cfcdf7 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,49 +1,59 @@
-#serial 3
+#serial 11
+
+# Copyright (C) 2001, 2003, 2004, 2005 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.
 
 # 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 either type of system, arrange
-# to use the replacement function.
-AC_DEFUN([UTILS_FUNC_MKSTEMP],
+# 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,
       [
+        mkdir conftest.mkstemp
 	AC_TRY_RUN([
-#         include <stdlib.h>
-	  int main ()
-	  {
-	    int i;
-	    for (i = 0; i < 30; i++)
-	      {
-		char template[] = "conftestXXXXXX";
-		int fd = mkstemp (template);
-		if (fd == -1)
-		  exit (1);
-		close (fd);
-	      }
-	    exit (0);
-	  }
-	  ],
-	utils_cv_func_mkstemp_limitations=no,
-	utils_cv_func_mkstemp_limitations=yes,
-	utils_cv_func_mkstemp_limitations=yes
-	)
+#           include <stdlib.h>
+#           include <unistd.h>
+	    int main ()
+	    {
+	      int i;
+	      for (i = 0; i < 70; i++)
+		{
+		  char template[] = "conftest.mkstemp/coXXXXXX";
+		  int fd = mkstemp (template);
+		  if (fd == -1)
+		    exit (1);
+		  close (fd);
+		}
+	      exit (0);
+	    }
+	    ],
+	  gl_cv_func_mkstemp_limitations=no,
+	  gl_cv_func_mkstemp_limitations=yes,
+	  gl_cv_func_mkstemp_limitations=yes
+	  )
+        rm -rf conftest.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
-    jm_PREREQ_TEMPNAME
+    gl_PREREQ_TEMPNAME
   fi
 ])
 
@@ -53,13 +63,10 @@ AC_DEFUN([gl_PREREQ_MKSTEMP],
 ])
 
 # Prerequisites of lib/tempname.c.
-AC_DEFUN([jm_PREREQ_TEMPNAME],
+AC_DEFUN([gl_PREREQ_TEMPNAME],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_REQUIRE([AC_HEADER_STAT])
-  AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h)
-  AC_CHECK_HEADERS(stdint.h)
+  AC_CHECK_HEADERS_ONCE(sys/time.h stdint.h unistd.h)
   AC_CHECK_FUNCS(__secure_getenv gettimeofday)
   AC_CHECK_DECLS_ONCE(getenv)
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
 ])