From 70810dcd8970194d96f685ffe4af890911e273c5 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 8 Feb 2000 22:33:25 +0000
Subject: Patches rtems-rc-20000204-0.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that contains:

* Removes remaining (now illegal) references to $(SRC) from a couple of
  Makefile.ams
* Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in
* Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR
  from most configure scripts, i.e. LIBCDIR becomes less visible)
* Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to
  libbsp/*/configure.ins (A minor bug in previous implementations, which
  only has an impact when switching to GNU/Cygnus canonicalization)
* Cleans up several bogus comments.
* Removes MKLIB
* Switches the version number to 4.5.0 (for testing version number
  handling)
---
 aclocal/canonicalize-tools.m4 | 9 ---------
 aclocal/gcc-pipe.m4           | 6 ------
 aclocal/prog-cc.m4            | 1 +
 aclocal/prog-cxx.m4           | 1 +
 aclocal/project-root.m4       | 3 ---
 5 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'aclocal')

diff --git a/aclocal/canonicalize-tools.m4 b/aclocal/canonicalize-tools.m4
index 149e14ca66..7d76ab74b1 100644
--- a/aclocal/canonicalize-tools.m4
+++ b/aclocal/canonicalize-tools.m4
@@ -13,16 +13,7 @@ dnl
 
 AC_DEFUN(RTEMS_GCC_PRINT,
 [
-dnl case $host_os in
-dnl  *cygwin*)
-dnl    dnl FIXME: Hack for cygwin/egcs reporting mixed '\\' and '/'
-dnl    dnl        Should be removed once cygwin/egcs reports '/' only
-dnl    $1=`$CC_FOR_TARGET --print-prog-name=$2 | sed -e 's%\\\\%/%g' `
-dnl    ;;
-dnl  *)
     $1=`$CC_FOR_TARGET --print-prog-name=$2`
-dnl    ;;
-dnl  esac
 ])
 
 AC_DEFUN(RTEMS_PATH_TOOL,
diff --git a/aclocal/gcc-pipe.m4 b/aclocal/gcc-pipe.m4
index 0550b60d9e..cb78506723 100644
--- a/aclocal/gcc-pipe.m4
+++ b/aclocal/gcc-pipe.m4
@@ -11,17 +11,11 @@ AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts --pipe,rtems_cv_gcc_pipe,
 [
 rtems_cv_gcc_pipe=no
 if test "$rtems_cv_prog_gcc" = "yes"; then
-dnl case "$host_os" in
-dnl   cygwin*)
-dnl    ;;
-dnl  *)
     echo 'void f(){}' >conftest.c
     if test -z "`${CC_FOR_TARGET} --pipe -c conftest.c 2>&1`";then
       rtems_cv_gcc_pipe=yes
     fi
     rm -f conftest*
-dnl    ;;
-dnl esac
 fi
 ])
 ])
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4
index af8c6122b4..337c580152 100644
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -12,6 +12,7 @@ AC_BEFORE([$0], [AC_PROG_CPP])dnl
 AC_BEFORE([$0], [AC_PROG_CC])dnl
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
+AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
 
 dnl Only accept gcc and cc
 dnl NOTE: This might be too restrictive for native compilation
diff --git a/aclocal/prog-cxx.m4 b/aclocal/prog-cxx.m4
index e77a3d08b5..e3f1246f15 100644
--- a/aclocal/prog-cxx.m4
+++ b/aclocal/prog-cxx.m4
@@ -12,6 +12,7 @@ AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
 AC_BEFORE([$0], [AC_PROG_CXX])dnl
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
+AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl
 
 dnl Only accept g++ and c++
 dnl NOTE: This might be too restrictive for native compilation
diff --git a/aclocal/project-root.m4 b/aclocal/project-root.m4
index 1699736fe4..aa58b1a553 100644
--- a/aclocal/project-root.m4
+++ b/aclocal/project-root.m4
@@ -15,9 +15,6 @@ AC_SUBST(PROJECT_ROOT)
 RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
 AC_SUBST(RTEMS_ROOT)
 
-INSTALL_CHANGE="\$(KSH) \$(PROJECT_ROOT)/tools/build/install-if-change"
-AC_SUBST(INSTALL_CHANGE)
-
 PACKHEX="\$(PROJECT_ROOT)/tools/build/packhex"
 AC_SUBST(PACKHEX)
 
-- 
cgit v1.2.3