diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-03 09:27:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-03 09:27:17 -0700 |
| commit | 541df9f424b82b90ec4bd798ab6b8f1c655e3acd (patch) | |
| tree | 272c9a0e88b48be4097dd2b508c39ec07a124289 /autogen.sh | |
| parent | a7e1ffdc7e4de34662a0d55c8e5f3247ec40effd (diff) | |
| download | emacs-541df9f424b82b90ec4bd798ab6b8f1c655e3acd.tar.gz | |
Get --enable-gcc-warnings to work after touching configure.ac.
Preserve ACLOCAL_PATH in later builds, so that by default it has
the same value as it did in the first build after initial checkout.
* Makefile.in (ACLOCAL_PATH): New macro.
($(srcdir)/aclocal.m4): Use it.
* configure.ac (ACLOCAL_PATH): AC_SUBST it.
* autogen.sh (env_space): New var.
Tell user what variables, if any, to pass to 'configure'.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh index c2a2c7af04f..b7804548cec 100755 --- a/autogen.sh +++ b/autogen.sh @@ -210,6 +210,7 @@ fi # find the pkg.m4 that is installed in the standard location. echo "Checking for pkg.m4..." AUTORECONF_ENV= +env_space= ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || { oIFS=$IFS IFS=: @@ -225,7 +226,8 @@ ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || { ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;; esac export ACLOCAL_PATH - AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH' " + AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" + env_space=' ' break fi fi @@ -244,7 +246,7 @@ EOF echo ok echo 'Your system has the required tools.' -echo "Running \"${AUTORECONF_ENV}autoreconf -fi -I m4\" ..." +echo "Running \"$AUTORECONF_ENV${env_space}autoreconf -fi -I m4\" ..." ## Let autoreconf figure out what, if anything, needs doing. @@ -255,7 +257,7 @@ autoreconf -fi -I m4 || exit $? ## cause 'make' to needlessly run 'autoheader'. echo timestamp > src/stamp-h.in || exit -echo "You can now run \`./configure'." +echo "You can now run \`./configure$env_space$AUTORECONF_ENV'." exit 0 |