automake 1.8.3 patches for OS/2

[Andreas Buening]

Hello!

Since ':' can be part of a filename, e.g. c:/some/dir, don't
hardcode the path separator but use $PATH_SEPARATOR instead
which is defined by autoconf.


ChangeLog:
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 ':'.


-------------------------------
--- old/automake-1.8.3/aclocal.in       Sat Feb  7 12:32:56 2004
+++ gnu/automake-1.8.3/aclocal.in       Sat Apr 10 14:41:42 2004
@@ -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;
-------------------------------


-------------------------------
--- old/automake-1.8.3/automake.in      Sun Feb 29 17:27:06 2004
+++ gnu/automake-1.8.3/automake.in      Sat Apr 10 14:42:00 2004
@@ -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.
-------------------------------


-------------------------------
--- old/automake-1.8.3/configure.ac     Sun Mar  7 17:03:14 2004
+++ gnu/automake-1.8.3/configure.ac     Sat Apr 10 14:43:18 2004
@@ -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
-------------------------------


-------------------------------
--- old/automake-1.8.3/Makefile.am      Tue Jan 27 22:13:16 2004
+++ gnu/automake-1.8.3/Makefile.am      Sat Apr 10 14:44:16 2004
@@ -65,7 +65,8 @@
   -e 's,address@hidden@],$(SHELL),g' \
   -e 's,address@hidden@],$(VERSION),g' \
   -e 's,address@hidden@],Generated from address@hidden; do not edit by 
hand.,g' \
-  -e 's,address@hidden@],$(datadir),g'
+  -e 's,address@hidden@],$(datadir),g' \
+  -e 's,address@hidden@],$(PATH_SEPARATOR),g'

 ## These files depend on Makefile so they are rebuilt if $(VERSION),
 ## $(datadir) or other do_subst'ituted variables change.
@@ -108,8 +109,8 @@
          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 | \
-------------------------------


-------------------------------
--- old/automake-1.8.3/tests/defs.in    Tue Dec  9 21:24:12 2003
+++ gnu/automake-1.8.3/tests/defs.in    Sat Apr 10 14:45:10 2004
@@ -83,7 +83,7 @@
 # should use -Wnone or/and -Wno-error
 test -z "$AUTOMAKE" && AUTOMAKE="address@hidden@ --foreign -Werror -Wall"


-PATH=`pwd`:$PATH
+PATH=`pwd`"@address@hidden"
 echo $PATH

 if test -n "$required"
-------------------------------


-------------------------------
--- old/automake-1.8.3/tests/aclocal.in Tue Dec  9 21:24:12 2003
+++ gnu/automake-1.8.3/tests/aclocal.in Sat Apr 10 14:45:40 2004
@@ -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.
-------------------------------


-------------------------------
--- old/automake-1.8.3/tests/automake.in        Tue Dec  9 21:24:12 2003
+++ gnu/automake-1.8.3/tests/automake.in        Sat Apr 10 14:46:02 2004
@@ -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+"$@"}
-------------------------------


Bye,
Andreas