diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | aclocal/check-newlib.m4 | 5 | ||||
| -rw-r--r-- | aclocal/enable-itron.m4 | 8 | ||||
| -rw-r--r-- | aclocal/enable-posix.m4 | 8 | ||||
| -rw-r--r-- | aclocal/sysv-ipc.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 14 |
6 files changed, 33 insertions, 23 deletions
@@ -1,5 +1,22 @@ 2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/enable-itron.m4: Remove changequotes (autoconf-2.49b). + * aclocal/enable-posix.m4: Remove changequotes (autoconf-2.49b), use + $host instead of $target (BUG-FIX). + * configure.in: Use $target and $host instead of $target_alias and + $host_alias (autoconf-2.49b). + * aclocal/check-newlib.m4: Remove CC_FOR_TARGET (BUG-FIX) + * aclocal/sysv-ipc.m4: Move AC_DEFINE outside of AC_CACHE (BUG-FIX) + + NOTES: + * autoconf-2.49b depredicates using changequotes. + * The changes to configure.in are due to cleanups in + autoconf-2.49b's implemention of canonicalization. With + autoconf-2.1x it wasn't always clear, when to use $xxx or + $xxx_alias. Now this is clear. + +2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. 2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/aclocal/check-newlib.m4 b/aclocal/check-newlib.m4 index 1984001dc8..326c58c1aa 100644 --- a/aclocal/check-newlib.m4 +++ b/aclocal/check-newlib.m4 @@ -7,8 +7,6 @@ AC_REQUIRE([RTEMS_CANONICALIZE_TOOLS])dnl AC_CACHE_CHECK([for newlib], rtems_cv_use_newlib, [ - rtems_save_CC=$CC - dnl some versions of newlib provide not_required_by_rtems AC_TRY_LINK( [extern void not_required_by_rtems() ;], @@ -23,7 +21,7 @@ dnl some versions of newlib provide rtems_provides_crt0() rtems_cv_use_newlib="yes", rtems_cv_use_newlib="no") fi - CC=$rtems_save_CC]) + ]) RTEMS_USE_NEWLIB="$rtems_cv_use_newlib" AC_SUBST(RTEMS_USE_NEWLIB) @@ -33,4 +31,3 @@ then AC_DEFINE_UNQUOTED(MALLOC_PROVIDED,1,[if malloc is provided]) fi ]) - diff --git a/aclocal/enable-itron.m4 b/aclocal/enable-itron.m4 index bb622079e9..efe99115f4 100644 --- a/aclocal/enable-itron.m4 +++ b/aclocal/enable-itron.m4 @@ -12,13 +12,12 @@ AC_ARG_ENABLE(itron, *) AC_MSG_ERROR(bad value ${enableval} for enable-itron option) ;; esac],[RTEMS_HAS_ITRON_API=yes]) -changequote(,)dnl -case "${target}" in +case "${host}" in # hpux unix port should go here - i[34567]86-pc-linux*) # unix "simulator" port + i[[34567]]86-pc-linux*) # unix "simulator" port RTEMS_HAS_ITRON_API=no ;; - i[34567]86-*freebsd*) # unix "simulator" port + i[[34567]]86-*freebsd*) # unix "simulator" port RTEMS_HAS_ITRON_API=no ;; no_cpu-*rtems*) @@ -30,6 +29,5 @@ case "${target}" in *) ;; esac -changequote([,])dnl AC_SUBST(RTEMS_HAS_ITRON_API) ]) diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4 index bbf2889b63..1a8197e1cd 100644 --- a/aclocal/enable-posix.m4 +++ b/aclocal/enable-posix.m4 @@ -12,13 +12,12 @@ AC_ARG_ENABLE(posix, *) AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;; esac],[RTEMS_HAS_POSIX_API=yes]) -changequote(,)dnl -case "${target}" in +case "${host}" in # hpux unix port should go here - i[34567]86-pc-linux*) # unix "simulator" port + i[[34567]]86-pc-linux*) # unix "simulator" port RTEMS_HAS_POSIX_API=no ;; - i[34567]86-*freebsd*) # unix "simulator" port + i[[34567]]86-*freebsd*) # unix "simulator" port RTEMS_HAS_POSIX_API=no ;; no_cpu-*rtems*) @@ -30,6 +29,5 @@ case "${target}" in *) ;; esac -changequote([,])dnl AC_SUBST(RTEMS_HAS_POSIX_API) ]) diff --git a/aclocal/sysv-ipc.m4 b/aclocal/sysv-ipc.m4 index 883921e2c8..00aa1bf32e 100644 --- a/aclocal/sysv-ipc.m4 +++ b/aclocal/sysv-ipc.m4 @@ -27,10 +27,10 @@ AC_CACHE_CHECK([whether $RTEMS_HOST defines union semun], [union semun arg ;], [rtems_cv_HAS_UNION_SEMUN="yes"], [rtems_cv_HAS_UNION_SEMUN="no"]) - +]) if test "$rtems_cv_HAS_UNION_SEMUN" = "yes"; then AC_DEFINE(HAS_UNION_SEMUN) -fi]) +fi ]) AC_DEFUN(RTEMS_SYSV_SEM, diff --git a/configure.in b/configure.in index af9a919258..8f30c9847a 100644 --- a/configure.in +++ b/configure.in @@ -74,13 +74,13 @@ targargs=`echo "${ac_configure_args}" | \ -e 's/--bu[a-z-]*=[^ ]*//' \ -e 's/--ta[a-z-]*=[^ ]*//'`; -targargs="--host=${target_alias} --build=${build_alias} ${targargs}" +targargs="--host=${target_alias} --build=${build} ${targargs}" AC_SUBST(targargs) target_subdir=${target_alias} changequote(,)dnl -if test $target_alias = $host_alias; +if test $target = $host; then HOST_SUBDIRS="$configdirs $target_configdirs" TARGET_SUBDIRS="" @@ -91,7 +91,7 @@ else fi changequote([,])dnl -if test $host_alias = $build_alias; +if test $host = $build; then HOST_SUBDIRS="$build_tools $HOST_SUBDIRS" else @@ -113,7 +113,7 @@ doc/Makefile) if test "$no_recursion" != yes; then - if test $target_alias != $host_alias; then + if test $target != $host; then # Remove --srcdir arguments so they do not pile up. ac_sub_configure_args= ac_prev= @@ -207,7 +207,7 @@ changequote([, ])dnl done fi - if test $build_alias != $host_alias; then + if test $build != $host; then # Remove --srcdir arguments so they do not pile up. ac_sub_configure_args= ac_prev= @@ -262,7 +262,7 @@ changequote([, ])dnl ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; esac - # Check for guested configure; otherwise get Cygnus style configure. + # Check for configure if test -f $ac_sub_srcdir/configure; then ac_sub_configure=$ac_sub_srcdir/configure else @@ -289,7 +289,7 @@ changequote([, ])dnl if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \ $ac_sub_configure_args --srcdir=$ac_sub_srcdir \ --cache-file=$ac_sub_cache_file \ - --build=$build_alias --host=$build_alias + --build=$build --host=$build then : else AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir) |