|
d583aa66
|
2011-04-17T12:00:29
|
|
Merge branch 'maint'
The following additional changes has been made:
* m4/amversion.in: Bump serial number from `1' to `8', to avoid
potential future conflicts with branch-1.11.
* m4/amversion.m4: Likewise.
* m4/gcj.m4: Likewise.
* m4/python.m4: Likewise.
* m4/install-sh.m4: Likewise.
|
|
|
1cddf410
|
2011-04-17T11:21:49
|
|
m4: add missing serial numbers to a few files
Related to automake bug#8483.
* m4/amversion.in: Add serial number.
* m4/auxdir.m4: Likewise.
* m4/gcj.m4: Likewise.
* m4/install-sh.m4: Likewise.
* m4/mkdirp.m4: Likewise.
* m4/python.m4: Likewise.
* m4/runlog.m4: Likewise.
* m4/strip.m4: Likewise.
* m4/upc.m4: Likewise.
|
|
|
3c5d9e8f
|
2011-03-15T17:36:40
|
|
cosmetics: better use of m4 quoting and m4sugar macros
* m4/dmalloc.m4: Better use of m4 quoting. Bump serial number.
* m4/gcj.m4: Likewise.
* m4/init.m4: Likewise.
* m4/install-sh.m4: Likewise.
* m4/lex.m4: Likewise.
* m4/multi.m4: Likewise.
* m4/option.m4: Likewise.
* m4/python.m4: Likewise.
* m4/sanity.m4: Likewise.
* m4/cond.m4: Likewise. Also, prefer the m4sugar macro 'm4_if'
over the plain m4 macro 'ifelse'.
* m4/depend.m4: Likewise.
|
|
|
95b717e8
|
2011-02-15T10:17:53
|
|
Merge branch 'maint'
|
|
|
5bf7af6e
|
2011-01-31T21:24:02
|
|
python: report the 'PYTHON' influential environment variable
* m4/python.m4 (AM_PATH_PYTHON): Call AC_ARG_VAR on PYTHON.
* doc/automake.texi (Python): Update and extend.
* tests/help-python.test: New test.
* tests/Makefile.am (TESTS): Update.
* THANKS (Jack Kelly): Update e-mail address.
Suggestion by Jack Kelly.
|
|
|
6366a170
|
2011-02-01T23:22:08
|
|
python: extend and improve tests, fix minor glitches
* m4/python.m4 (AM_PATH_PYTHON): Ensure the "checking ..." messages
from configure are always complete, even in case of failure. Tiny
cosmetic improvement in info/error messages.
* tests/python.test: Also check that automake complains if the
PYTHON primary is used but the `py-compile' script is not present.
Make grepping of generated Makefile.in laxer w.r.t. whitespace.
Add trailing `:' command.
* tests/python2.test: Remove repeated calls aclocal: they are
useless because configure.in is never modified. Make grepping
of automake stderr more comprehensive. Remove the pre-existing
`py-compile' file before trying to install it with `--add-missing'.
Add trailing `:' command.
* tests/python3.test: Add trailing `:' command.
* tests/python11.test: Likewise.
* tests/python4.test: Likewise. Also, try to pass PYTHON config
variable to configure from the environment, rather than only from
the command line.
* tests/python5.test: Ensure that the "checking ..." messages from
configure are always complete. Use proper m4 quoting. Add a
trailing `:' command.
* tests/python6.test: Simplify test logic, by checking for files
created by configure rather then grepping its output.
* tests/python7.test: Likewise.
* tests/python8.test: Also check that `$PYTHON' is meaningfully
set in the ACTION-IF-TRUE argument of AM_PATH_PYTHON.
* tests/python9.test: Likewise.
* tests/python10.test: Add trailing `:' command.
(Makefile.am): Declare `disttest' target as `.PHONY', and add
an `ls -l' to its recipe, for debugging.
* tests/nobase-python.test: In testing "make uninstall" and
"make install" results, prefer idioms that make verbose logs
more helpful. Remove a couple of lines of dead code. Add a
trailing `:' command.
* tests/python5b.test: New test, checking that configure performs
the check on the python version even when the choice of the python
interpreter is forced by the user.
* tests/python-dist.test: New test, checking the distribution of
*_PYTHON files.
* tests/python-vars.test: New test, checking that AM_PATH_PYTHON
correctly set all the output variables advertised in the manual.
* tests/python-virtualenv.test: New test, checking that python
support offered by automake works well with "virtual python
environments" created by the `virtualenv' program.
* tests/instdir-prog.test: Also check `$(pyexecdir)'. Existing
checks made slightly stricter.
* tests/instdir-prog.test: Also check `$(pyexecdir)'. Existing
* tests/instdir-ltlib.test: Likewise.
* tests/Makefile.am (TESTS): Update.
|
|
|
2e5b3599
|
2010-10-04T18:50:53
|
|
Add support for newer python versions.
* m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
_AM_PYTHON_INTERPRETER_LIST. Since we are at it, break a long
line and fix indentation.
* THANKS: Updated.
From a report by Thomas Klausner.
|
|
05d41b17
|
2009-12-21T22:24:02
|
|
Add support for newer python version
* m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
_AM_PYTHON_INTERPRETER_LIST.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
6d44a667
|
2009-05-23T22:13:14
|
|
python: do not install in system directories on Darwin 9.
On Darwin 9, get_python_lib returns a path below `/Library/Python'
regardless of the `prefix' argument it was passed, causing `make
install' to target the system directories regardless of `--prefix'
argument used. Work around this Darwin bug by ignoring the result
of get_python_lib if it points outside of the passed prefix, and
the prefix was not a system directory.
* m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
initial portion of the pythondir returned by get_python_lib, then
ignore it unless the configured prefix is `/usr' or starts with
`/System'. Fixes instmany-python.test failure on Mac OS X 10.5.7.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
6cfa5cb8
|
2009-05-17T11:29:16
|
|
Let AM_PATH_PYTHON honor python's idea about the site directory.
* m4/python.m4 (AM_PATH_PYTHON): When computing pythondir and
pyexecdir, pass the expanded prefix resp. exec_prefix as `prefix'
to get_python_lib, so python can determine the name of the site
directory depending on the install location. Afterwards, replace
the directory names with the unexpanded values of $PYTHON_PREFIX
resp. $PYTHON_EXEC_PREFIX again, to allow override according to
the documentation. Fixes site directory computation for Debian
and Ubuntu (`dist-packages' for a prefix of `/usr' or `/usr/local',
`site-packages' elsewhere).
* NEWS, THANKS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
d5bec12a
|
2008-10-26T10:28:40
|
|
Support for Python 3.0, drop support for pre-2.0.
* lib/py-compile: Do not import string; use sys.stdout.write
instead of print, files.split instead of string.split.
* m4/python.m4 (AM_PATH_PYTHON): Also look for python3 and
phython3.0; do not look for python1.5. Use sys.stdout.write.
(AM_PYTHON_CHECK_VERSION): Do not use string; adjust to xrange
removal in Python 3.0, and changed semantics of map.
* doc/automake.texi (Python, Hard-Coded Install Paths): Update
Python versions mentioned in the manual, using 2.5 everywhere.
* NEWS, THANKS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
85ae9cba
|
2005-07-01T21:43:42
|
|
* m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.5.
|
|
|
391df12b
|
2005-01-09T14:46:22
|
|
* m4/amversion.in, m4/as.m4, m4/auxdir.m4, m4/ccstdc.m4,
m4/cond.m4, m4/depend.m4, m4/depout.m4, m4/dmalloc.m4, m4/gcj.m4,
m4/header.m4, m4/init.m4, m4/install-sh.m4, m4/lead-dot.m4,
m4/lex.m4, m4/lispdir.m4, m4/maintainer.m4, m4/make.m4,
m4/minuso.m4, m4/missing.m4, m4/mkdirp.m4, m4/multi.m4,
m4/obsol-gt.m4, m4/obsol-lt.m4, m4/obsolete.m4, m4/options.m4,
m4/protos.m4, m4/python.m4, m4/regex.m4, m4/runlog.m4,
m4/sanity.m4, m4/strip.m4, m4/tar.m4: Use the same all-permissive
license that is used in aclocal.m4. Relicensing backed by RMS.
|
|
|
e4f1de1e
|
2004-11-10T20:12:34
|
|
* m4/python.m4 (AM_PATH_PYTHON): Fix the invocation of
AC_PATH_PROGS to correctly define PYTHON as `:' when no interpreter
is found (this worked correctly only when a minimal version was
passed to AM_PATH_PYTHON). Report from Stepan Kasal.
(_AM_PYTHON_INTERPRETER_LIST): Define using m4_define_default,
so we can easily override the list from the test suite.
* tests/python11.test: New file.
* tests/Makefile.am (TESTS): Add python11.test.
|
|
|
0ad0ad79
|
2004-03-26T21:00:47
|
|
* m4/python.m4 (AM_PATH_PYTHON): Make sure am_display_PYTHON is
set when $PYTHON has been set by the user.
From Esben Haabendal Soerensen.
|
|
|
476cc7a4
|
2004-01-11T11:53:17
|
|
* m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.4.
|
|
636c8076
|
2003-09-06T05:36:57
|
|
Spelling and minor grammar fixes.
|
|
|
a4f5cb9a
|
2003-08-17T18:09:10
|
|
Fix for PR automake/398:
* m4/python.m4: Do not call AC_PATH_PROGS if $PYTHON is already
set. Display `none' instead of `:' and $PYTHON is set to `:'
when no suitable interpreter is found. Honor ACTION-IF-FOUND and
ACTION-IF-NOT-FOUND.
* automake.texi (Python): Document ACTION-IF-FOUND and
ACTION-IF-NOT-FOUND.
* tests/python4.test, tests/python5.test, tests/python6.test,
tests/python7.test, tests/python8.test, tests/python9.test: New
files.
* tests/Makefile.am (TESTS): Add them.
Report from Per Cederqvist.
|
|
|
5fd79af3
|
2003-08-13T21:29:58
|
|
Fix for PR automake/399:
* m4/python.m4: Use AC_PATH_PROGS, not AC_PATH_PROG.
Report from Per Cederqvist.
|
|
f68696e2
|
2003-06-02T07:08:40
|
|
* lib/am/texi-vers.am, lib/am/subdirs.am, lib/am/scripts.am,
* lib/am/remake-hdr.am, lib/am/python.am, lib/am/progs.am,
* lib/am/program.am, lib/am/multilib.am, lib/am/mans.am,
* lib/am/mans-vars.am, lib/am/ltlibrary.am, lib/am/ltlib.am,
* lib/am/lisp.am, lib/am/libtool.am, lib/am/library.am,
* lib/am/lang-compile.am, lib/am/java.am, lib/am/header.am,
* lib/am/header-vars.am, lib/am/footer.am, lib/am/depend.am,
* lib/am/dejagnu.am, lib/am/data.am, lib/am/compile.am,
* lib/am/clean.am, lib/am/clean-hdr.am, lib/am/check.am,
* lib/am/ansi2knr.am, lib/am/Makefile.am, lib/Makefile.am,
* m4/strip.m4, m4/sanity.m4, m4/runlog.m4, m4/regex.m4,
* m4/python.m4, m4/protos.m4, m4/options.m4, m4/obsolete.m4,
* m4/obsol-lt.m4, m4/obsol-gt.m4, m4/multi.m4, m4/missing.m4,
* m4/minuso.m4, m4/maintainer.m4, m4/lispdir.m4, m4/lex.m4,
* m4/install-sh.m4, m4/header.m4, m4/gcj.m4, m4/dmalloc.m4,
* m4/depout.m4, m4/cond.m4, m4/ccstdc.m4, m4/auxdir.m4, m4/as.m4,
* m4/Makefile.am: White space changes and Copyright updates.
|
|
|
04746fa5
|
2003-01-16T11:47:13
|
|
* m4/python.m4 (AM_PATH_PYTHON) <_AM_PYTHON_INTERPRETER_LIST>: Add
python2.3.
|
|
|
29ccf3d9
|
2003-01-16T11:40:42
|
|
* m4/python.m4 (AM_PATH_PYTHON): Query distutils for `pythondir'
or `pyexecdir', for the sake of 64-bit distributions that usually
use lib64/ instead of lib/. Fall back to the default directory
if it doesn't work.
Suggested by Gwenole Beauchesne.
|
|
|
0bcd03be
|
2002-08-24T12:46:03
|
|
For Debian Bug#157778:
* m4/python.m4: Fix output of `python' in checking messages
when no version of Python is required.
|
|
|
07ed9367
|
2002-01-08T18:03:36
|
|
* m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.2.
|
|
|
27c25a02
|
2002-01-02T16:12:29
|
|
Fix for PR automake/278:
* m4/python.m4 (AM_PYTHON_CHECK_VERSION): Use `sys.hexversion' to cope
with versions such as '2.2c1'. Also, use `int' instead of the
obsoleted `string.atoi'.
Reported by Enrico Scholz.
|
|
|
925abad3
|
2001-12-12T11:11:39
|
|
* m4/python.m4 (AM_PATH_PYTHON): Check all known Python interpreters
in loop until we find one the satisfies the user supplied version.
Add python2 to the list of known interpreters. Don't use
changequote. Cache the calculation of PYTHON_VERSION and
PYTHON_PLATFORM.
(AM_PYTHON_CHECK_VERSION): New function, extracted from
AM_PATH_PYTHON and modernized.
* m4/runlog.m4: New file.
* m4/Makefile.am (m4data_DATA): Add it.
|
|
|
0668ce98
|
2001-09-22T16:05:36
|
|
* ChangeLog, ChangeLog.1996, ChangeLog.1998, ChangeLog.2000,
Makefile.am, NEWS, README, TODO, configure.in, lib/Makefile.am,
lib/acinstall, lib/am/Makefile.am, m4/Makefile.am, m4/as.m4,
m4/auxdir.m4, m4/ccstdc.m4, m4/cond.m4, m4/depend.m4,
m4/depout.m4, m4/dmalloc.m4, m4/error.m4, m4/gcj.m4, m4/header.m4,
m4/init.m4, m4/install-sh.m4, m4/lex.m4, m4/lispdir.m4,
m4/maintainer.m4, m4/make.m4, m4/minuso.m4, m4/missing.m4,
m4/multi.m4, m4/obstack.m4, m4/protos.m4, m4/ptrdiff.m4,
m4/python.m4, m4/regex.m4, m4/sanity.m4, m4/strip.m4,
m4/termios.m4, m4/winsz.m4: Add copyright notice.
* INSTALL, lib/INSTALL: Upgrade to latest autoconf version,
which has a copyright notice.
|
|
fb55cab8
|
2001-05-13T23:31:05
|
|
2001-05-13 James Henstridge <james@daa.com.au>
* m4/python.m4 (AM_PATH_PYTHON): Added more names for python.
Point pythondir at site-packages directory. Rename
PYTHON_SITE_PACKAGE to pkgpythondir. Rename PYTHON_SITE_EXEC to
pyexecdir. Removed package/module argument. Removed
PYTHON_SITE_INSTALL. Added version checking.
|
|
5f11c708
|
2000-11-24T02:25:13
|
|
* m4/regex.m4 (AM_WITH_REGEX): This macro was broken because
of M4 underquoting.
* m4/ccstdc.m4 (AC_PROG_CC_STDC): Added some M4 quotes.
* m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
* m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
* m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
* m4/multi.m4 (AM_WITH_DMALLOC): Likewise.
* m4/python.m4 (AM_PATH_PYTHON): Likewise.
* m4/strtod.m4 (AM_FUNC_STRTOD): Likewise.
|
|
|
4b893ece
|
2000-08-02T08:59:16
|
|
* m4: Quote properly the name of the macros being defined.
Use `#' instead of `dnl' where appropriate.
* m4/header.m4 (AM_CONFIG_HEADER): Get rid of changequote, just
quote.
Don't quote passive characters.
Pull the AC_PREREQ outside the macro.
* m4/init.m4: Pull the AC_PREREQ outside the macro.
|
|
|
ebdbd5b3
|
1999-11-22T19:22:02
|
|
Jumbo patch:
First cut at Python support (untested).
A few miscellaneous bug fixes.
|