diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/make/aclocal.m4 | 42 | ||||
-rw-r--r-- | c/src/make/configure | 41 |
2 files changed, 55 insertions, 28 deletions
diff --git a/c/src/make/aclocal.m4 b/c/src/make/aclocal.m4 index 21cd0b71bd..22e52563bc 100644 --- a/c/src/make/aclocal.m4 +++ b/c/src/make/aclocal.m4 @@ -1018,18 +1018,17 @@ AC_DEFUN(RTEMS_CHECK_CXX, [dnl AC_REQUIRE([RTEMS_CHECK_CPU])dnl AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl -AC_CACHE_VAL(rtems_cv_HAS_CPLUSPLUS, - [dnl - if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then +AC_CACHE_CHECK([whether to build rtems++], + rtems_cv_HAS_CPLUSPLUS, + [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then if test -n "$CXX_FOR_TARGET"; then - rtems_cv_HAS_CPLUSPLUS="yes"; + rtems_cv_HAS_CPLUSPLUS="yes" else - rtems_cv_HAS_CPLUSPLUS="no"; + rtems_cv_HAS_CPLUSPLUS="no" fi else - rtems_cv_HAS_CPLUSPLUS="no"; - fi - ])dnl + rtems_cv_HAS_CPLUSPLUS="no" + fi]) HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS"; AC_SUBST(HAS_CPLUSPLUS)dnl ]) @@ -1039,15 +1038,26 @@ dnl AC_DEFUN(RTEMS_CHECK_NETWORKING, [dnl AC_REQUIRE([RTEMS_CHECK_CPU])dnl -AC_CACHE_VAL(rtems_cv_HAS_NETWORKING, +AC_CACHE_CHECK([whether BSP supports networking], + rtems_cv_HAS_NETWORKING, [dnl - if test "$RTEMS_HAS_NETWORKING" = "yes"; then - rtems_cv_HAS_NETWORKING="yes"; - else - rtems_cv_HAS_NETWORKING="no"; - fi - ])dnl -HAS_NETWORKING="$rtems_cv_HAS_NETWORKING"; + case "$RTEMS_CPU" in + unix*) + rtems_cv_HAS_NETWORKING="no" + ;; + *) + if test "${RTEMS_HAS_NETWORKING}" = "yes"; then + rtems_cv_HAS_NETWORKING="yes"; + else + rtems_cv_HAS_NETWORKING="disabled"; + fi + ;; + esac]) +if test "$rtems_cv_HAS_NETWORKING" = "yes"; then + HAS_NETWORKING="yes"; +else + HAS_NETWORKING="no"; +fi AC_SUBST(HAS_NETWORKING)dnl ]) diff --git a/c/src/make/configure b/c/src/make/configure index 9a874f12d2..e0d12397fa 100644 --- a/c/src/make/configure +++ b/c/src/make/configure @@ -2997,33 +2997,50 @@ else HAS_POSIX_API="no"; fi +echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6 +echo "configure:3002: checking whether to build rtems++" >&5 if eval "test \"`echo '$''{'rtems_cv_HAS_CPLUSPLUS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then + if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then if test -n "$CXX_FOR_TARGET"; then - rtems_cv_HAS_CPLUSPLUS="yes"; + rtems_cv_HAS_CPLUSPLUS="yes" else - rtems_cv_HAS_CPLUSPLUS="no"; + rtems_cv_HAS_CPLUSPLUS="no" fi else - rtems_cv_HAS_CPLUSPLUS="no"; + rtems_cv_HAS_CPLUSPLUS="no" fi - fi + +echo "$ac_t""$rtems_cv_HAS_CPLUSPLUS" 1>&6 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS"; +echo $ac_n "checking whether BSP supports networking""... $ac_c" 1>&6 +echo "configure:3021: checking whether BSP supports networking" >&5 if eval "test \"`echo '$''{'rtems_cv_HAS_NETWORKING'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$RTEMS_HAS_NETWORKING" = "yes"; then - rtems_cv_HAS_NETWORKING="yes"; - else - rtems_cv_HAS_NETWORKING="no"; - fi - + case "$RTEMS_CPU" in + unix*) + rtems_cv_HAS_NETWORKING="no" + ;; + *) + if test "${RTEMS_HAS_NETWORKING}" = "yes"; then + rtems_cv_HAS_NETWORKING="yes"; + else + rtems_cv_HAS_NETWORKING="disabled"; + fi + ;; + esac +fi + +echo "$ac_t""$rtems_cv_HAS_NETWORKING" 1>&6 +if test "$rtems_cv_HAS_NETWORKING" = "yes"; then + HAS_NETWORKING="yes"; +else + HAS_NETWORKING="no"; fi -HAS_NETWORKING="$rtems_cv_HAS_NETWORKING"; |