From 01be59d9396b4d9980006f774c243dc05e4b91a3 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 10 Aug 1999 15:08:58 +0000 Subject: Patch from Ralf Corsepius to correct a minor problem with the HAS_MP patch and regenerated files. --- c/src/lib/aclocal.m4 | 42 ++++++++++++-------- c/src/lib/configure | 100 +++++++++++++++++++++++++++++------------------- c/src/lib/configure.in | 16 +++++--- c/src/make/aclocal.m4 | 42 ++++++++++++-------- c/src/make/configure | 41 ++++++++++++++------ c/src/tests/Makefile.in | 2 +- 6 files changed, 154 insertions(+), 89 deletions(-) diff --git a/c/src/lib/aclocal.m4 b/c/src/lib/aclocal.m4 index b43e9ca80a..2fbb5bdf3c 100644 --- a/c/src/lib/aclocal.m4 +++ b/c/src/lib/aclocal.m4 @@ -930,18 +930,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 ]) @@ -951,15 +950,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/lib/configure b/c/src/lib/configure index 547808aa9f..fed56fb847 100644 --- a/c/src/lib/configure +++ b/c/src/lib/configure @@ -2610,33 +2610,50 @@ HAS_MP="no" fi +echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6 +echo "configure:2615: 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:2634: 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"; @@ -2678,7 +2695,7 @@ fi if test -d "$srcdir/libbsp/$bspcpudir$bspdir"; then echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}$bspdir""... $ac_c" 1>&6 -echo "configure:2682: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5 +echo "configure:2699: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5 if test -d $srcdir/libbsp/${bspcpudir}$bspdir; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2693,7 +2710,7 @@ fi echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}shared""... $ac_c" 1>&6 -echo "configure:2697: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5 +echo "configure:2714: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5 if test -d $srcdir/libbsp/${bspcpudir}shared; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2719,6 +2736,10 @@ fi if test "$HAS_MP" = "yes"; then makefiles="$makefiles libbsp/shmdr/Makefile" +else + # HACK: sed out shmsupp/Makefile from makefiles + t="libbsp/$bspcpudir$bspdir/shmsupp" + makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"` fi @@ -2733,7 +2754,7 @@ fi # find all the CPU dependent library Makefiles echo $ac_n "checking for Makefile.in in libcpu/$RTEMS_CPU""... $ac_c" 1>&6 -echo "configure:2737: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5 +echo "configure:2758: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5 if test -d $srcdir/libcpu/$RTEMS_CPU; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2753,7 +2774,7 @@ case "${target}" in *) echo $ac_n "checking for Makefile.in in start/$RTEMS_CPU""... $ac_c" 1>&6 -echo "configure:2757: checking for Makefile.in in start/$RTEMS_CPU" >&5 +echo "configure:2778: checking for Makefile.in in start/$RTEMS_CPU" >&5 if test -d $srcdir/start/$RTEMS_CPU; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2770,13 +2791,10 @@ fi esac # If the TCP/IP stack is enabled, then find all TCP/IP Makefiles -echo $ac_n "checking if networking is enabled? ""... $ac_c" 1>&6 -echo "configure:2775: checking if networking is enabled? " >&5 -echo "$ac_t""$RTEMS_HAS_NETWORKING" 1>&6 -if test "$RTEMS_HAS_NETWORKING" = "yes"; then +if test "$HAS_NETWORKING" = "yes"; then echo $ac_n "checking for Makefile.in in libnetworking""... $ac_c" 1>&6 -echo "configure:2780: checking for Makefile.in in libnetworking" >&5 +echo "configure:2798: checking for Makefile.in in libnetworking" >&5 if test -d $srcdir/libnetworking; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2791,7 +2809,7 @@ fi echo $ac_n "checking for Makefile.in in librpc""... $ac_c" 1>&6 -echo "configure:2795: checking for Makefile.in in librpc" >&5 +echo "configure:2813: checking for Makefile.in in librpc" >&5 if test -d $srcdir/librpc; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2805,9 +2823,9 @@ fi - if test "$RTEMS_HAS_RDBG" = "yes"; then + if test "$HAS_RDBG" = "yes"; then echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6 -echo "configure:2811: checking whether BSP supports librdbg" >&5 +echo "configure:2829: checking whether BSP supports librdbg" >&5 if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2829,7 +2847,7 @@ HAS_RDBG="$rtems_cv_HAS_RDBG" # Extract the first word of "rpcgen", so it can be a program name with args. set dummy rpcgen; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2833: checking for $ac_word" >&5 +echo "configure:2851: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2860,7 +2878,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2864: checking for $ac_word" >&5 +echo "configure:2882: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2899,7 +2917,7 @@ done if test "$HAS_RDBG" = "yes"; then echo $ac_n "checking for Makefile.in in librdbg""... $ac_c" 1>&6 -echo "configure:2903: checking for Makefile.in in librdbg" >&5 +echo "configure:2921: checking for Makefile.in in librdbg" >&5 if test -d $srcdir/librdbg; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2917,10 +2935,10 @@ fi fi # If the C++ support is enabled, then include the Makefiles -if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then +if test "$HAS_CPLUSPLUS" = "yes"; then echo $ac_n "checking for Makefile.in in librtems++""... $ac_c" 1>&6 -echo "configure:2924: checking for Makefile.in in librtems++" >&5 +echo "configure:2942: checking for Makefile.in in librtems++" >&5 if test -d $srcdir/librtems++; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2951,13 +2969,13 @@ fi if test "$RTEMS_HAS_HWAPI" = "yes"; then echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6 -echo "configure:2955: checking whether libwapi is present" >&5 +echo "configure:2973: checking whether libwapi is present" >&5 if test -f ${srcdir}/libhwapi/Makefile.in ; then echo "$ac_t""yes" 1>&6 makefiles="$makefiles libhwapi/Makefile" echo $ac_n "checking for Makefile.in in libhwapi/analog""... $ac_c" 1>&6 -echo "configure:2961: checking for Makefile.in in libhwapi/analog" >&5 +echo "configure:2979: checking for Makefile.in in libhwapi/analog" >&5 if test -d $srcdir/libhwapi/analog; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2972,7 +2990,7 @@ fi echo $ac_n "checking for Makefile.in in libhwapi/discrete""... $ac_c" 1>&6 -echo "configure:2976: checking for Makefile.in in libhwapi/discrete" >&5 +echo "configure:2994: checking for Makefile.in in libhwapi/discrete" >&5 if test -d $srcdir/libhwapi/discrete; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -2987,7 +3005,7 @@ fi echo $ac_n "checking for Makefile.in in libhwapi/drivers""... $ac_c" 1>&6 -echo "configure:2991: checking for Makefile.in in libhwapi/drivers" >&5 +echo "configure:3009: checking for Makefile.in in libhwapi/drivers" >&5 if test -d $srcdir/libhwapi/drivers; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3002,7 +3020,7 @@ fi echo $ac_n "checking for Makefile.in in libhwapi/non_volatile_memory""... $ac_c" 1>&6 -echo "configure:3006: checking for Makefile.in in libhwapi/non_volatile_memory" >&5 +echo "configure:3024: checking for Makefile.in in libhwapi/non_volatile_memory" >&5 if test -d $srcdir/libhwapi/non_volatile_memory; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3017,7 +3035,7 @@ fi echo $ac_n "checking for Makefile.in in libhwapi/serial""... $ac_c" 1>&6 -echo "configure:3021: checking for Makefile.in in libhwapi/serial" >&5 +echo "configure:3039: checking for Makefile.in in libhwapi/serial" >&5 if test -d $srcdir/libhwapi/serial; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3032,7 +3050,7 @@ fi echo $ac_n "checking for Makefile.in in libhwapi/support""... $ac_c" 1>&6 -echo "configure:3036: checking for Makefile.in in libhwapi/support" >&5 +echo "configure:3054: checking for Makefile.in in libhwapi/support" >&5 if test -d $srcdir/libhwapi/support; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3047,7 +3065,7 @@ fi echo $ac_n "checking for Makefile.in in libhwapi/wrapup""... $ac_c" 1>&6 -echo "configure:3051: checking for Makefile.in in libhwapi/wrapup" >&5 +echo "configure:3069: checking for Makefile.in in libhwapi/wrapup" >&5 if test -d $srcdir/libhwapi/wrapup; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3073,9 +3091,11 @@ fi # pick up all the Makefiles in required parts of the tree +if test "$RTEMS_CPU" != "unix"; then +## HACK: Suppress libchip for unix echo $ac_n "checking for Makefile.in in libchip""... $ac_c" 1>&6 -echo "configure:3079: checking for Makefile.in in libchip" >&5 +echo "configure:3099: checking for Makefile.in in libchip" >&5 if test -d $srcdir/libchip; then rtems_av_save_dir=`pwd`; cd $srcdir; @@ -3088,9 +3108,11 @@ else fi +fi + echo $ac_n "checking for Makefile.in in libmisc""... $ac_c" 1>&6 -echo "configure:3094: checking for Makefile.in in libmisc" >&5 +echo "configure:3116: checking for Makefile.in in libmisc" >&5 if test -d $srcdir/libmisc; then rtems_av_save_dir=`pwd`; cd $srcdir; diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in index 6cd565b60e..69eafaf21c 100644 --- a/c/src/lib/configure.in +++ b/c/src/lib/configure.in @@ -100,6 +100,10 @@ fi if test "$HAS_MP" = "yes"; then makefiles="$makefiles libbsp/shmdr/Makefile" +else + # HACK: sed out shmsupp/Makefile from makefiles + t="libbsp/$bspcpudir$bspdir/shmsupp" + makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"` fi AM_CONDITIONAL(UNIX,test "$RTEMS_CPU" = "unix") @@ -118,13 +122,11 @@ changequote([,])dnl esac # If the TCP/IP stack is enabled, then find all TCP/IP Makefiles -AC_MSG_CHECKING([if networking is enabled? ]) -AC_MSG_RESULT($RTEMS_HAS_NETWORKING) -if test "$RTEMS_HAS_NETWORKING" = "yes"; then +if test "$HAS_NETWORKING" = "yes"; then RTEMS_CHECK_MAKEFILE(libnetworking) RTEMS_CHECK_MAKEFILE(librpc) - if test "$RTEMS_HAS_RDBG" = "yes"; then + if test "$HAS_RDBG" = "yes"; then RTEMS_CHECK_RDBG(RTEMS_BSP) if test "$HAS_RDBG" = "yes"; then @@ -144,7 +146,7 @@ if test "$RTEMS_HAS_NETWORKING" = "yes"; then fi # If the C++ support is enabled, then include the Makefiles -if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then +if test "$HAS_CPLUSPLUS" = "yes"; then RTEMS_CHECK_MAKEFILE(librtems++) fi @@ -175,7 +177,11 @@ AC_SUBST(CC_CFLAGS_PROFILE_V) AC_SUBST(CC_LDFLAGS_PROFILE_V) # pick up all the Makefiles in required parts of the tree +if test "$RTEMS_CPU" != "unix"; then +## HACK: Suppress libchip for unix RTEMS_CHECK_MAKEFILE(libchip) +fi + RTEMS_CHECK_MAKEFILE(libmisc) AC_CONFIG_SUBDIRS($bsptools_cfgdirs) 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"; diff --git a/c/src/tests/Makefile.in b/c/src/tests/Makefile.in index b855c754b1..da16188226 100644 --- a/c/src/tests/Makefile.in +++ b/c/src/tests/Makefile.in @@ -101,7 +101,7 @@ VERSION = @VERSION@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = support @subdirs@ +SUBDIRS = @subdirs@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs CONFIG_CLEAN_FILES = -- cgit v1.2.3