I'm very surprised by:
+EXPECT = `if test -f $(top_builddir)/../expect/expect; then \
++++++
+ echo $(top_builddir)/../expect/expect; \
+ else \
+ echo expect; \
+ fi`
but this is really what meant
- &define_program_variable ('EXPECT', 'build', 'expect', 'expect');
?
Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
* automake.in (&handle_tests_dejagnu): Don't define EXPECT and
RUNTEST.
* dejagnu.am: Do it.
(site.exp): Use `if'.
Index: automake.in
--- automake.in Sun, 01 Apr 2001 19:34:08 +0200 akim (am/f/39_automake.i 1.248 755)
+++ automake.in Sun, 01 Apr 2001 19:50:05 +0200 akim (am/f/39_automake.i 1.248 755)
@@ -3844,13 +3844,7 @@ sub handle_tests_dejagnu
{
push (@check_tests, 'check-DEJAGNU');
- # In Cygnus mode, these are found in the build tree.
- # Otherwise they are looked for in $PATH.
- &define_program_variable ('EXPECT', 'build', 'expect', 'expect');
- &define_program_variable ('RUNTEST', 'src', 'dejagnu', 'runtest');
-
- # Only create site.exp rule if user hasn't already written
- # one.
+ # Only create site.exp rule if user hasn't already written one.
$output_rules .=
&file_contents ('dejagnu',
('SITE-EXP' => ! &target_defined ('site.exp'),
@@ -6111,6 +6105,9 @@ sub define_compiler_variable
if $seen_libtool;
}
+
+# define_program_variable ($VAR, $WHATDIR, $SUBDIR, $PROGRAM, $OVERRIDE)
+# ----------------------------------------------------------------------
# Define a variable that represents a program to run. If in Cygnus
# mode, the program is searched for in the build (or source) tree.
# Otherwise no searching is done at all. Arguments are:
Index: dejagnu.am
--- dejagnu.am Sun, 18 Feb 2001 16:12:26 +0100 akim (am/g/45_dejagnu.am 1.6 644)
+++ dejagnu.am Sun, 01 Apr 2001 19:55:10 +0200 akim (am/g/45_dejagnu.am 1.6 644)
@@ -25,6 +25,26 @@
## Default flags to pass to dejagnu. The user can override this.
RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
+## In Cygnus mode, these are found in the build tree.
+## Otherwise they are looked for in $PATH.
+if %?CYGNUS%
+EXPECT = `if test -f $(top_builddir)/../expect/expect; then \
+ echo $(top_builddir)/../expect/expect; \
+ else \
+ echo expect; \
+ fi`
+
+RUNTEST = `if test -f $(top_srcdir)/../dejagnu/runtest; then \
+ echo $(top_srcdir)/../dejagnu/runtest; \
+ else \
+ echo runtest; \
+ fi`
+else ! %?CYGNUS%
+EXPECT = expect
+RUNTEST = runtest
+endif ! %?CYGNUS%
+
+
.PHONY: check-DEJAGNU
check-DEJAGNU: site.exp
## Life is easiest with an absolute srcdir, so do that.
@@ -54,23 +74,25 @@
## Note that in the rule we don't directly generate site.exp to avoid
## the possibility of a corrupted site.exp if make is interrupted.
## Jim Meyering has some useful text on this topic.
-?SITE-EXP?site.exp: Makefile
-?SITE-EXP? @echo 'Making a new site.exp file...'
-?SITE-EXP? @echo '## these variables are automatically generated by make ##'
>site.tmp
-?SITE-EXP? @echo '# Do not edit here. If you wish to override these values'
>>site.tmp
-?SITE-EXP? @echo '# edit the last section' >>site.tmp
-?SITE-EXP? @echo 'set tool $(DEJATOOL)' >>site.tmp
-?SITE-EXP? @echo 'set srcdir $(srcdir)' >>site.tmp
-?SITE-EXP? @echo "set objdir `pwd`" >>site.tmp
-?SITE-EXP??BUILD? @echo 'set build_alias $(build_alias)' >>site.tmp
-?SITE-EXP??BUILD? @echo 'set build_triplet $(build_triplet)' >>site.tmp
-?SITE-EXP??HOST? @echo 'set host_alias $(host_alias)' >>site.tmp
-?SITE-EXP??HOST? @echo 'set host_triplet $(host_triplet)' >>site.tmp
-?SITE-EXP??TARGET? @echo 'set target_alias $(target_alias)' >>site.tmp
-?SITE-EXP??TARGET? @echo 'set target_triplet $(target_triplet)' >>site.tmp
-?SITE-EXP? @echo '## All variables above are generated by configure. Do Not
Edit ##' >>site.tmp
-?SITE-EXP? @test ! -f site.exp || \
-?SITE-EXP? sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
-?SITE-EXP? @-rm -f site.bak
-?SITE-EXP? @test ! -f site.exp || mv site.exp site.bak
-?SITE-EXP? @mv site.tmp site.exp
+if %?SITE-EXP?
+site.exp: Makefile
+ @echo 'Making a new site.exp file...'
+ @echo '## these variables are automatically generated by make ##' >site.tmp
+ @echo '# Do not edit here. If you wish to override these values' >>site.tmp
+ @echo '# edit the last section' >>site.tmp
+ @echo 'set tool $(DEJATOOL)' >>site.tmp
+ @echo 'set srcdir $(srcdir)' >>site.tmp
+ @echo "set objdir `pwd`" >>site.tmp
+?BUILD? @echo 'set build_alias $(build_alias)' >>site.tmp
+?BUILD? @echo 'set build_triplet $(build_triplet)' >>site.tmp
+?HOST? @echo 'set host_alias $(host_alias)' >>site.tmp
+?HOST? @echo 'set host_triplet $(host_triplet)' >>site.tmp
+?TARGET? @echo 'set target_alias $(target_alias)' >>site.tmp
+?TARGET? @echo 'set target_triplet $(target_triplet)' >>site.tmp
+ @echo '## All variables above are generated by configure. Do Not Edit ##'
+>>site.tmp
+ @test ! -f site.exp || \
+ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
+ @-rm -f site.bak
+ @test ! -f site.exp || mv site.exp site.bak
+ @mv site.tmp site.exp
+endif %?SITE-EXP?
