summaryrefslogtreecommitdiffstats
path: root/aclocal
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-11-02 22:51:12 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-11-02 22:51:12 +0000
commit4686e5d9156c7bca65c140002c3c3df28490333d (patch)
tree97b9af43e6efc779c4cd3f9e74d7025615616fd4 /aclocal
parent779654e2af7fa9476e08a1d886094dba655dac53 (diff)
downloadrtems-4686e5d9156c7bca65c140002c3c3df28490333d.tar.bz2
2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/canonicalize-tools.m4, aclocal/check-tool.m4, aclocal/prog-cc.m4, aclocal/prog-cxx.m4: Replace AC_CHECK_TOOL with an RTEMS specific but more restrictive autoconf macro.
Diffstat (limited to 'aclocal')
-rw-r--r--aclocal/canonicalize-tools.m422
-rw-r--r--aclocal/prog-cc.m44
-rw-r--r--aclocal/prog-cxx.m42
3 files changed, 12 insertions, 16 deletions
diff --git a/aclocal/canonicalize-tools.m4 b/aclocal/canonicalize-tools.m4
index b0b3da524e..3868c76d71 100644
--- a/aclocal/canonicalize-tools.m4
+++ b/aclocal/canonicalize-tools.m4
@@ -4,12 +4,6 @@ dnl
dnl Set target tools
dnl
-AC_DEFUN(RTEMS_HOST_AR,
-[AC_CHECK_TOOL(AR,ar,no)])
-
-AC_DEFUN(RTEMS_HOST_RANLIB,
-[AC_CHECK_TOOL(RANLIB,ranlib,:)])
-
AC_DEFUN(RTEMS_GCC_PRINT,
[
$1=`$CC --print-prog-name=$2`
@@ -19,16 +13,16 @@ AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
[AC_REQUIRE([RTEMS_PROG_CC])dnl
dnl FIXME: What shall be done if these tools are not available?
- RTEMS_HOST_AR(AR,ar,no)
- AC_CHECK_TOOL(AS,as,no)
- AC_CHECK_TOOL(LD,ld,no)
- AC_CHECK_TOOL(NM,nm,no)
+ RTEMS_CHECK_TOOL(AR,ar,no)
+ RTEMS_CHECK_TOOL(AS,as,no)
+ RTEMS_CHECK_TOOL(LD,ld,no)
+ RTEMS_CHECK_TOOL(NM,nm,no)
dnl special treatment of ranlib
- RTEMS_HOST_RANLIB
+ RTEMS_CHECK_TOOL(RANLIB,ranlib,:)
dnl NOTE: These may not be available if not using gnutools
- AC_CHECK_TOOL(OBJCOPY,objcopy,no)
- AC_CHECK_TOOL(SIZE,size,no)
- AC_CHECK_TOOL(STRIP,strip,:)
+ RTEMS_CHECK_TOOL(OBJCOPY,objcopy,no)
+ RTEMS_CHECK_TOOL(SIZE,size,no)
+ RTEMS_CHECK_TOOL(STRIP,strip,:)
])
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4
index 81ca5ca75a..7661f09132 100644
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -12,7 +12,9 @@ AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
AC_REQUIRE([RTEMS_ENABLE_GCC28])dnl
-AC_CHECK_TOOL(CC,gcc)
+RTEMS_CHECK_TOOL(CC,gcc)
+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")
diff --git a/aclocal/prog-cxx.m4 b/aclocal/prog-cxx.m4
index d9159677b8..3755038898 100644
--- a/aclocal/prog-cxx.m4
+++ b/aclocal/prog-cxx.m4
@@ -12,7 +12,7 @@ AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
dnl Only accept g++
dnl NOTE: This might be too restrictive
-AC_CHECK_TOOL(CXX,g++)
+RTEMS_CHECK_TOOL(CXX,g++)
AC_PROG_CXX
test -z "$CXX" \
&& AC_MSG_ERROR([no acceptable c++ found in \$PATH])