From 7c7c2eff0925b5574e4dc991fa155f0c3ccda474 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 11 Mar 1997 06:40:23 +0000 Subject: [PATCH] set CONFIG_HEADERS right when in subdir test fixlets --- ChangeLog | 6 +++++- automake.in | 4 +++- lib/am/remake-hdr.am | 2 +- remake-hdr.am | 2 +- tests/ChangeLog | 4 ++++ tests/confsub.test | 3 ++- tests/libobj.test | 1 + tests/libobj2.test | 1 + 8 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a925d79..f55aca7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ Mon Mar 10 23:17:19 1997 Tom Tromey + * remake-hdr.am (stamp-h): Set CONFIG_HEADERS to + $(CONFIG_HEADER_FULL). + * automake.in (handle_configure): Define CONFIG_HEADER_FULL. + * automake.in (handle_lib_objects): Set seen_c_source as - appropriate. From Alexander V. Lukyanov. + appropriate. From Alexander V. Lukyanov. Test cxxlibobj.test. Sat Mar 8 22:54:35 1997 Tom Tromey diff --git a/automake.in b/automake.in index 0b1a873..8403d13 100755 --- a/automake.in +++ b/automake.in @@ -1224,7 +1224,8 @@ sub handle_lib_objects { $seen_c_source = 1; } - elsif ($iter =~ /\.h$/) + + if ($iter =~ /\.h$/) { &require_file_with_line ($var, $FOREIGN, $iter); } @@ -2591,6 +2592,7 @@ sub handle_configure push (@clean, 'hdr'); &push_phony_cleaners ('hdr'); &define_variable ("CONFIG_HEADER_IN", "${ch_sans_dir}"); + &define_variable ('CONFIG_HEADER_FULL', $config_name); } # Set location of mkinstalldirs. diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index 3b3110c..2c456ca 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -18,7 +18,7 @@ $(CONFIG_HEADER): stamp-h stamp-h: $(CONFIG_HEADER_IN) $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) \ + && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER_FULL) \ $(SHELL) ./config.status @echo timestamp > stamp-h $(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in diff --git a/remake-hdr.am b/remake-hdr.am index 3b3110c..2c456ca 100644 --- a/remake-hdr.am +++ b/remake-hdr.am @@ -18,7 +18,7 @@ $(CONFIG_HEADER): stamp-h stamp-h: $(CONFIG_HEADER_IN) $(top_builddir)/config.status cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) \ + && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER_FULL) \ $(SHELL) ./config.status @echo timestamp > stamp-h $(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in diff --git a/tests/ChangeLog b/tests/ChangeLog index 4c8c81f..976e25d 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,9 @@ Mon Mar 10 23:21:03 1997 Tom Tromey + * libobj.test, libobj2.test: Use AC_PROG_CC. + + * confsub.test: Modified for definition of CONFIG_HEADER_FULL. + * cxxlibobj.test: New file. Wed Feb 26 13:05:42 1997 Tom Tromey diff --git a/tests/confsub.test b/tests/confsub.test index c8d84fc..38e8e7f 100755 --- a/tests/confsub.test +++ b/tests/confsub.test @@ -29,5 +29,6 @@ END $AUTOMAKE || exit 1 # Make sure subdir Makefile.in doesn't itself look in the subdir. -grep 'subdir/config.h' subdir/Makefile.in && exit 1 +(grep 'subdir/config.h' subdir/Makefile.in | grep -v CONFIG_HEADER_FULL) \ + && exit 1 exit 0 diff --git a/tests/libobj.test b/tests/libobj.test index f946531..7918f86 100755 --- a/tests/libobj.test +++ b/tests/libobj.test @@ -9,6 +9,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch +AC_PROG_CC AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB diff --git a/tests/libobj2.test b/tests/libobj2.test index ad745c3..fa9b889 100755 --- a/tests/libobj2.test +++ b/tests/libobj2.test @@ -8,6 +8,7 @@ cat > configure.in << 'END' PACKAGE=nonesuch VERSION=nonesuch +AC_PROG_CC AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_RANLIB -- 2.7.4