X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdos.m4;h=0713cf14e6fe0af53a7ae826b8197c07326b55e4;hb=523067dbfb281d3cc27f65007a3893bd694c257d;hp=d1fa140d19902460d9093ffe1ec4f6873731cb35;hpb=77bb6988915a58367fb3996a3426748dd1f5e7c9;p=gnulib.git

diff --git a/m4/dos.m4 b/m4/dos.m4
index d1fa140d1..0713cf14e 100644
--- a/m4/dos.m4
+++ b/m4/dos.m4
@@ -1,27 +1,58 @@
-# serial 1
+#serial 9
 
 # Define some macros required for proper operation of code in lib/*.c
 # on MSDOS/Windows systems.
 
+# Copyright (C) 2000, 2001, 2004 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.
+
 # From Jim Meyering.
 
-AC_DEFUN(jm_AC_DOS,
+AC_DEFUN([gl_AC_DOS],
   [
-    # FIXME: this is incomplete.  Add a compile-test that does something
-    # like this:
-    #if defined _WIN32 || defined __WIN32__ || defined __MSDOS__
-
-    ac_fspl_def="((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)"
-    ac_fspl_def=0
-    AC_DEFINE_UNQUOTED([FILESYSTEM_PREFIX_LEN(Filename)], $ac_fspl_def,
-      [On systems for which file names may have a so-called `drive letter'
-       prefix, define this to compute the length of that prefix, including
-       the colon.  Otherwise, define it to zero.])
-
-    ac_isslash_def="((C) == '/' || (C) == '\\')"
-    ac_isslash_def="((C) == '/')"
-    AC_DEFINE_UNQUOTED([ISSLASH(C)], $ac_isslash_def,
-      [Define to return nonzero for any character that may serve as
-       a file name component separator.  On POSIX systems, it is the
-       slash character.  Some other systems also accept backslash.])
+    AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
+      [
+        AC_TRY_COMPILE([],
+        [#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__
+neither MSDOS nor Windows
+#endif],
+        [ac_cv_win_or_dos=yes],
+        [ac_cv_win_or_dos=no])
+      ])
+
+    if test x"$ac_cv_win_or_dos" = xyes; then
+      ac_fs_accepts_drive_letter_prefix=1
+      ac_fs_backslash_is_file_name_separator=1
+    else
+      ac_fs_accepts_drive_letter_prefix=0
+      ac_fs_backslash_is_file_name_separator=0
+    fi
+
+    AH_VERBATIM(FILE_SYSTEM_PREFIX_LEN,
+    [#if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+# define FILE_SYSTEM_PREFIX_LEN(Filename) \
+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
+#else
+# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
+#endif])
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
+      $ac_fs_accepts_drive_letter_prefix,
+      [Define on systems for which file names may have a so-called
+       `drive letter' prefix, define this to compute the length of that
+       prefix, including the colon.])
+
+    AH_VERBATIM(ISSLASH,
+    [#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#else
+# define ISSLASH(C) ((C) == '/')
+#endif])
+
+    AC_DEFINE_UNQUOTED([FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
+      $ac_fs_backslash_is_file_name_separator,
+      [Define if the backslash character may also serve as a file name
+       component separator.])
   ])