summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-11-09 17:04:53 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-11-09 17:04:53 +0000
commit2dbd07f8dc2ba53ba4a556bb76da768d91610c6a (patch)
tree912f73354b40f90ceabbcd6202af1a89648fac08
parent5913d94de8d52e6a69c0123abf42f633cf24af94 (diff)
downloadrtems-2dbd07f8dc2ba53ba4a556bb76da768d91610c6a.tar.bz2
2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/gcc-pipe.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf standard). * aclocal/gcc-specs.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf standard). * aclocal/multilib.m4: Fix m4-quoting (BUG-FIX). * aclocal/check-bsp-cache.m4: Fix m4-quoting (autoconf-2.49b). * aclocal/prog-cc.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf standard), replace CC_FOR_TARGET with CC (BUG-FIX).
-rw-r--r--ChangeLog11
-rw-r--r--aclocal/check-bsp-cache.m44
-rw-r--r--aclocal/gcc-pipe.m42
-rw-r--r--aclocal/gcc-specs.m42
-rw-r--r--aclocal/multilib.m48
-rw-r--r--aclocal/prog-cc.m44
6 files changed, 21 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d454bc221..6e72859b25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * aclocal/gcc-pipe.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf
+ standard).
+ * aclocal/gcc-specs.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf
+ standard).
+ * aclocal/multilib.m4: Fix m4-quoting (BUG-FIX).
+ * aclocal/check-bsp-cache.m4: Fix m4-quoting (autoconf-2.49b).
+ * aclocal/prog-cc.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf
+ standard), replace CC_FOR_TARGET with CC (BUG-FIX).
+
+2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* aclocal/enable-itron.m4: Remove changequotes (autoconf-2.49b).
* aclocal/enable-posix.m4: Remove changequotes (autoconf-2.49b), use
$host instead of $target (BUG-FIX).
diff --git a/aclocal/check-bsp-cache.m4 b/aclocal/check-bsp-cache.m4
index 1eb077026b..289cbdcd43 100644
--- a/aclocal/check-bsp-cache.m4
+++ b/aclocal/check-bsp-cache.m4
@@ -6,11 +6,11 @@ AC_DEFUN(RTEMS_CHECK_BSP_CACHE,
AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl set RTEMS_BSP
AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
-AC_CACHE_CHECK("for RTEMS_CPU_MODEL", rtems_cv_RTEMS_CPU_MODEL,
+AC_CACHE_CHECK([for RTEMS_CPU_MODEL], rtems_cv_RTEMS_CPU_MODEL,
. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache)
RTEMS_CPU_MODEL=$rtems_cv_RTEMS_CPU_MODEL
AC_SUBST(RTEMS_CPU_MODEL)
-AC_CACHE_CHECK("for RTEMS_BSP_FAMILY", rtems_cv_RTEMS_BSP_FAMILY,
+AC_CACHE_CHECK([for RTEMS_BSP_FAMILY], rtems_cv_RTEMS_BSP_FAMILY,
. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache)
RTEMS_BSP_FAMILY=$rtems_cv_RTEMS_BSP_FAMILY
AC_SUBST(RTEMS_BSP_FAMILY)
diff --git a/aclocal/gcc-pipe.m4 b/aclocal/gcc-pipe.m4
index dd3a9581d4..093ea2edf4 100644
--- a/aclocal/gcc-pipe.m4
+++ b/aclocal/gcc-pipe.m4
@@ -10,7 +10,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])
AC_CACHE_CHECK(whether $CC accepts --pipe,rtems_cv_gcc_pipe,
[
rtems_cv_gcc_pipe=no
-if test "$ac_cv_prog_gcc" = "yes"; then
+if test x"$GCC" = x"yes"; then
echo 'void f(){}' >conftest.c
if test -z "`${CC} --pipe -c conftest.c 2>&1`";then
rtems_cv_gcc_pipe=yes
diff --git a/aclocal/gcc-specs.m4 b/aclocal/gcc-specs.m4
index 7d90d24644..ca0271424f 100644
--- a/aclocal/gcc-specs.m4
+++ b/aclocal/gcc-specs.m4
@@ -9,7 +9,7 @@ AC_DEFUN(RTEMS_GCC_SPECS,
AC_CACHE_CHECK(whether $CC accepts -specs,rtems_cv_gcc_specs,
[
rtems_cv_gcc_specs=no
-if test "$ac_cv_prog_gcc" = "yes"; then
+if test x"$GCC" = x"yes"; then
touch confspec
echo 'void f(){}' >conftest.c
if test -z "`${CC} -specs confspec -c conftest.c 2>&1`";then
diff --git a/aclocal/multilib.m4 b/aclocal/multilib.m4
index 5e0c5272d1..78d89650a3 100644
--- a/aclocal/multilib.m4
+++ b/aclocal/multilib.m4
@@ -40,10 +40,10 @@ else
fi
AC_OUTPUT_COMMANDS(
- if test -n "$CONFIG_FILES"; then
- ac_file=[]ifelse([$1],,Makefile,[$1]) \
- . ${multilib_basedir}/../config-ml.in
- fi,[
+[if test -n "$CONFIG_FILES"; then
+ ac_file=]ifelse([$1],,Makefile,[$1])[ \
+ . ${multilib_basedir}/../config-ml.in
+fi],[
srcdir=${srcdir}
host=${host}
target=${target}
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4
index 7661f09132..73967f035e 100644
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -17,7 +17,7 @@ test -z "$CC" && \
AC_MSG_ERROR([no acceptable cc found in \$PATH])
AC_PROG_CC
-AM_CONDITIONAL(RTEMS_USE_GCC,test x"$ac_cv_prog_gcc" = x"yes")
+AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
])
AC_DEFUN(RTEMS_PROG_CC_FOR_TARGET,
@@ -35,7 +35,7 @@ if test "$RTEMS_USE_GCC272" != "yes" ; then
RTEMS_USE_GCC272=yes
fi
fi
-test "$rtems_cv_gcc_pipe" = "yes" && CC_FOR_TARGET="$CC_FOR_TARGET --pipe"
+test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
## Conditional for automake files
AM_CONDITIONAL(RTEMS_USE_GCC272, test x"$RTEMS_USE_GCC272" = x"yes")