summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 16:07:34 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-22 16:07:34 +0000
commitb4cde040d8a2f89b20a5a5a169b22f00c3e595b7 (patch)
tree90519a7750d6419769579316098565cabf7927ae
parent305dd8bd82986c33b2dc89d92cc433c9c1501380 (diff)
downloadrtems-b4cde040d8a2f89b20a5a5a169b22f00c3e595b7.tar.bz2
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/subdirs.m4: Remove. * acinclude.m4: New (Replaces aclocal/subdirs.m4).
-rw-r--r--ChangeLog5
-rw-r--r--acinclude.m4 (renamed from aclocal/subdirs.m4)9
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c6a136f01..69d37ffabf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * aclocal/subdirs.m4: Remove.
+ * acinclude.m4: New (Replaces aclocal/subdirs.m4).
+
+2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* aclocal/check-cpu.m4: Peek into cpukit/score/cpu instead of
exec/score/cpu.
diff --git a/aclocal/subdirs.m4 b/acinclude.m4
index e48e6e3236..16218324aa 100644
--- a/aclocal/subdirs.m4
+++ b/acinclude.m4
@@ -162,6 +162,8 @@ m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
[
_RTEMS_ARG_VAR([CC_FOR_$2],
[c-compiler to be used for $1 subdirs (default: auto-detected)])
+_RTEMS_ARG_VAR([CFLAGS_FOR_$2],
+ [c-flags to be used for $1 subdirs (default: provided by autoconf)])
if test "$no_recursion" != yes; then
if test -n "${$2_SUBDIRS}"; then
@@ -245,7 +247,12 @@ if test "$no_recursion" != yes; then
AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args \
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir])
# The eval makes quoting arguments work.
- eval CC=[$]CC_FOR_$2 \
+ ac_sub_configure_vars=
+ test -n "[$]CC_FOR_$2" && \
+ ac_sub_configure_vars="CC='[$]CC_FOR_$2'"
+ test -n "[$]CFLAGS_FOR_$2" && \
+ ac_sub_configure_vars="$ac_sub_configure_vars CFLAGS='[$]CFLAGS_FOR_$2'"
+ eval $ac_sub_configure_vars \
$ac_sub_configure $ac_sub_configure_args \
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir])