Changeset 01be59d in rtems


Ignore:
Timestamp:
Aug 10, 1999, 3:08:58 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
908436c1
Parents:
e1929ce
Message:

Patch from Ralf Corsepius <corsepiu@…> to correct a minor
problem with the HAS_MP patch and regenerated files.

Location:
c/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/aclocal.m4

    re1929ce r01be59d  
    931931AC_REQUIRE([RTEMS_CHECK_CPU])dnl
    932932AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl
    933 AC_CACHE_VAL(rtems_cv_HAS_CPLUSPLUS,
    934   [dnl
    935     if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     933AC_CACHE_CHECK([whether to build rtems++],
     934  rtems_cv_HAS_CPLUSPLUS,
     935  [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    936936      if test -n "$CXX_FOR_TARGET"; then
    937         rtems_cv_HAS_CPLUSPLUS="yes";
     937        rtems_cv_HAS_CPLUSPLUS="yes"
    938938      else
    939         rtems_cv_HAS_CPLUSPLUS="no";
     939        rtems_cv_HAS_CPLUSPLUS="no"
    940940      fi
    941941    else
    942       rtems_cv_HAS_CPLUSPLUS="no";
    943     fi
    944   ])dnl
     942      rtems_cv_HAS_CPLUSPLUS="no"
     943    fi])
    945944HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
    946945AC_SUBST(HAS_CPLUSPLUS)dnl
     
    952951[dnl
    953952AC_REQUIRE([RTEMS_CHECK_CPU])dnl
    954 AC_CACHE_VAL(rtems_cv_HAS_NETWORKING,
     953AC_CACHE_CHECK([whether BSP supports networking],
     954  rtems_cv_HAS_NETWORKING,
    955955  [dnl
    956     if test "$RTEMS_HAS_NETWORKING" = "yes"; then
    957       rtems_cv_HAS_NETWORKING="yes";
    958     else
    959       rtems_cv_HAS_NETWORKING="no";
    960     fi
    961   ])dnl
    962 HAS_NETWORKING="$rtems_cv_HAS_NETWORKING";
     956    case "$RTEMS_CPU" in
     957    unix*)
     958      rtems_cv_HAS_NETWORKING="no"
     959      ;;
     960    *)
     961      if test "${RTEMS_HAS_NETWORKING}" = "yes"; then
     962        rtems_cv_HAS_NETWORKING="yes";
     963      else
     964        rtems_cv_HAS_NETWORKING="disabled";
     965      fi
     966      ;;
     967    esac])
     968if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
     969  HAS_NETWORKING="yes";
     970else
     971  HAS_NETWORKING="no";
     972fi
    963973AC_SUBST(HAS_NETWORKING)dnl
    964974])
  • c/src/lib/configure

    re1929ce r01be59d  
    26112611
    26122612
     2613echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6
     2614echo "configure:2615: checking whether to build rtems++" >&5
    26132615if eval "test \"`echo '$''{'rtems_cv_HAS_CPLUSPLUS'+set}'`\" = set"; then
    26142616  echo $ac_n "(cached) $ac_c" 1>&6
    26152617else
    2616       if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     2618   if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    26172619      if test -n "$CXX_FOR_TARGET"; then
    2618         rtems_cv_HAS_CPLUSPLUS="yes";
     2620        rtems_cv_HAS_CPLUSPLUS="yes"
    26192621      else
    2620         rtems_cv_HAS_CPLUSPLUS="no";
     2622        rtems_cv_HAS_CPLUSPLUS="no"
    26212623      fi
    26222624    else
    2623       rtems_cv_HAS_CPLUSPLUS="no";
    2624     fi
    2625  
    2626 fi
     2625      rtems_cv_HAS_CPLUSPLUS="no"
     2626    fi
     2627fi
     2628
     2629echo "$ac_t""$rtems_cv_HAS_CPLUSPLUS" 1>&6
    26272630HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
    26282631
     2632echo $ac_n "checking whether BSP supports networking""... $ac_c" 1>&6
     2633echo "configure:2634: checking whether BSP supports networking" >&5
    26292634if eval "test \"`echo '$''{'rtems_cv_HAS_NETWORKING'+set}'`\" = set"; then
    26302635  echo $ac_n "(cached) $ac_c" 1>&6
    26312636else
    2632       if test "$RTEMS_HAS_NETWORKING" = "yes"; then
    2633       rtems_cv_HAS_NETWORKING="yes";
    2634     else
    2635       rtems_cv_HAS_NETWORKING="no";
    2636     fi
    2637  
    2638 fi
    2639 HAS_NETWORKING="$rtems_cv_HAS_NETWORKING";
     2637      case "$RTEMS_CPU" in
     2638    unix*)
     2639      rtems_cv_HAS_NETWORKING="no"
     2640      ;;
     2641    *)
     2642      if test "${RTEMS_HAS_NETWORKING}" = "yes"; then
     2643        rtems_cv_HAS_NETWORKING="yes";
     2644      else
     2645        rtems_cv_HAS_NETWORKING="disabled";
     2646      fi
     2647      ;;
     2648    esac
     2649fi
     2650
     2651echo "$ac_t""$rtems_cv_HAS_NETWORKING" 1>&6
     2652if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
     2653  HAS_NETWORKING="yes";
     2654else
     2655  HAS_NETWORKING="no";
     2656fi
    26402657
    26412658
     
    26792696 
    26802697echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}$bspdir""... $ac_c" 1>&6
    2681 echo "configure:2682: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
     2698echo "configure:2699: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
    26822699if test -d $srcdir/libbsp/${bspcpudir}$bspdir; then
    26832700  rtems_av_save_dir=`pwd`;
     
    26942711 
    26952712echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}shared""... $ac_c" 1>&6
    2696 echo "configure:2697: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
     2713echo "configure:2714: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
    26972714if test -d $srcdir/libbsp/${bspcpudir}shared; then
    26982715  rtems_av_save_dir=`pwd`;
     
    27202737if test "$HAS_MP" = "yes"; then
    27212738  makefiles="$makefiles libbsp/shmdr/Makefile"
     2739else
     2740  # HACK: sed out shmsupp/Makefile from makefiles
     2741  t="libbsp/$bspcpudir$bspdir/shmsupp"
     2742  makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
    27222743fi
    27232744
     
    27342755
    27352756echo $ac_n "checking for Makefile.in in libcpu/$RTEMS_CPU""... $ac_c" 1>&6
    2736 echo "configure:2737: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
     2757echo "configure:2758: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
    27372758if test -d $srcdir/libcpu/$RTEMS_CPU; then
    27382759  rtems_av_save_dir=`pwd`;
     
    27542775   
    27552776echo $ac_n "checking for Makefile.in in start/$RTEMS_CPU""... $ac_c" 1>&6
    2756 echo "configure:2757: checking for Makefile.in in start/$RTEMS_CPU" >&5
     2777echo "configure:2778: checking for Makefile.in in start/$RTEMS_CPU" >&5
    27572778if test -d $srcdir/start/$RTEMS_CPU; then
    27582779  rtems_av_save_dir=`pwd`;
     
    27712792
    27722793# If the TCP/IP stack is enabled, then find all TCP/IP Makefiles
    2773 echo $ac_n "checking if networking is enabled? ""... $ac_c" 1>&6
    2774 echo "configure:2775: checking if networking is enabled? " >&5
    2775 echo "$ac_t""$RTEMS_HAS_NETWORKING" 1>&6
    2776 if test "$RTEMS_HAS_NETWORKING" = "yes"; then
     2794if test "$HAS_NETWORKING" = "yes"; then
    27772795 
    27782796echo $ac_n "checking for Makefile.in in libnetworking""... $ac_c" 1>&6
    2779 echo "configure:2780: checking for Makefile.in in libnetworking" >&5
     2797echo "configure:2798: checking for Makefile.in in libnetworking" >&5
    27802798if test -d $srcdir/libnetworking; then
    27812799  rtems_av_save_dir=`pwd`;
     
    27922810 
    27932811echo $ac_n "checking for Makefile.in in librpc""... $ac_c" 1>&6
    2794 echo "configure:2795: checking for Makefile.in in librpc" >&5
     2812echo "configure:2813: checking for Makefile.in in librpc" >&5
    27952813if test -d $srcdir/librpc; then
    27962814  rtems_av_save_dir=`pwd`;
     
    28062824
    28072825
    2808   if test "$RTEMS_HAS_RDBG" = "yes"; then
     2826  if test "$HAS_RDBG" = "yes"; then
    28092827    echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
    2810 echo "configure:2811: checking whether BSP supports librdbg" >&5
     2828echo "configure:2829: checking whether BSP supports librdbg" >&5
    28112829if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then
    28122830  echo $ac_n "(cached) $ac_c" 1>&6
     
    28302848set dummy rpcgen; ac_word=$2
    28312849echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    2832 echo "configure:2833: checking for $ac_word" >&5
     2850echo "configure:2851: checking for $ac_word" >&5
    28332851if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then
    28342852  echo $ac_n "(cached) $ac_c" 1>&6
     
    28612879set dummy $ac_prog; ac_word=$2
    28622880echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    2863 echo "configure:2864: checking for $ac_word" >&5
     2881echo "configure:2882: checking for $ac_word" >&5
    28642882if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
    28652883  echo $ac_n "(cached) $ac_c" 1>&6
     
    29002918     
    29012919echo $ac_n "checking for Makefile.in in librdbg""... $ac_c" 1>&6
    2902 echo "configure:2903: checking for Makefile.in in librdbg" >&5
     2920echo "configure:2921: checking for Makefile.in in librdbg" >&5
    29032921if test -d $srcdir/librdbg; then
    29042922  rtems_av_save_dir=`pwd`;
     
    29182936
    29192937# If the C++ support is enabled, then include the Makefiles
    2920 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     2938if test "$HAS_CPLUSPLUS" = "yes"; then
    29212939 
    29222940echo $ac_n "checking for Makefile.in in librtems++""... $ac_c" 1>&6
    2923 echo "configure:2924: checking for Makefile.in in librtems++" >&5
     2941echo "configure:2942: checking for Makefile.in in librtems++" >&5
    29242942if test -d $srcdir/librtems++; then
    29252943  rtems_av_save_dir=`pwd`;
     
    29522970if test "$RTEMS_HAS_HWAPI" = "yes"; then
    29532971  echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6
    2954 echo "configure:2955: checking whether libwapi is present" >&5
     2972echo "configure:2973: checking whether libwapi is present" >&5
    29552973  if test -f ${srcdir}/libhwapi/Makefile.in ; then
    29562974    echo "$ac_t""yes" 1>&6
     
    29582976   
    29592977echo $ac_n "checking for Makefile.in in libhwapi/analog""... $ac_c" 1>&6
    2960 echo "configure:2961: checking for Makefile.in in libhwapi/analog" >&5
     2978echo "configure:2979: checking for Makefile.in in libhwapi/analog" >&5
    29612979if test -d $srcdir/libhwapi/analog; then
    29622980  rtems_av_save_dir=`pwd`;
     
    29732991   
    29742992echo $ac_n "checking for Makefile.in in libhwapi/discrete""... $ac_c" 1>&6
    2975 echo "configure:2976: checking for Makefile.in in libhwapi/discrete" >&5
     2993echo "configure:2994: checking for Makefile.in in libhwapi/discrete" >&5
    29762994if test -d $srcdir/libhwapi/discrete; then
    29772995  rtems_av_save_dir=`pwd`;
     
    29883006   
    29893007echo $ac_n "checking for Makefile.in in libhwapi/drivers""... $ac_c" 1>&6
    2990 echo "configure:2991: checking for Makefile.in in libhwapi/drivers" >&5
     3008echo "configure:3009: checking for Makefile.in in libhwapi/drivers" >&5
    29913009if test -d $srcdir/libhwapi/drivers; then
    29923010  rtems_av_save_dir=`pwd`;
     
    30033021   
    30043022echo $ac_n "checking for Makefile.in in libhwapi/non_volatile_memory""... $ac_c" 1>&6
    3005 echo "configure:3006: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
     3023echo "configure:3024: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
    30063024if test -d $srcdir/libhwapi/non_volatile_memory; then
    30073025  rtems_av_save_dir=`pwd`;
     
    30183036   
    30193037echo $ac_n "checking for Makefile.in in libhwapi/serial""... $ac_c" 1>&6
    3020 echo "configure:3021: checking for Makefile.in in libhwapi/serial" >&5
     3038echo "configure:3039: checking for Makefile.in in libhwapi/serial" >&5
    30213039if test -d $srcdir/libhwapi/serial; then
    30223040  rtems_av_save_dir=`pwd`;
     
    30333051   
    30343052echo $ac_n "checking for Makefile.in in libhwapi/support""... $ac_c" 1>&6
    3035 echo "configure:3036: checking for Makefile.in in libhwapi/support" >&5
     3053echo "configure:3054: checking for Makefile.in in libhwapi/support" >&5
    30363054if test -d $srcdir/libhwapi/support; then
    30373055  rtems_av_save_dir=`pwd`;
     
    30483066   
    30493067echo $ac_n "checking for Makefile.in in libhwapi/wrapup""... $ac_c" 1>&6
    3050 echo "configure:3051: checking for Makefile.in in libhwapi/wrapup" >&5
     3068echo "configure:3069: checking for Makefile.in in libhwapi/wrapup" >&5
    30513069if test -d $srcdir/libhwapi/wrapup; then
    30523070  rtems_av_save_dir=`pwd`;
     
    30743092
    30753093# pick up all the Makefiles in required parts of the tree
     3094if test "$RTEMS_CPU" != "unix"; then
     3095## HACK: Suppress libchip for unix
    30763096
    30773097echo $ac_n "checking for Makefile.in in libchip""... $ac_c" 1>&6
    3078 echo "configure:3079: checking for Makefile.in in libchip" >&5
     3098echo "configure:3099: checking for Makefile.in in libchip" >&5
    30793099if test -d $srcdir/libchip; then
    30803100  rtems_av_save_dir=`pwd`;
     
    30893109
    30903110
     3111fi
     3112
    30913113
    30923114echo $ac_n "checking for Makefile.in in libmisc""... $ac_c" 1>&6
    3093 echo "configure:3094: checking for Makefile.in in libmisc" >&5
     3115echo "configure:3116: checking for Makefile.in in libmisc" >&5
    30943116if test -d $srcdir/libmisc; then
    30953117  rtems_av_save_dir=`pwd`;
  • c/src/lib/configure.in

    re1929ce r01be59d  
    101101if test "$HAS_MP" = "yes"; then
    102102  makefiles="$makefiles libbsp/shmdr/Makefile"
     103else
     104  # HACK: sed out shmsupp/Makefile from makefiles
     105  t="libbsp/$bspcpudir$bspdir/shmsupp"
     106  makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
    103107fi
    104108
     
    119123
    120124# If the TCP/IP stack is enabled, then find all TCP/IP Makefiles
    121 AC_MSG_CHECKING([if networking is enabled? ])
    122 AC_MSG_RESULT($RTEMS_HAS_NETWORKING)
    123 if test "$RTEMS_HAS_NETWORKING" = "yes"; then
     125if test "$HAS_NETWORKING" = "yes"; then
    124126  RTEMS_CHECK_MAKEFILE(libnetworking)
    125127  RTEMS_CHECK_MAKEFILE(librpc)
    126128
    127   if test "$RTEMS_HAS_RDBG" = "yes"; then
     129  if test "$HAS_RDBG" = "yes"; then
    128130    RTEMS_CHECK_RDBG(RTEMS_BSP)
    129131
     
    145147
    146148# If the C++ support is enabled, then include the Makefiles
    147 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     149if test "$HAS_CPLUSPLUS" = "yes"; then
    148150  RTEMS_CHECK_MAKEFILE(librtems++)
    149151fi
     
    176178
    177179# pick up all the Makefiles in required parts of the tree
     180if test "$RTEMS_CPU" != "unix"; then
     181## HACK: Suppress libchip for unix
    178182RTEMS_CHECK_MAKEFILE(libchip)
     183fi
     184
    179185RTEMS_CHECK_MAKEFILE(libmisc)
    180186
  • c/src/make/aclocal.m4

    re1929ce r01be59d  
    10191019AC_REQUIRE([RTEMS_CHECK_CPU])dnl
    10201020AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl
    1021 AC_CACHE_VAL(rtems_cv_HAS_CPLUSPLUS,
    1022   [dnl
    1023     if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     1021AC_CACHE_CHECK([whether to build rtems++],
     1022  rtems_cv_HAS_CPLUSPLUS,
     1023  [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    10241024      if test -n "$CXX_FOR_TARGET"; then
    1025         rtems_cv_HAS_CPLUSPLUS="yes";
     1025        rtems_cv_HAS_CPLUSPLUS="yes"
    10261026      else
    1027         rtems_cv_HAS_CPLUSPLUS="no";
     1027        rtems_cv_HAS_CPLUSPLUS="no"
    10281028      fi
    10291029    else
    1030       rtems_cv_HAS_CPLUSPLUS="no";
    1031     fi
    1032   ])dnl
     1030      rtems_cv_HAS_CPLUSPLUS="no"
     1031    fi])
    10331032HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
    10341033AC_SUBST(HAS_CPLUSPLUS)dnl
     
    10401039[dnl
    10411040AC_REQUIRE([RTEMS_CHECK_CPU])dnl
    1042 AC_CACHE_VAL(rtems_cv_HAS_NETWORKING,
     1041AC_CACHE_CHECK([whether BSP supports networking],
     1042  rtems_cv_HAS_NETWORKING,
    10431043  [dnl
    1044     if test "$RTEMS_HAS_NETWORKING" = "yes"; then
    1045       rtems_cv_HAS_NETWORKING="yes";
    1046     else
    1047       rtems_cv_HAS_NETWORKING="no";
    1048     fi
    1049   ])dnl
    1050 HAS_NETWORKING="$rtems_cv_HAS_NETWORKING";
     1044    case "$RTEMS_CPU" in
     1045    unix*)
     1046      rtems_cv_HAS_NETWORKING="no"
     1047      ;;
     1048    *)
     1049      if test "${RTEMS_HAS_NETWORKING}" = "yes"; then
     1050        rtems_cv_HAS_NETWORKING="yes";
     1051      else
     1052        rtems_cv_HAS_NETWORKING="disabled";
     1053      fi
     1054      ;;
     1055    esac])
     1056if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
     1057  HAS_NETWORKING="yes";
     1058else
     1059  HAS_NETWORKING="no";
     1060fi
    10511061AC_SUBST(HAS_NETWORKING)dnl
    10521062])
  • c/src/make/configure

    re1929ce r01be59d  
    29982998fi
    29992999
     3000echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6
     3001echo "configure:3002: checking whether to build rtems++" >&5
    30003002if eval "test \"`echo '$''{'rtems_cv_HAS_CPLUSPLUS'+set}'`\" = set"; then
    30013003  echo $ac_n "(cached) $ac_c" 1>&6
    30023004else
    3003       if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
     3005   if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    30043006      if test -n "$CXX_FOR_TARGET"; then
    3005         rtems_cv_HAS_CPLUSPLUS="yes";
     3007        rtems_cv_HAS_CPLUSPLUS="yes"
    30063008      else
    3007         rtems_cv_HAS_CPLUSPLUS="no";
     3009        rtems_cv_HAS_CPLUSPLUS="no"
    30083010      fi
    30093011    else
    3010       rtems_cv_HAS_CPLUSPLUS="no";
    3011     fi
    3012  
    3013 fi
     3012      rtems_cv_HAS_CPLUSPLUS="no"
     3013    fi
     3014fi
     3015
     3016echo "$ac_t""$rtems_cv_HAS_CPLUSPLUS" 1>&6
    30143017HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
    30153018
     3019echo $ac_n "checking whether BSP supports networking""... $ac_c" 1>&6
     3020echo "configure:3021: checking whether BSP supports networking" >&5
    30163021if eval "test \"`echo '$''{'rtems_cv_HAS_NETWORKING'+set}'`\" = set"; then
    30173022  echo $ac_n "(cached) $ac_c" 1>&6
    30183023else
    3019       if test "$RTEMS_HAS_NETWORKING" = "yes"; then
    3020       rtems_cv_HAS_NETWORKING="yes";
    3021     else
    3022       rtems_cv_HAS_NETWORKING="no";
    3023     fi
    3024  
    3025 fi
    3026 HAS_NETWORKING="$rtems_cv_HAS_NETWORKING";
     3024      case "$RTEMS_CPU" in
     3025    unix*)
     3026      rtems_cv_HAS_NETWORKING="no"
     3027      ;;
     3028    *)
     3029      if test "${RTEMS_HAS_NETWORKING}" = "yes"; then
     3030        rtems_cv_HAS_NETWORKING="yes";
     3031      else
     3032        rtems_cv_HAS_NETWORKING="disabled";
     3033      fi
     3034      ;;
     3035    esac
     3036fi
     3037
     3038echo "$ac_t""$rtems_cv_HAS_NETWORKING" 1>&6
     3039if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
     3040  HAS_NETWORKING="yes";
     3041else
     3042  HAS_NETWORKING="no";
     3043fi
    30273044
    30283045
  • c/src/tests/Makefile.in

    re1929ce r01be59d  
    102102ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    103103
    104 SUBDIRS = support @subdirs@
     104SUBDIRS = @subdirs@
    105105ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    106106mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
Note: See TracChangeset for help on using the changeset viewer.