[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
subobj8.test fix + am_aux_dir issues
From: |
Alexandre Duret-Lutz |
Subject: |
subobj8.test fix + am_aux_dir issues |
Date: |
18 Jul 2001 14:32:10 +0200 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7 |
Tom,
The patch below should fix subobj8.test, using
require_config_file as you suggested.
However it makes no sense to install compile in the right place
(aux_dir) if AC_PROG_CC_C_O is not made aux_dir-aware, and this
in turn can't be done until something is settled about $am_aux_dir.
I don't know if you have a plan about this, I think it might
work if we define $am_aux_dir from $ac_aux_dir after
1) removing a possible $srcdir/ prefix added by Autoconf
2) prepending $(top_srcdir)/
That way $am_aux_dir is still relative (unless $(top_srcdir)
isn't), but always point to the right place. The counter part
is that $am_aux_dir cannot be used from configure. However,
since $ac_aux_dir is safe to use from configure, all we have
to do is to check script existence or features using
$ac_aux_dir but use $am_aux_dir for AC_SUBSTed values.
Index: ChangeLog
from Alexandre Duret-Lutz <address@hidden>
Fix for subobj8.test:
* automake.in (handle_single_transform_list, lang_c_rewrite):
Require compile using `require_config_file'.
* tests/Makefile.am (XFAIL_TESTS): Remove subobj8.test.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1154
diff -u -r1.1154 automake.in
--- automake.in 2001/07/17 05:53:47 1.1154
+++ automake.in 2001/07/18 11:46:26
@@ -1869,7 +1869,7 @@
}
$object = $dname . '-' . $object;
- &require_file ($FOREIGN, 'compile')
+ &require_config_file ($FOREIGN, 'compile')
if $lang->name eq 'c';
&prog_error ("$lang->name flags defined without compiler")
@@ -4923,8 +4923,7 @@
&am_error ("C objects in subdir but `AM_PROG_CC_C_O' not in
`$configure_ac'");
}
- &require_file ($FOREIGN, 'compile')
- if $relative_dir eq '.';
+ &require_config_file ($FOREIGN, 'compile');
}
$de_ansi_files{$base} = 1;
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.324
diff -u -r1.324 Makefile.am
--- tests/Makefile.am 2001/07/18 05:49:46 1.324
+++ tests/Makefile.am 2001/07/18 11:46:26
@@ -1,6 +1,6 @@
## Process this file with automake to create Makefile.in
-XFAIL_TESTS = subdir5.test subobj8.test ccnoco.test
+XFAIL_TESTS = subdir5.test ccnoco.test
TESTS = \
acinclude.test \
--
Alexandre Duret-Lutz
- subobj8.test fix + am_aux_dir issues,
Alexandre Duret-Lutz <=