diff options
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/canonical-host.m4 | 9 | ||||
| -rw-r--r-- | aclocal/canonical-target-name.m4 | 7 | ||||
| -rw-r--r-- | aclocal/check-multiprocessing.m4 | 3 | ||||
| -rw-r--r-- | aclocal/enable-itron.m4 | 4 | ||||
| -rw-r--r-- | aclocal/enable-posix.m4 | 4 | ||||
| -rw-r--r-- | aclocal/prog-cxx.m4 | 2 | ||||
| -rw-r--r-- | aclocal/target.m4 | 6 |
7 files changed, 22 insertions, 13 deletions
diff --git a/aclocal/canonical-host.m4 b/aclocal/canonical-host.m4 index 3f92cfa5bb..de695c9de2 100644 --- a/aclocal/canonical-host.m4 +++ b/aclocal/canonical-host.m4 @@ -7,13 +7,16 @@ RTEMS_HOST=$host_os changequote(,)dnl case "${target}" in # hpux unix port should go here - i[3456]86-pc-linux*) # unix "simulator" port + i[34567]86-*linux*) # unix "simulator" port RTEMS_HOST=Linux ;; - i[3456]86-*freebsd2*) # unix "simulator" port + i[34567]86-*freebsd2*) # unix "simulator" port RTEMS_HOST=FreeBSD ;; - sparc-sun-solaris*) # unix "simulator" port + i[34567]86-pc-cygwin*) # Cygwin is just enough unix like :) + RTEMS_HOST=Cygwin + ;; + sparc-sun-solaris*) # unix "simulator" port RTEMS_HOST=Solaris ;; *) diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4 index ae4ea25caf..be7e650a95 100644 --- a/aclocal/canonical-target-name.m4 +++ b/aclocal/canonical-target-name.m4 @@ -15,10 +15,13 @@ AC_MSG_CHECKING(rtems target cpu) changequote(,)dnl case "${target}" in # hpux unix port should go here - i[3456]86-pc-linux*) # unix "simulator" port + i[34567]86-*linux*) # unix "simulator" port RTEMS_CPU=unix ;; - i[3456]86-*freebsd2*) # unix "simulator" port + i[34567]86-*freebsd2*) # unix "simulator" port + RTEMS_CPU=unix + ;; + i[34567]86-pc-cygwin*) # Cygwin is just enough unix like :) RTEMS_CPU=unix ;; no_cpu-*rtems*) diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4 index 098b34a7a4..2af6c5905a 100644 --- a/aclocal/check-multiprocessing.m4 +++ b/aclocal/check-multiprocessing.m4 @@ -12,7 +12,8 @@ AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl AC_CACHE_CHECK([whether BSP supports multiprocessing], rtems_cv_HAS_MP, [dnl - if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${$1}/shmsupp"; then + RTEMS_BSP_ALIAS(${$1},bspdir) + if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${bspdir}/shmsupp"; then if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then rtems_cv_HAS_MP="yes" ; else diff --git a/aclocal/enable-itron.m4 b/aclocal/enable-itron.m4 index c4c8353d2b..7670c4e4b0 100644 --- a/aclocal/enable-itron.m4 +++ b/aclocal/enable-itron.m4 @@ -15,10 +15,10 @@ esac],[RTEMS_HAS_ITRON_API=yes]) changequote(,)dnl case "${target}" in # hpux unix port should go here - i[3456]86-pc-linux*) # unix "simulator" port + i[34567]86-pc-linux*) # unix "simulator" port RTEMS_HAS_ITRON_API=no ;; - i[3456]86-*freebsd2*) # unix "simulator" port + i[34567]86-*freebsd2*) # unix "simulator" port RTEMS_HAS_ITRON_API=no ;; no_cpu-*rtems*) diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4 index 5da8110818..386ae31e5b 100644 --- a/aclocal/enable-posix.m4 +++ b/aclocal/enable-posix.m4 @@ -15,10 +15,10 @@ esac],[RTEMS_HAS_POSIX_API=yes]) changequote(,)dnl case "${target}" in # hpux unix port should go here - i[3456]86-pc-linux*) # unix "simulator" port + i[34567]86-pc-linux*) # unix "simulator" port RTEMS_HAS_POSIX_API=no ;; - i[3456]86-*freebsd2*) # unix "simulator" port + i[34567]86-*freebsd2*) # unix "simulator" port RTEMS_HAS_POSIX_API=no ;; no_cpu-*rtems*) diff --git a/aclocal/prog-cxx.m4 b/aclocal/prog-cxx.m4 index e3f1246f15..aa8716df7e 100644 --- a/aclocal/prog-cxx.m4 +++ b/aclocal/prog-cxx.m4 @@ -64,6 +64,8 @@ unset ac_cv_prog_gxx unset ac_cv_prog_cc_g unset ac_cv_prog_cxx_works unset ac_cv_prog_cxx_cross +dnl somehow autoconf macros leave this file +rm -f conftest.C ]) AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET, diff --git a/aclocal/target.m4 b/aclocal/target.m4 index ed9734dd06..8312ff3438 100644 --- a/aclocal/target.m4 +++ b/aclocal/target.m4 @@ -54,7 +54,7 @@ if test "$no_recursion" != yes; then echo configuring in $target_subdir/$ac_config_dir case "$srcdir" in - .) ;; +## .) ;; *) if test -d $target_subdir/$ac_config_dir || mkdir $target_subdir/$ac_config_dir; then :; else @@ -72,8 +72,8 @@ changequote(, )dnl changequote([, ])dnl case "$srcdir" in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; +## .) # No --srcdir option. We are building in place. +## ac_sub_srcdir=$srcdir ;; /*) # Absolute path. ac_sub_srcdir=$srcdir/$ac_config_dir ;; *) # Relative path. |