summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--aclocal.m479
-rwxr-xr-xconfigure28
-rw-r--r--configure.in2
-rw-r--r--lib/Automake/Makefile.in2
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/am/Makefile.in2
-rw-r--r--m4/Makefile.in2
-rw-r--r--stamp-vti4
-rw-r--r--tests/Makefile.in2
-rw-r--r--version.texi4
11 files changed, 80 insertions, 51 deletions
diff --git a/ChangeLog b/ChangeLog
index 4572a2ad9..94c4a242b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-11 Tom Tromey <tromey@redhat.com>
+
+ * configure.in: Upped to 1.4s.
+
2001-08-09 Richard Boulton <richard@tartarus.org>
* automake.in (handle_single_transform_list): Use new global,
diff --git a/aclocal.m4 b/aclocal.m4
index ff66ca186..1caa03e49 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -83,7 +83,7 @@ AM_MISSING_PROG(AUTOMAKE, automake)
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_MISSING_PROG(AMTAR, tar)
-AM_MISSING_INSTALL_SH
+AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -159,25 +159,6 @@ $1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-# AM_MISSING_INSTALL_SH
-# ---------------------
-# Like AM_MISSING_PROG, but only looks for install-sh.
-AC_DEFUN([AM_MISSING_INSTALL_SH],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-if test -z "$install_sh"; then
- for install_sh in "$ac_aux_dir/install-sh" \
- "$ac_aux_dir/install.sh" \
- "${am_missing_run}${ac_aux_dir}/install-sh";
- do
- test -f "$install_sh" && break
- done
- # FIXME: an evil hack: we remove the SHELL invocation from
- # install_sh because automake adds it back in. Sigh.
- install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
-fi
-AC_SUBST(install_sh)])
-
-
# AM_MISSING_HAS_RUN
# ------------------
# Define MISSING if not defined so far and test if it supports --run.
@@ -195,6 +176,59 @@ else
fi
])
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# AM_AUX_DIR_EXPAND
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+])
+
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
@@ -203,9 +237,8 @@ fi
# always use install-sh in `make install-strip', and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_MISSING_INSTALL_SH])dnl
-_am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`"
-INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# serial 4 -*- Autoconf -*-
diff --git a/configure b/configure
index 56dca8189..4d2f04dc2 100755
--- a/configure
+++ b/configure
@@ -677,12 +677,16 @@ else
echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
fi
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:686: checking for $ac_word" >&5
+echo "configure:690: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -712,7 +716,7 @@ test -n "$AWK" && break
done
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:716: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:720: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -780,7 +784,7 @@ fi
# Define the identity of the package.
PACKAGE=automake
-VERSION=1.4k
+VERSION=1.4s
cat >> confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
EOF
@@ -821,21 +825,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
AMTAR=${AMTAR-"${am_missing_run}tar"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-if test -z "$install_sh"; then
- for install_sh in "$ac_aux_dir/install-sh" \
- "$ac_aux_dir/install.sh" \
- "${am_missing_run}${ac_aux_dir}/install-sh";
- do
- test -f "$install_sh" && break
- done
- # FIXME: an evil hack: we remove the SHELL invocation from
- # install_sh because automake adds it back in. Sigh.
- install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
-fi
-
-_am_dirpart="`echo $install_sh | sed -e 's,//*[^/]*$,,'`"
-INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -849,7 +841,7 @@ AUTOMAKE="perllibdir=./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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:853: checking for $ac_word" >&5
+echo "configure:845: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/configure.in b/configure.in
index b3a11890b..83c565803 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(automake.in)
AC_CONFIG_AUX_DIR(lib)
-AM_INIT_AUTOMAKE(automake, 1.4k)
+AM_INIT_AUTOMAKE(automake, 1.4s)
ACLOCAL="`pwd`/aclocal --acdir=m4"
# $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index f22ec8c00..15bf39a09 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4k from Makefile.am.
+# Makefile.in generated automatically by automake 1.4s from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6a0014409..6c5d19855 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4k from Makefile.am.
+# Makefile.in generated automatically by automake 1.4s from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index adb8092c2..053f84cce 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4k from Makefile.am.
+# Makefile.in generated automatically by automake 1.4s from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
diff --git a/m4/Makefile.in b/m4/Makefile.in
index c5fa8659d..e64a34940 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4k from Makefile.am.
+# Makefile.in generated automatically by automake 1.4s from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
diff --git a/stamp-vti b/stamp-vti
index fbc69ab40..fc7f82101 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
@set UPDATED 2 August 2001
@set UPDATED-MONTH August 2001
-@set EDITION 1.4k
-@set VERSION 1.4k
+@set EDITION 1.4s
+@set VERSION 1.4s
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 691aef074..a8ef65d1a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4k from Makefile.am.
+# Makefile.in generated automatically by automake 1.4s from Makefile.am.
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
diff --git a/version.texi b/version.texi
index fbc69ab40..fc7f82101 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
@set UPDATED 2 August 2001
@set UPDATED-MONTH August 2001
-@set EDITION 1.4k
-@set VERSION 1.4k
+@set EDITION 1.4s
+@set VERSION 1.4s
View Lorry Controller Status