Tag
Hash :
f40d0b28
Author :
Date :
2002-06-30T22:44:13
* automake.in (am_macro_for_var, ac_macro_for_var,
required_variables): New variables.
(am_c_prototypes, seen_prog_lex, am_lispdir_location,
pythondir_location): Remove.
(initialize_per_input): Clear %required_variables.
(require_variables, require_variables_for_macro): New functions.
(handle_languages): Call &require_variables for $lang->config_vars.
(handle_compile): Call &require_variables_for_macro for the
ANSI2KNR and U variables.
(handle_emacs_lisp): Call &require_variables for EMACS and libdir.
(handle_python): Call &require_variables for PYTHON. Don't
explicitly allow `python' as a prefix for PYTHON.
(scan_autoconf_traces): Don't scan AC_PROG_LEX, AM_C_PROTOTYPES,
AM_PATH_LISPDIR, and AM_PATH_PYTHON.
(scan_autoconf_traces) <AC_SUBST>: Don't filter out ANSI2KNR and
AMDEPBACKSLASH here...
(define_configure_variable): ... do this here.
(am_primary_prefixes): Probe the existence of ${X}dir using
&require_variables_for_macro. If a standard prefix is not
legitimate, say so. Ignore all configure variables.
* tests/ansi8.test, tests/cxx2.test, tests/gcj5.test,
tests/lisp2.test, tests/python2.test: New files
* tests/Makefile.am (TESTS): Add them.
* tests/asm.test: Grep stderr.
* tests/lex2.test: Rewrite to test that Automake suggests AM_PROG_LEX.
* tests/python.test: Make sure py-compile is installed.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
#! /bin/sh
# Make sure that Automake suggest using AM_PATH_LISPDIR to define lispdir.
. $srcdir/defs || exit 1
set -e
echo 1
cat > Makefile.am << 'END'
lisp_LISP = foo.el
END
$ACLOCAL
$AUTOMAKE 2>stderr && exit 1
cat stderr
grep AM_PATH_LISPDIR stderr
echo 2
# Setting lispdir should not be enough.
cat > Makefile.am << 'END'
lispdir = /usr/share/emacs/site-lisp
lisp_LISP = foo.el
END
$ACLOCAL
$AUTOMAKE -a 2>stderr && exit 1
cat stderr
grep AM_PATH_LISPDIR stderr
echo 3
# Setting EMACS should not be enough.
cat > Makefile.am << 'END'
EMACS = emacs
lisp_LISP = foo.el
END
$ACLOCAL
$AUTOMAKE -a 2>stderr && exit 1
cat stderr
grep AM_PATH_LISPDIR stderr
echo 4
# Setting both is OK.
cat > Makefile.am << 'END'
lispdir = /usr/share/emacs/site-lisp
EMACS = emacs
lisp_LISP = foo.el
END
$ACLOCAL
$AUTOMAKE -a