diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-27 22:01:12 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-27 22:01:12 +0100 |
| commit | f0645e2ddf6327fafdd072d1c30d15f48510e605 (patch) | |
| tree | 17fb95764b3f2616001a2c5ed38a8ec187fa54c8 /automake.in | |
| parent | 1560265e1ca8d5c542d27a4143e1879379831e12 (diff) | |
| parent | 77b2c71c376f45b51a0e41774ab0e3cdf8d17932 (diff) | |
| download | automake-f0645e2ddf6327fafdd072d1c30d15f48510e605.tar.gz | |
Merge branch 'maint' into yacc-work
* maint: (34 commits)
tests: drop unnecessary requirement in 'subpkg.test'
gitlog-to-changelog: new auxiliary script, synced from gnulib
docs: "aclocal --install -I /abs/dir" actually copies files
docs: fix node names for automake and aclocal invocations
gitignore: use only one .gitignore file, in the top-level directory
tests: one more fixlet for gettext macros requirement
tests: fix handling of gettext macros requirement
tests: fix failure due to debugging code forgotten into a test
tests: avoid spurious failure of libtool and gettext tests
hacking: distribute it, and mention it in the ChangeLog
regex: deprecate the obsolete macro AM_WITH_REGEX
maint: distribute .xz tarballs, not .bz2 ones
maint: better use of autoconf 2.68 features
cosmetics: use proper m4 quoting in configure.ac
include: avoid "deleted .am file" problem
tests: better handling of gettext and libtool requirements
fix: typos and grammaros in comments of the new test
tests: report useful system information in 'test-suite.log'
python: remove relics for Python 1.5 support
configure: remove extraneous 'eval's from AM_RUN_LOG invocations
...
Diffstat (limited to 'automake.in')
| -rw-r--r--[-rwxr-xr-x] | automake.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/automake.in b/automake.in index a0894707e..3fc850670 100755..100644 --- a/automake.in +++ b/automake.in @@ -4247,6 +4247,7 @@ sub handle_configure ($$$@) 'MAKEFILE-DEPS' => "@rewritten", 'CONFIG-MAKEFILE' => ($relative_dir eq '.') ? '$@' : '$(subdir)/$@', 'MAKEFILE-IN' => $rel_makefile_in, + 'HAVE-MAKEFILE-IN-DEPS' => (@include_stack > 0), 'MAKEFILE-IN-DEPS' => "@include_stack", 'MAKEFILE-AM' => $rel_makefile_am, 'AUTOMAKE-OPTIONS' => $automake_options, |