summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-11-02 15:55:26 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-11-02 15:55:26 +0000
commit2f17d7454fe04fc724611273a6c9f7771c69a7fc (patch)
tree02e4503d6bdf79f571cc094faee53bec009ce1d4
parenta314d3b497b2296e4780f1c783d1a8449de8feab (diff)
downloadrtems-2f17d7454fe04fc724611273a6c9f7771c69a7fc.tar.bz2
2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/canonicalize-tools.m4: Remove RTEMS_PATH_TOOL, use AC_CHECK_TOOL instead of RTEMS_PATH_TOOL in RTEMS_CANONICALIZE_TOOLS.
-rw-r--r--ChangeLog5
-rw-r--r--aclocal/canonicalize-tools.m447
2 files changed, 8 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index db5ee3e8f0..6e1de652b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/canonicalize-tools.m4: Remove RTEMS_PATH_TOOL, use
+ AC_CHECK_TOOL instead of RTEMS_PATH_TOOL in RTEMS_CANONICALIZE_TOOLS.
+
+2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/*: Replace with contents of macros/*.m4
* macros/: Remove.
diff --git a/aclocal/canonicalize-tools.m4 b/aclocal/canonicalize-tools.m4
index 811825b538..b0b3da524e 100644
--- a/aclocal/canonicalize-tools.m4
+++ b/aclocal/canonicalize-tools.m4
@@ -15,55 +15,14 @@ AC_DEFUN(RTEMS_GCC_PRINT,
$1=`$CC --print-prog-name=$2`
])
-AC_DEFUN(RTEMS_PATH_TOOL,
-[
-AC_MSG_CHECKING([target's $2])
-AC_CACHE_VAL(ac_cv_path_$1,:)
-AC_MSG_RESULT([$ac_cv_path_$1])
-
-if test -n "$ac_cv_path_$1"; then
- dnl retrieve the value from the cache
- $1=$ac_cv_path_$1
-else
- dnl the cache was not set
- if test -z "[$]$1" ; then
- if test "$ac_cv_prog_gcc" = "yes"; then
- # We are using gcc, ask it about its tool
- # NOTE: Necessary if gcc was configured to use the target's
- # native tools or uses prefixes for gnutools (e.g. gas instead of as)
- RTEMS_GCC_PRINT($1,$2)
- fi
- else
- # The user set an environment variable.
- # Check whether it is an absolute path, otherwise AC_PATH_PROG
- # will override the environment variable, which isn't what the user
- # intends
- AC_MSG_CHECKING([whether environment variable $1 is an absolute path])
- case "[$]$1" in
- /*) # valid
- AC_MSG_RESULT("yes")
- ;;
- *) # invalid for AC_PATH_PROG
- AC_MSG_RESULT("no")
- AC_MSG_ERROR([***]
- [Environment variable $1 should either]
- [be unset (preferred) or contain an absolute path])
- ;;
- esac
- fi
-
- AC_PATH_PROG($1,"$program_prefix"$2,$3)
-fi
-])
-
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)
- RTEMS_PATH_TOOL(AS,as,no)
- RTEMS_PATH_TOOL(LD,ld,no)
- RTEMS_PATH_TOOL(NM,nm,no)
+ AC_CHECK_TOOL(AS,as,no)
+ AC_CHECK_TOOL(LD,ld,no)
+ AC_CHECK_TOOL(NM,nm,no)
dnl special treatment of ranlib
RTEMS_HOST_RANLIB