FYI: s/conftestfoo/conftest.foo/

[Pavel Roskin]

--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,19 @@
+2001-01-29  Pavel Roskin  <address@hidden>
+
+       Don't use filenames that can be reduced to "conftest" on DOS.
+
+       * acfunctions.m4 (AC_FUNC_MMAP): Use conftest.mmap, not
+       conftestmmap.
+       (AC_FUNC_UTIME_NULL): Use conftest.data, not conftestdata.
+       * acspecific.m4 (AC_PROG_MAKE_SET): Use conftest.make, not
+       conftestmake.
+       (_AC_PATH_X_XMKMF): Use conftest.dir, not conftestdir.
+       * acgeneral.m4 (AC_ARG_PROGRAM): Use conftest.sed, not
+       conftestsed.
+       * m4/sanity.m4: Use conftest.file, not conftestfile.
+       * doc/autoconf.texi (Guidelines for Test Programs): Suggest
+       using conftest.data, not conftestdata.
+
 2001-01-29  Akim Demaille  <address@hidden>

        * tests/atgeneral.m4: Don't redirect builtins' stderr as Ultrix
--- acfunctions.m4
+++ acfunctions.m4
@@ -1030,7 +1030,7 @@
   for (i = 0; i < pagesize; ++i)
     *(data + i) = rand ();
   umask (0);
-  fd = creat ("conftestmmap", 0600);
+  fd = creat ("conftest.mmap", 0600);
   if (fd < 0)
     exit (1);
   if (write (fd, data, pagesize) != pagesize)
@@ -1040,7 +1040,7 @@
   /* Next, try to mmap the file at a fixed address which already has
      something else allocated at it.  If we can, also make sure that
      we see the same garbage.  */
-  fd = open ("conftestmmap", O_RDWR);
+  fd = open ("conftest.mmap", O_RDWR);
   if (fd < 0)
     exit (1);
   data2 = (char *) malloc (2 * pagesize);
@@ -1077,7 +1077,7 @@
   AC_DEFINE(HAVE_MMAP, 1,
             [Define if you have a working `mmap' system call.])
 fi
-rm -f conftestmmap
+rm -f conftest.mmap
 ])# AC_FUNC_MMAP


@@ -1383,7 +1383,7 @@
 # ------------------
 AC_DEFUN([AC_FUNC_UTIME_NULL],
 [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null,
-[rm -f conftestdata; >conftestdata
+[rm -f conftest.data; >conftest.data
 # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
 AC_TRY_RUN(
 [#include <sys/types.h>
@@ -1392,9 +1392,9 @@
 main ()
 {
   struct stat s, t;
-  exit (!(stat ("conftestdata", &s) == 0
-          && utime ("conftestdata", (long *)0) == 0
-          && stat ("conftestdata", &t) == 0
+  exit (!(stat ("conftest.data", &s) == 0
+          && utime ("conftest.data", (long *)0) == 0
+          && stat ("conftest.data", &t) == 0
           && t.st_mtime >= s.st_mtime
           && t.st_mtime - s.st_mtime < 120));
 }], ac_cv_func_utime_null=yes, ac_cv_func_utime_null=no,
@@ -1405,7 +1405,7 @@
             [Define if `utime(file, NULL)' sets file's timestamp to the
              present.])
 fi
-rm -f conftestdata
+rm -f conftest.data
 ])# AC_FUNC_UTIME_NULL


--- acgeneral.m4
+++ acgeneral.m4
@@ -1702,11 +1702,11 @@
   program_transform_name=
 else
   # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF >conftestsed
+  cat <<\EOF >conftest.sed
 s,\\,\\\\,g; s,\$,$$,g
 EOF
-  program_transform_name=`echo $program_transform_name | sed -f conftestsed`
-  rm -f conftestsed
+  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+  rm -f conftest.sed
 fi
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,${program_prefix},;$program_transform_name"
--- acspecific.m4
+++ acspecific.m4
@@ -84,18 +84,18 @@
 [AC_MSG_CHECKING([whether ${MAKE-make} sets \${MAKE}])
 set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,./+-,__p_,'`
 AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
-[cat >conftestmake <<\EOF
+[cat >conftest.make <<\EOF
 all:
        @echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake])dnl
+rm -f conftest.make])dnl
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
   AC_MSG_RESULT([yes])
   SET_MAKE=
@@ -568,9 +568,9 @@
 # Internal subroutine of _AC_PATH_X.
 # Set ac_x_includes and/or ac_x_libraries.
 m4_define([_AC_PATH_X_XMKMF],
-[rm -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
+[rm -fr conftest.dir
+if mkdir conftest.dir; then
+  cd conftest.dir
   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'EOF'
 acfindx:
@@ -599,7 +599,7 @@
     esac
   fi
   cd ..
-  rm -fr conftestdir
+  rm -fr conftest.dir
 fi
 ])# _AC_PATH_X_XMKMF

--- doc/autoconf.texi
+++ doc/autoconf.texi
@@ -4952,7 +4952,7 @@
 @end example

 If a test program needs to use or create a data file, give it a name
-that starts with @file{conftest}, such as @file{conftestdata}.  The
+that starts with @file{conftest}, such as @file{conftest.data}.  The
 @code{configure} script cleans up by running @samp{rm -rf conftest*}
 after running test programs and if the script is interrupted.

--- m4/sanity.m4
+++ m4/sanity.m4
@@ -6,20 +6,20 @@
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
    if test "[$]*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
+      set X `ls -t $srcdir/configure conftest.file`
    fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+   if test "[$]*" != "X $srcdir/configure conftest.file" \
+      && test "[$]*" != "X conftest.file $srcdir/configure"; then

       # If neither matched, then we have a broken ls.  This can happen
       # if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -29,7 +29,7 @@
 alias in your environment])
    fi

-   test "[$]2" = conftestfile
+   test "[$]2" = conftest.file
    )
 then
    # Ok.
___________________________________________