diff options
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/aclocal/rtems-top.m4 | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 6cb42823b8..53cc7d1a4a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/rtems-top.m4: Remove check for cpukit/aclocal/version.m4. + Remove gnu-make endif HACK (Unused). + +2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * wrapup/Makefile.am: Include compile.am. Use TMP_LIBS instead of LIBS to avoid potential conflicts with auto*tools' LIBS. diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4 index 952dcd6133..9f1e87de6f 100644 --- a/cpukit/aclocal/rtems-top.m4 +++ b/cpukit/aclocal/rtems-top.m4 @@ -17,10 +17,6 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API]) -## HACK to allow gnu-make conditionals in automake-Makefiles. -ENDIF=endif -AC_SUBST(ENDIF) - RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) @@ -42,9 +38,6 @@ PROJECT_ROOT="${with_project_root}${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_buildd AC_SUBST(PROJECT_ROOT) AC_MSG_CHECKING([for RTEMS Version]) -AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/cpukit/aclocal/version.m4"], -[], -[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/cpukit/aclocal/version.m4])]) AC_MSG_RESULT([_RTEMS_VERSION]) AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) |