Author :
Tom Tromey
Date :
2001-05-13 16:40:28
Hash :62e22791 Message :2001-05-13 Tom Tromey <tromey@redhat.com>
* tests/Makefile.am (TESTS): Added python.test.
* tests/python.test: New file.
* automake.in (handle_languages): Use
config_aux_dir_set_in_configure_in.
(handle_python): Correctly mention AM_PATH_PYTHON. Use
py-compile, not py_comp. Define py_compile macro.
2001-05-13 Derek Price <dprice@openavenue.com>
* automake.in (require_file_with_conf_line,
require_file_with_line, require_file): Pass a @require_file_path
of $relative_dir instead of '.' to require_file_internal so that
all the special casing of '.' can be removed elsewhere.
(require_config_file, require_conf_file_with_line,
require_conf_file_with_conf_line): Remove special casing for '.'
and make sure $config_aux_dir is maintained properly.
(require_file_internal): Remove special casing of '.' and set
@require_file_path when missing files are added.
(maybe_push_required_file): Remove special casing of '.'
(handle_dependencies): Remove a workaround for a bug now fixed
and remove $config_aux_dir special casing.
(handle_configure): Remove special casing for $config_aux_dir
(handle_python): Ditto.
(yacc_lex_finish_helper): Change $config_aux_dir switch to
switch on the value of $config_aux_dir_set_in_configure_in.
(handle_texinfo): Ditto.
(scan_one_configure_file): Set $config_aux_dir and
$config_aux_dir_set_in_configure_in properly so special casing
on the value of $config_aux_dir can be removed elsewhere.
* tests/depcomp.test: New file.
* tests/confsub.test: Look for depcomp in $(top_srcdir) instead of the
first subdir containing a C file.
* tests/libobj2.test: Ditto.
* tests/Makefile.am (TESTS): Added 'depcomp.test'.
tests/confsub.test
#! /bin/sh
# Test to make sure config.h can be in subdir.
. $srcdir/defs || exit 1
cat > configure.in << 'END'
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
AC_PROG_MAKE_SET
AM_CONFIG_HEADER(subdir/config.h)
PACKAGE=nonesuch
VERSION=nonesuch
AC_PROG_CC
AC_ARG_PROGRAM
AC_PROG_INSTALL
AC_OUTPUT(Makefile subdir/Makefile)
END
cat > Makefile.am << 'END'
SUBDIRS = subdir
END
mkdir subdir
cat > subdir/Makefile.am << 'END'
bin_PROGRAMS = fred
END
: > subdir/config.h.in
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
# Make sure subdir Makefile.in doesn't itself look in the subdir.
(grep 'subdir/config.h' subdir/Makefile.in | grep -v CONFIG_HEADERS) && exit 1
exit 0