+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
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' \
# 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 | \
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' \
# 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; \
BEGIN
{
my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
- unshift @INC, (split ':', $perllibdir);
+ unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
}
use Automake::Config;
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.
# $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
# $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
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.
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+"$@"}
# -*- 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.
# 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"