diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | aclocal/canonical-host.m4 | 8 | ||||
| -rw-r--r-- | aclocal/check-newlib.m4 | 2 | ||||
| -rw-r--r-- | aclocal/rtems-debug.m4 | 2 | ||||
| -rw-r--r-- | aclocal/rtems-top.m4 | 17 |
5 files changed, 18 insertions, 19 deletions
@@ -1,3 +1,11 @@ +2000-11-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/canonical-host.m4: Abandon changequotes (autoconf-2.49b). + * aclocal/check-newlib.m4: Let check message refer to RTEMS newlib. + * aclocal/rtems-debug.m4: Fix formating and contents of the check's + help string. + * aclocal/rtems-top.m4: Remove AC_ARG_WITH(target-subdir). + 2000-11-13 Jiri Gaisler <jgais@ws.estec.esa.nl> * README.configure, aclocal/bsp-alias.m4, aclocal/check-bsps.m4: diff --git a/aclocal/canonical-host.m4 b/aclocal/canonical-host.m4 index 99b5fb07da..7077ab31c5 100644 --- a/aclocal/canonical-host.m4 +++ b/aclocal/canonical-host.m4 @@ -4,16 +4,15 @@ AC_DEFUN(RTEMS_CANONICAL_HOST, [dnl AC_REQUIRE([AC_CANONICAL_HOST]) RTEMS_HOST=$host_os -changequote(,)dnl case "${target}" in # hpux unix port should go here - i[34567]86-*linux*) # unix "simulator" port + i[[34567]]86-*linux*) # unix "simulator" port RTEMS_HOST=Linux ;; - i[34567]86-*freebsd*) # unix "simulator" port + i[[34567]]86-*freebsd*) # unix "simulator" port RTEMS_HOST=FreeBSD ;; - i[34567]86-pc-cygwin*) # Cygwin is just enough unix like :) + i[[34567]]86-pc-cygwin*) # Cygwin is just enough unix like :) RTEMS_HOST=Cygwin ;; sparc-sun-solaris*) # unix "simulator" port @@ -22,6 +21,5 @@ case "${target}" in *) ;; esac -changequote([,])dnl AC_SUBST(RTEMS_HOST) ])dnl diff --git a/aclocal/check-newlib.m4 b/aclocal/check-newlib.m4 index 326c58c1aa..852ae4f2d5 100644 --- a/aclocal/check-newlib.m4 +++ b/aclocal/check-newlib.m4 @@ -4,7 +4,7 @@ AC_DEFUN(RTEMS_CHECK_NEWLIB, [dnl AC_REQUIRE([RTEMS_PROG_CC_FOR_TARGET])dnl AC_REQUIRE([RTEMS_CANONICALIZE_TOOLS])dnl -AC_CACHE_CHECK([for newlib], +AC_CACHE_CHECK([for RTEMS newlib], rtems_cv_use_newlib, [ dnl some versions of newlib provide not_required_by_rtems diff --git a/aclocal/rtems-debug.m4 b/aclocal/rtems-debug.m4 index d895b921b0..f83a039d40 100644 --- a/aclocal/rtems-debug.m4 +++ b/aclocal/rtems-debug.m4 @@ -3,7 +3,7 @@ AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG, [ AC_ARG_ENABLE(rtems-debug, -[ --disable-rtems-debug disable RTEMS_DEBUG], +[ --enable-rtems-debug enable RTEMS_DEBUG], [case "${enableval}" in yes) RTEMS_DEBUG=yes ;; no) RTEMS_DEBUG=no ;; diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4 index fa79019df7..b0e246c733 100644 --- a/aclocal/rtems-top.m4 +++ b/aclocal/rtems-top.m4 @@ -15,24 +15,19 @@ AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl ENDIF=endif AC_SUBST(ENDIF) -# with_target_subdir -AC_ARG_WITH(target-subdir, -[ --with-target-subdir=DIR], -with_target_subdir="$withval", -with_target_subdir=".") - RTEMS_TOPdir="$1"; AC_SUBST(RTEMS_TOPdir) +## with_target_subdirs is handled implicitly by autoconf +test -n "$with_target_subdir" || with_target_subdir="." + if test "$with_target_subdir" = "." ; then # Native PROJECT_TOPdir=${RTEMS_TOPdir}/'$(top_builddir)' else # Cross -changequote(, )dnl dots=`echo $with_target_subdir|\ -sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` -changequote([, ])dnl +sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'` PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)' fi AC_SUBST(PROJECT_TOPdir) @@ -50,10 +45,8 @@ dnl Determine RTEMS Version string from the VERSION file dnl Hopefully, Joel never changes its format ;- AC_MSG_CHECKING([for RTEMS Version]) if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then -changequote(,)dnl RTEMS_VERSION=`grep 'RTEMS Version' ${srcdir}/${RTEMS_TOPdir}/VERSION | \ -sed -e 's%RTEMS[ ]*Version[ ]*\(.*\)[ ]*%\1%g'` -changequote([,])dnl +sed -e 's%RTEMS[[ ]]*Version[[ ]]*\(.*\)[[ ]]*%\1%g'` else AC_MSG_ERROR(Unable to find ${RTEMS_TOPdir}/VERSION) fi |