* aclocal.in, automake.in, configure.ac, Makefile.am,

tests/aclocal.in, tests/automake.in, tests/defs.in:
Use PATH_SEPARATOR from autoconf instead of ':'.

11 files changed, 29 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index eaff528ea..0976ce51a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-10  Andreas Buening  <andreas.buening@nexgo.de>
+
+	* aclocal.in, automake.in, configure.ac, Makefile.am,
+	tests/aclocal.in, tests/automake.in, tests/defs.in:
+	Use PATH_SEPARATOR from autoconf instead of ':'.
+
 2004-04-09  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* automake.in (handle_lib_objects): Pass the condition of
diff --git a/Makefile.am b/Makefile.am
index eb1284c7c..937fd2ca0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ uninstall-hook:
 do_subst = sed \
   -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+  -e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
   -e 's,[@]PERL[@],$(PERL),g' \
   -e 's,[@]SHELL[@],$(SHELL),g' \
   -e 's,[@]VERSION[@],$(VERSION),g' \
@@ -100,16 +101,16 @@ INSTALL: lib/INSTALL
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
 ## This check avoids accidental configure substitutions in the source.
-## There are exactly 5 lines that should be modified.  This works out
-## to 20 lines of diffs.
-	@if test `diff $(srcdir)/automake.in automake | wc -l` -ne 20; then \
+## There are exactly 6 lines that should be modified.  This works out
+## to 22 lines of diffs.
+	@if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
 	  echo "found too many diffs between automake.in and automake"; 1>&2; \
 	  diff -c $(srcdir)/automake.in automake; \
 	  exit 1; \
 	fi
 ## Syntax check with default Perl (on my machine, Perl 5).
-	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w automake
-	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w aclocal
+	perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
+	perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
 ## expect no instances of '${...}'.  However, $${...} is ok, since that
 ## is a shell construct, not a Makefile construct.
 	@if grep -F '$${' $(srcdir)/lib/am/[a-z]*.am | \
diff --git a/Makefile.in b/Makefile.in
index c330b9da5..eda76bc55 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,6 +153,7 @@ EXTRA_DIST = ChangeLog.96 ChangeLog.98 ChangeLog.00 ChangeLog.01 ChangeLog.02 \
 do_subst = sed \
   -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+  -e 's,[@]PATH_SEPARATOR[@],$(PATH_SEPARATOR),g' \
   -e 's,[@]PERL[@],$(PERL),g' \
   -e 's,[@]SHELL[@],$(SHELL),g' \
   -e 's,[@]VERSION[@],$(VERSION),g' \
@@ -625,13 +626,13 @@ INSTALL: lib/INSTALL
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
-	@if test `diff $(srcdir)/automake.in automake | wc -l` -ne 20; then \
+	@if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
 	  echo "found too many diffs between automake.in and automake"; 1>&2; \
 	  diff -c $(srcdir)/automake.in automake; \
 	  exit 1; \
 	fi
-	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w automake
-	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w aclocal
+	perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
+	perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
 	@if grep -F '$${' $(srcdir)/lib/am/[a-z]*.am | \
 	       grep -F -v '$$$$'; then \
 	  echo "Found too many uses of '\$${' in the lines above." 1>&2; \
diff --git a/NEWS b/NEWS
index a00fe4ed9..4f97bf17f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ Bugs fixed in 1.8.3a:
   - Fix AM_PATH_PYTHON to correctly display $PYTHON when it has been
     overridden by the user.
 
+  - Honor PATH_SEPARATOR in various places of the Automake package, for
+    the sake of OS/2.
+
 * Bugs introduced by 1.8:
 
   - Fix an "internal error" when @LIBOBJS@ is used in a variable that is
diff --git a/aclocal.in b/aclocal.in
index f734664b9..c8d4c4a07 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -30,7 +30,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 BEGIN
 {
   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-  unshift @INC, (split ':', $perllibdir);
+  unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 }
 
 use Automake::Config;
diff --git a/automake.in b/automake.in
index 5b873b88f..f8d7402f0 100755
--- a/automake.in
+++ b/automake.in
@@ -32,7 +32,7 @@ package Language;
 BEGIN
 {
   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
-  unshift @INC, (split ':', $perllibdir);
+  unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 
   # Override SHELL.  This is required on DJGPP so that system() uses
   # bash, not COMMAND.COM which doesn't quote arguments properly.
diff --git a/configure b/configure
index 8528ccb13..164d0008d 100755
--- a/configure
+++ b/configure
@@ -1947,8 +1947,8 @@ pkgvdatadir="\${datadir}/automake-${APIVERSION}"
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
 # hence `.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=`pwd`/lib:./lib `pwd`/aclocal --acdir=m4"
-AUTOMAKE="perllibdir=`pwd`/lib:./lib `pwd`/automake --libdir=lib"
+ACLOCAL="perllibdir=`pwd`\"/lib$PATH_SEPARATOR./lib\" `pwd`/aclocal --acdir=m4"
+AUTOMAKE="perllibdir=`pwd`\"/lib$PATH_SEPARATOR./lib\" `pwd`/automake --libdir=lib"
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
diff --git a/configure.ac b/configure.ac
index a6d63e4bf..cc8d9e284 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,8 @@ AC_SUBST(pkgvdatadir)
 
 # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
 # hence `.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=`pwd`/lib:./lib `pwd`/aclocal --acdir=m4"
-AUTOMAKE="perllibdir=`pwd`/lib:./lib `pwd`/automake --libdir=lib"
+ACLOCAL="perllibdir=`pwd`\"/lib$PATH_SEPARATOR./lib\" `pwd`/aclocal --acdir=m4"
+AUTOMAKE="perllibdir=`pwd`\"/lib$PATH_SEPARATOR./lib\" `pwd`/automake --libdir=lib"
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then
diff --git a/tests/aclocal.in b/tests/aclocal.in
index 65ea11e48..59b7e8b50 100644
--- a/tests/aclocal.in
+++ b/tests/aclocal.in
@@ -10,7 +10,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
 fi
 
-perllibdir=@abs_top_builddir@/lib:@abs_top_srcdir@/lib
+perllibdir="@abs_top_builddir@/lib@PATH_SEPARATOR@@abs_top_srcdir@/lib"
 export perllibdir
 # Most of the files are in $srcdir/../m4.  However amversion.m4 is
 # generated in ../m4, so we include that directory in the search path too.
diff --git a/tests/automake.in b/tests/automake.in
index 1df424e54..4a8634568 100644
--- a/tests/automake.in
+++ b/tests/automake.in
@@ -10,6 +10,6 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
 fi
 
-perllibdir=@abs_top_builddir@/lib:@abs_top_srcdir@/lib
+perllibdir="@abs_top_builddir@/lib@PATH_SEPARATOR@@abs_top_srcdir@/lib"
 export perllibdir
 exec @abs_top_builddir@/automake --libdir=@abs_top_srcdir@/lib ${1+"$@"}
diff --git a/tests/defs.in b/tests/defs.in
index d18829e37..5fdf1c195 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -1,7 +1,7 @@
 # -*- shell-script -*-
 # @configure_input@
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
@@ -83,7 +83,7 @@ test -z "$ACLOCAL" && ACLOCAL="aclocal-@APIVERSION@"
 # should use -Wnone or/and -Wno-error
 test -z "$AUTOMAKE" && AUTOMAKE="automake-@APIVERSION@ --foreign -Werror -Wall"
 
-PATH=`pwd`:$PATH
+PATH="`pwd`@PATH_SEPARATOR@$PATH"
 echo $PATH
 
 if test -n "$required"