summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-02-03 04:56:26 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-02-03 04:56:26 +0000
commit1f1b2984d7c4edb171e33c14bd2e7fd7a8013095 (patch)
treea83fac3e704c47cd46f166ad52207f0ba9d2581c
parent07f4ee0e3d74882d42167c0165dbabfcd7650ed4 (diff)
downloadrtems-1f1b2984d7c4edb171e33c14bd2e7fd7a8013095.tar.bz2
2004-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rpm.m4: Make osversions the default. * aclocal/rtems-top.m4: Remove check for version.m4 (Breaks make distcheck).
-rw-r--r--ChangeLog8
-rw-r--r--aclocal/rpm.m42
-rw-r--r--aclocal/rtems-top.m43
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e82425354..32ee3a4ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2004-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/rpm.m4: Make osversions the default.
+ * aclocal/rtems-top.m4: Remove check for version.m4 (Breaks make
+ distcheck).
+
2004-02-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
- * aclocal/rpms.m4: New (extracted from scripts/configure.ac).
+ * aclocal/rpm.m4: New (extracted from scripts/configure.ac).
2004-01-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/aclocal/rpm.m4 b/aclocal/rpm.m4
index 2f19a5a3a8..a1d16dcb78 100644
--- a/aclocal/rpm.m4
+++ b/aclocal/rpm.m4
@@ -16,5 +16,5 @@ AC_ARG_ENABLE([osversions],
yes ) osversion=RTEMS_API;;
* ) osversion=;;
esac],
-[osversion=])
+[osversion=RTEMS_API])
])
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 1cd739f8f7..aa08167290 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -41,8 +41,5 @@ PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
AC_SUBST(PROJECT_ROOT)
AC_MSG_CHECKING([for RTEMS Version])
-AS_IF([test -r "${srcdir}/${RTEMS_TOPdir}/aclocal/version.m4"],
-[],
-[AC_MSG_ERROR([Unable to find ${RTEMS_TOPdir}/aclocal/version.m4])])
AC_MSG_RESULT([_RTEMS_VERSION])
])dnl