Commit f6ca84c0 authored by Glenn Morris's avatar Glenn Morris

Remove some files that autoreconf can supply.

Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg00863.html

* compile, config.guess, config.sub, depcomp, install-sh, missing:
Remove; autoreconf can supply them.

* Makefile.in (sync-from-gnulib): Don't sync config.sub,
config.guess, install-sh.  Pass -i to autoreconf.

* autogen/update_autogen (genfiles): Add compile, config.guess,
config.sub, depcomp, install-sh, missing.  Pass -i to autoreconf.
Discard non-error output from autoreconf in -q case.

* autogen/compile, autogen/config.guess, autogen/config.sub:
* autogen/depcomp, autogen/install-sh, autogen/missing: New files.

* autogen/copy_autogen: Add compile, config.guess, config.sub, depcomp,
install-sh, missing.

* autogen/README: Add compile, config.guess, config.sub, depcomp,
install-sh, missing.

* INSTALL.BZR, admin/make-tarball.txt: Add -i to autoreconf args.

* .bzrignore: Add compile, config.guess, config.sub, depcomp,
install-sh, missing.
parent 577c4ec0
2011-03-25 Glenn Morris <rgm@gnu.org>
* compile, config.guess, config.sub, depcomp, install-sh, missing:
Remove; autoreconf can supply them.
* Makefile.in (sync-from-gnulib): Don't sync config.sub,
config.guess, install-sh. Pass -i to autoreconf.
* autogen/update_autogen (genfiles): Add compile, config.guess,
config.sub, depcomp, install-sh, missing. Pass -i to autoreconf.
Discard non-error output from autoreconf in -q case.
* autogen/compile, autogen/config.guess, autogen/config.sub:
* autogen/depcomp, autogen/install-sh, autogen/missing: New.
* autogen/copy_autogen: Add compile, config.guess, config.sub, depcomp,
install-sh, missing.
2011-03-23 Glenn Morris <rgm@gnu.org>
* autogen/update_autogen: Fix typo.
......
......@@ -21,7 +21,7 @@ First, generate the `configure' script:
$ ./autogen.sh
(or you can just run `autoreconf -I m4').
(or you can just run `autoreconf -i -I m4').
You can then configure your build (use `./configure --help' to see
options you can set):
......
......@@ -344,12 +344,9 @@ sync-from-gnulib: $(gnulib_srcdir)
cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4)
cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc
cp \
$(gnulib_srcdir)/build-aux/config.sub \
$(gnulib_srcdir)/build-aux/config.guess \
$(gnulib_srcdir)/build-aux/install-sh \
$(gnulib_srcdir)/build-aux/move-if-change \
$(srcdir)
cd $(srcdir) && autoreconf -I m4
cd $(srcdir) && autoreconf -i -I m4
.PHONY: sync-from-gnulib
# These targets should be "${SUBDIR} without `src'".
......
......@@ -31,7 +31,7 @@ For each step, check for possible errors.
5. Edit configure.in so that maintainer-mode is off by default.
(FIXME - need to find a better way of dealing with this).
autoreconf -I m4 --force
autoreconf -i -I m4 --force
make bootstrap
6. Commit etc/AUTHORS, all the files changed by M-x set-version, and
......
......@@ -177,7 +177,7 @@ this script.
If you know that the required versions are in your PATH, but this
script has made an error, then you can simply run
autoreconf -I m4
autoreconf -i -I m4
instead of this script.
......@@ -198,7 +198,7 @@ echo "Your system has the required tools, running autoreconf..."
## Let autoreconf figure out what, if anything, needs doing.
autoreconf -I m4 || exit $?
autoreconf -i -I m4 || exit $?
echo "You can now run \`./configure'."
......
......@@ -7,6 +7,12 @@ configure ../ autoconf
config.in ../src autoheader * also used by MSDOS bzr build
aclocal.m4 ../ aclocal
Makefile.in ../lib automake
compile ../ automake
config.guess ../ automake
config.sub ../ automake
depcomp ../ automake
install-sh ../ automake
missing ../ automake
There are also some scripts:
......
This diff is collapsed.
This diff is collapsed.
......@@ -16,6 +16,7 @@ if test ! -e config.in; then
fi
## Order implied by top-level Makefile's rules, for time-stamps.
cp compile config.guess config.sub depcomp install-sh missing ../
cp aclocal.m4 ../
cp configure ../
touch ../src/stamp-h.in
......
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2011-01-19.21; # UTC
scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -156,10 +156,6 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
shift;;
-T) no_target_directory=true;;
......@@ -190,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
# Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
done
fi
......@@ -208,11 +200,7 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
trap '(exit $?); exit' 1 2 13 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
......@@ -240,9 +228,9 @@ fi
for src
do
# Protect names problematic for `test' and other utilities.
# Protect names starting with `-'.
case $src in
-* | [=\(\)!]) src=./$src;;
-*) src=./$src;;
esac
if test -n "$dir_arg"; then
......@@ -264,7 +252,12 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dst_arg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
......@@ -392,7 +385,7 @@ do
case $dstdir in
/*) prefix='/';;
[-=\(\)!]*) prefix='./';;
-*) prefix='./';;
*) prefix='';;
esac
......@@ -410,7 +403,7 @@ do
for d
do
test X"$d" = X && continue
test -z "$d" && continue
prefix=$prefix$d
if test -d "$prefix"; then
......
......@@ -68,7 +68,7 @@ quiet=
## Parameters.
sources="configure.in lib/Makefile.am"
genfiles="configure aclocal.m4 src/config.in lib/Makefile.in"
genfiles="configure aclocal.m4 src/config.in lib/Makefile.in compile config.guess config.sub depcomp install-sh missing"
for g in $genfiles; do
basegen="$basegen ${g##*/}"
......@@ -126,7 +126,18 @@ done < $tempfile
echo "Running autoreconf..."
autoreconf -I m4 || die "autoreconf error"
autoreconf -i -I m4 2>| $tempfile
retval=$?
## Annoyingly, autoreconf puts the "installing `./foo' messages on stderr.
if [ "$quiet" ]; then
grep -v 'installing `\.' $tempfile 1>&2
else
cat "$tempfile" 1>&2
fi
[ $retval -ne 0 ] && die "autoreconf error"
cp $genfiles autogen/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment