Index: config.auto.h.in
===================================================================
--- config.auto.h.in	(revision 2546)
+++ config.auto.h.in	(revision 2547)
@@ -5,15 +5,6 @@
 /* Define to 1 if you have the `getpwuid' function. */
 #define HAVE_GETPWUID 1
 
-/* Define to 1 if you have the `mkdir' function. */
-#define HAVE_MKDIR 1
-
-/* Define to 1 if you have the `_mkdir' function. */
-/* #undef HAVE__MKDIR */
-
-/* Define to 1 if you have the `mkdtemp' function. */
-#define HAVE_MKDTEMP 1
-
 /* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
 
@@ -26,10 +17,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define if mkdir takes only one argument. */
-/* #undef MKDIR_TAKES_ONE_ARG */
-
-
 /****************************************************************************/
 /* Static defines to enable extra features on some systems; once we get
    testers on those systems, we can remove them and see if scconfig figured
@@ -110,13 +97,24 @@
 print {\n\n/* Define to 1 if we should use windows api for dynamic linking. */\n}
 print_ternary ?libs/LoadLibrary/presents {#define USE_LOADLIBRARY 1} {/* #undef USE_LOADLIBRARY */}
 
+print {\n\n/* Define to 1 if we should use mkdtemp for creating temp files. */\n}
+print_ternary ?libs/fs/mkdtemp/presents {#define HAVE_MKDTEMP 1} {/* #undef HAVE_MKDTEMP */}
+
 print {\n\n/* Select which mechanism to use for running child processes. */\n}
 print_ternary ?/target/libs/proc/wait/presents     {#define USE_FORK_WAIT 1} {/* #undef USE_FORK_WAIT */}
 print {\n}
 print_ternary ?/target/libs/proc/_spawnvp/presents {#define USE_SPAWNVP 1}   {/* #undef USE_SPAWNVP */}
 
+print {\n\n/* Select which mechanism to use for creating a directory. */\n}
+print_ternary ?/target/libs/fs/mkdir/presents     {#define USE_MKDIR 1} {/* #undef USE_MKDIR */}
+print {\n}
+print_ternary ?/target/libs/fs/_mkdir/presents    {#define USE__MKDIR 1} {/* #undef USE__MKDIR */}
 print [@
+#define MKDIR_NUM_ARGS 0@?/target/libs/fs/_mkdir/num_args@@?/target/libs/fs/mkdir/num_args@
+@]
 
+print [@
+
 /* The host "triplet" - it's really a pair now: machine-os */
 #define HOST "@sys/sysid@"