Re: automake 1.8.3 patches for OS/2

[Alexandre Duret-Lutz]

>>> "Andreas" == Andreas Buening <address@hidden> writes:

[...]

 Andreas> AFAIK, perllibdir=dir1;dir2 ./command
 Andreas> is treated by the shell as

 Andreas> perllibdir=dir1;
 Andreas> dir2 ./command

 Andreas> but
 Andreas> perllibdir="dir1;dir2" ./command
 Andreas> should work as expected.

Thanks!  I'm so used to the harmless unix path separator I
couldn't figure this out...

I've installed your patch on HEAD and branch-1-8 as follows (I
had trouble applying it because some lines were wrapped in the
patch; I hope it's OK).

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.2464.2.74
diff -u -r1.2464.2.74 ChangeLog
--- ChangeLog   10 Apr 2004 17:15:04 -0000      1.2464.2.74
+++ ChangeLog   10 Apr 2004 17:15:47 -0000
@@ -1,3 +1,9 @@
+2004-04-10  Andreas Buening  <address@hidden>
+
+       * 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  <address@hidden>
 
        * automake.in (handle_lib_objects): Pass the condition of
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.226.2.2
diff -u -r1.226.2.2 Makefile.am
--- Makefile.am 28 Jan 2004 20:50:58 -0000      1.226.2.2
+++ Makefile.am 10 Apr 2004 17:15:48 -0000
@@ -61,6 +61,7 @@
 do_subst = sed \
   -e 's,address@hidden@],$(APIVERSION),g' \
   -e 's,address@hidden@],$(PACKAGE),g' \
+  -e 's,address@hidden@],$(PATH_SEPARATOR),g' \
   -e 's,address@hidden@],$(PERL),g' \
   -e 's,address@hidden@],$(SHELL),g' \
   -e 's,address@hidden@],$(VERSION),g' \
@@ -100,16 +101,16 @@
 # 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 | \
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.256.2.37
diff -u -r1.256.2.37 NEWS
--- NEWS        10 Apr 2004 17:15:04 -0000      1.256.2.37
+++ NEWS        10 Apr 2004 17:15:49 -0000
@@ -5,6 +5,9 @@
   - 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
Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.96.2.4
diff -u -r1.96.2.4 aclocal.in
--- aclocal.in  7 Feb 2004 13:46:02 -0000       1.96.2.4
+++ aclocal.in  10 Apr 2004 17:15:49 -0000
@@ -30,7 +30,7 @@
 BEGIN
 {
   my $perllibdir = $ENV{'perllibdir'} || 
'@datadir@/@address@hidden@APIVERSION@';
-  unshift @INC, (split ':', $perllibdir);
+  unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
 }
 
 use Automake::Config;
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1526.2.10
diff -u -r1.1526.2.10 automake.in
--- automake.in 10 Apr 2004 17:15:04 -0000      1.1526.2.10
+++ automake.in 10 Apr 2004 17:15:53 -0000
@@ -32,7 +32,7 @@
 BEGIN
 {
   my $perllibdir = $ENV{'perllibdir'} || 
'@datadir@/@address@hidden@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.
Index: configure.ac
===================================================================
RCS file: /cvs/automake/automake/configure.ac,v
retrieving revision 1.12.2.11
diff -u -r1.12.2.11 configure.ac
--- configure.ac        7 Mar 2004 18:10:08 -0000       1.12.2.11
+++ configure.ac        10 Apr 2004 17:15:55 -0000
@@ -54,8 +54,8 @@
 
 # $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
Index: tests/aclocal.in
===================================================================
RCS file: /cvs/automake/automake/tests/aclocal.in,v
retrieving revision 1.2
diff -u -r1.2 aclocal.in
--- tests/aclocal.in    9 Dec 2003 21:24:12 -0000       1.2
+++ tests/aclocal.in    10 Apr 2004 17:15:56 -0000
@@ -10,7 +10,7 @@
   alias -g '${1+"$@"}'='"$@"'
 fi
 
address@hidden@/lib:@abs_top_srcdir@/lib
+perllibdir="@abs_top_builddir@/address@hidden@@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.
Index: tests/automake.in
===================================================================
RCS file: /cvs/automake/automake/tests/automake.in,v
retrieving revision 1.2
diff -u -r1.2 automake.in
--- tests/automake.in   9 Dec 2003 21:24:12 -0000       1.2
+++ tests/automake.in   10 Apr 2004 17:15:56 -0000
@@ -10,6 +10,6 @@
   alias -g '${1+"$@"}'='"$@"'
 fi
 
address@hidden@/lib:@abs_top_srcdir@/lib
+perllibdir="@abs_top_builddir@/address@hidden@@abs_top_srcdir@/lib"
 export perllibdir
 exec @abs_top_builddir@/automake address@hidden@/lib ${1+"$@"}
Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.26
diff -u -r1.26 defs.in
--- tests/defs.in       9 Dec 2003 21:24:12 -0000       1.26
+++ tests/defs.in       10 Apr 2004 17:15:56 -0000
@@ -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 @@
 # should use -Wnone or/and -Wno-error
 test -z "$AUTOMAKE" && AUTOMAKE="address@hidden@ --foreign -Werror -Wall"
 
-PATH=`pwd`:$PATH
+PATH="address@hidden@$PATH"
 echo $PATH
 
 if test -n "$required"
-- 
Alexandre Duret-Lutz