X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftmpfile.m4;h=a0b8be72f069bd75086c826383848e8d9cdd73b4;hb=0b3a22be69e9afb311ae8b64e141155b3d948f14;hp=5dc24b2f39b642b94aab324f61b2037afeeaab86;hpb=8c0f3c676c064ef15324eecd9c9892f1d07134db;p=gnulib.git

diff --git a/m4/tmpfile.m4 b/m4/tmpfile.m4
index 5dc24b2f3..a0b8be72f 100644
--- a/m4/tmpfile.m4
+++ b/m4/tmpfile.m4
@@ -1,12 +1,13 @@
-# Check whether to use a replacement tmpfile() function.
-
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# tmpfile.m4 serial 2
+# Copyright (C) 2007, 2009-2011 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.
 
 # Written by Ben Pfaff.
 
+# Check whether to use a replacement tmpfile() function.
+
 # The native Windows tmpfile function always tries to put the temporary
 # file in the root directory.  (This behaviour is even documented in
 # Microsoft's documentation!)  This often fails for ordinary users who
@@ -17,7 +18,8 @@
 # directory, even though tmpfile wouldn't work in general.  Instead,
 # just test for a Windows platform (excluding Cygwin).
 
-AC_DEFUN([gl_TMPFILE], [
+AC_DEFUN([gl_FUNC_TMPFILE], [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_CACHE_CHECK([whether tmpfile should be overridden],
     [gl_cv_func_tmpfile_unusable],
     [AC_EGREP_CPP([choke me], [
@@ -28,10 +30,7 @@ choke me
        [gl_cv_func_tmpfile_unusable=yes],
        [gl_cv_func_tmpfile_unusable=no])])
   if test $gl_cv_func_tmpfile_unusable = yes; then
-    AC_LIBOBJ(tmpfile)
-    AC_DEFINE(tmpfile, rpl_tmpfile,
-      [Define to rpl_tmpfile if the replacement function should be used.])
-    gl_PREREQ_TMPFILE
+    REPLACE_TMPFILE=1
   fi
 ])