6 files changed, 24 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index de5c215b032..63c927d71eb 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Add checks for mkdtemp(), snprintf(), and
+	stat64().
+
 2009-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Add checks for <locale.h>, fmax(), setlocale(),
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 725d0d7217c..e3928b49846 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -137,6 +137,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `mkdtemp' function. */
+#undef HAVE_MKDTEMP
+
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
@@ -162,6 +165,12 @@
 /* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
+/* Define to 1 if you have the `stat64' function. */
+#undef HAVE_STAT64
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index da880532d01..3b86cc33d67 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18565,7 +18565,7 @@ if test "$ac_res" != no; then :
 
 fi
 
-for ac_func in access atoi fmax setlocale strerror strlcat strlcpy gettimeofday ftime
+for ac_func in access atoi fmax ftime gettimeofday mkdtemp setlocale snprintf stat64 strerror strlcat strlcpy
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 09d0cb29ed3..d83c13c693a 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -217,12 +217,10 @@ if test `(uname) 2>/dev/null` = aux; then
   AC_CHECK_LIB([posix], [sigemptyset])
 fi
 
-dnl FIXME: luaTeX requires <unistd.h>, access, and atoi
-dnl
 AC_CHECK_SIZEOF([int])
 AC_CHECK_SIZEOF([long])
 AC_SEARCH_LIBS([pow], [m])
-AC_CHECK_FUNCS([access atoi fmax setlocale strerror strlcat strlcpy gettimeofday ftime])
+AC_CHECK_FUNCS([access atoi fmax ftime gettimeofday mkdtemp setlocale snprintf stat64 strerror strlcat strlcpy])
 AC_CHECK_HEADERS([errno.h langinfo.h locale.h sys/time.h sys/timeb.h sys/wait.h time.h])
 AC_TYPE_LONG_DOUBLE
 AC_TYPE_LONG_LONG_INT
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 3e5ee0db483..1a2a83e4c08 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* lua/loslibext.c (do_mkdtemp): Declare as static and skip
+	compilation when not used.
+
 2009-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pdf/pagetree.c, utils/utils.c: Drop #ifdef HAVE_ASPRINTF and
diff --git a/Build/source/texk/web2c/luatexdir/lua/loslibext.c b/Build/source/texk/web2c/luatexdir/lua/loslibext.c
index 979ed4202a8..95d27a20f37 100644
--- a/Build/source/texk/web2c/luatexdir/lua/loslibext.c
+++ b/Build/source/texk/web2c/luatexdir/lua/loslibext.c
@@ -810,13 +810,14 @@ static int os_gettimeofday(lua_State * L)
 }
 #endif
 
+#ifndef HAVE_MKDTEMP
 static const char repl[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 static int dirs_made = 0;
 
 #define MAXTRIES 36*36*36
 
-char *do_mkdtemp(char *tmpl)
+static char *do_mkdtemp(char *tmpl)
 {
     int count;
     int value;
@@ -848,6 +849,7 @@ char *do_mkdtemp(char *tmpl)
     }
     return NULL;
 }
+#endif
 
 static int os_tmpdir(lua_State * L)
 {