[Emacs-diffs] trunk r115275: Replace PATH_SEP with pre-existing SEPCHAR.

[Glenn Morris]

------------------------------------------------------------
revno: 115275
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-11-28 15:50:09 -0800
message:
  Replace PATH_SEP with pre-existing SEPCHAR.
  
  * configure.ac:
  * test/automated/Makefile.in: Use SEPCHAR in place of PATH_SEP.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-11-28 17:45:26 +0000
+++ b/ChangeLog 2013-11-28 23:50:09 +0000
@@ -1,3 +1,7 @@
+2013-11-28  Glenn Morris  <address@hidden>
+
+       * configure.ac (PATH_SEP): Replace with pre-existing SEPCHAR.
+
 2013-11-28  Eli Zaretskii  <address@hidden>
 
        * GNUmakefile (Makefile): Don't use $(CFG).

=== modified file 'configure.ac'
--- a/configure.ac      2013-11-28 17:35:13 +0000
+++ b/configure.ac      2013-11-28 23:50:09 +0000
@@ -923,22 +923,6 @@
   LN_S="ln"
 fi
 
-dnl This is for MinGW, and is used in test/automated/Makefile.in.
-dnl The MSYS Bash has heuristics for replacing ':' with ';' when it
-dnl decides that a command-line argument to be passed to a MinGW program
-dnl is a PATH-style list of directories.  But that heuristics plays it
-dnl safe, and only does the replacement when it is _absolutely_ sure it
-dnl sees a colon-seperated list of file names; e.g. ":." is left alone,
-dnl which breaks in-tree builds.  So we do this manually instead.
-dnl Note that we cannot rely on PATH_SEPARATOR, as that one will always
-dnl be computed as ':' in MSYS Bash.
-if test "$opsys" = "mingw32"; then
-  PATH_SEP=';'
-else
-  PATH_SEP=':'
-fi
-AC_SUBST(PATH_SEP)
-
 AC_PATH_PROG(INSTALL_INFO, install-info, :,
   $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
 dnl Don't use GZIP, which is used by gzip for additional parameters.
@@ -3851,12 +3835,22 @@
   AC_DEFINE(NULL_DEVICE, ["/dev/null"])
 fi
 
-AH_TEMPLATE(SEPCHAR, [Character that separates PATH elements.])
 if test "${opsys}" = "mingw32"; then
-  AC_DEFINE(SEPCHAR, [';'])
+  SEPCHAR=';'
 else
-  AC_DEFINE(SEPCHAR, [':'])
+  SEPCHAR=':'
 fi
+AC_DEFINE_UNQUOTED(SEPCHAR, ['$SEPCHAR'], [Character that separates PATH 
elements.])
+dnl This is for MinGW, and is used in test/automated/Makefile.in.
+dnl The MSYS Bash has heuristics for replacing ':' with ';' when it
+dnl decides that a command-line argument to be passed to a MinGW program
+dnl is a PATH-style list of directories.  But that heuristics plays it
+dnl safe, and only does the replacement when it is _absolutely_ sure it
+dnl sees a colon-seperated list of file names; e.g. ":." is left alone,
+dnl which breaks in-tree builds.  So we do this manually instead.
+dnl Note that we cannot rely on PATH_SEPARATOR, as that one will always
+dnl be computed as ':' in MSYS Bash.
+AC_SUBST(SEPCHAR)
 
 dnl Everybody supports this, except MS-DOS.
 AC_DEFINE(subprocesses, 1, [Define to enable asynchronous subprocesses.])

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-28 17:35:13 +0000
+++ b/test/ChangeLog    2013-11-28 23:50:09 +0000
@@ -1,3 +1,7 @@
+2013-11-28  Glenn Morris  <address@hidden>
+
+       * automated/Makefile.in (SEPCHAR): Use in place of PATH_SEP.
+
 2013-11-28  Eli Zaretskii  <address@hidden>
 
        * automated/Makefile.in (PATH_SEP): Set this instead of

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-11-28 17:35:13 +0000
+++ b/test/automated/Makefile.in        2013-11-28 23:50:09 +0000
@@ -22,7 +22,7 @@
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
-PATH_SEP = @PATH_SEP@
+SEPCHAR = @SEPCHAR@
 
 # Empty for all systems except MinGW, where xargs needs an explicit
 # limitation.
@@ -36,7 +36,7 @@
 # Command line flags for Emacs.
 # Apparently MSYS bash would convert "-L :" to "-L ;" anyway,
 # but we might as well be explicit.
-EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(PATH_SEP)$(srcdir)"
+EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)"
 
 # Extra flags to pass to the byte compiler.
 BYTE_COMPILE_EXTRA_FLAGS =