![[RTEMS Logo]](/images/logo.png){kind=logo}
Changeset 01be59d in rtems
- Timestamp:
- Aug 10, 1999, 3:08:58 PM (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, master
- Children:
- 908436c1
- Parents:
- e1929ce
- Location:
- c/src
- Files:
-
- 6 edited
-
lib/aclocal.m4 (modified) (2 diffs)
-
lib/configure (modified) (23 diffs)
-
lib/configure.in (modified) (4 diffs)
-
make/aclocal.m4 (modified) (2 diffs)
-
make/configure (modified) (1 diff)
-
tests/Makefile.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/aclocal.m4
re1929ce r01be59d 931 931 AC_REQUIRE([RTEMS_CHECK_CPU])dnl 932 932 AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl 933 AC_CACHE_ VAL(rtems_cv_HAS_CPLUSPLUS,934 [dnl935 933 AC_CACHE_CHECK([whether to build rtems++], 934 rtems_cv_HAS_CPLUSPLUS, 935 [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then 936 936 if test -n "$CXX_FOR_TARGET"; then 937 rtems_cv_HAS_CPLUSPLUS="yes" ;937 rtems_cv_HAS_CPLUSPLUS="yes" 938 938 else 939 rtems_cv_HAS_CPLUSPLUS="no" ;939 rtems_cv_HAS_CPLUSPLUS="no" 940 940 fi 941 941 else 942 rtems_cv_HAS_CPLUSPLUS="no"; 943 fi 944 ])dnl 942 rtems_cv_HAS_CPLUSPLUS="no" 943 fi]) 945 944 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS"; 946 945 AC_SUBST(HAS_CPLUSPLUS)dnl … … 952 951 [dnl 953 952 AC_REQUIRE([RTEMS_CHECK_CPU])dnl 954 AC_CACHE_VAL(rtems_cv_HAS_NETWORKING, 953 AC_CACHE_CHECK([whether BSP supports networking], 954 rtems_cv_HAS_NETWORKING, 955 955 [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]) 968 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then 969 HAS_NETWORKING="yes"; 970 else 971 HAS_NETWORKING="no"; 972 fi 963 973 AC_SUBST(HAS_NETWORKING)dnl 964 974 ]) -
c/src/lib/configure
re1929ce r01be59d 2611 2611 2612 2612 2613 echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6 2614 echo "configure:2615: checking whether to build rtems++" >&5 2613 2615 if eval "test \"`echo '$''{'rtems_cv_HAS_CPLUSPLUS'+set}'`\" = set"; then 2614 2616 echo $ac_n "(cached) $ac_c" 1>&6 2615 2617 else 2616 2618 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then 2617 2619 if test -n "$CXX_FOR_TARGET"; then 2618 rtems_cv_HAS_CPLUSPLUS="yes" ;2620 rtems_cv_HAS_CPLUSPLUS="yes" 2619 2621 else 2620 rtems_cv_HAS_CPLUSPLUS="no" ;2622 rtems_cv_HAS_CPLUSPLUS="no" 2621 2623 fi 2622 2624 else 2623 rtems_cv_HAS_CPLUSPLUS="no"; 2624 fi 2625 2626 fi 2625 rtems_cv_HAS_CPLUSPLUS="no" 2626 fi 2627 fi 2628 2629 echo "$ac_t""$rtems_cv_HAS_CPLUSPLUS" 1>&6 2627 2630 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS"; 2628 2631 2632 echo $ac_n "checking whether BSP supports networking""... $ac_c" 1>&6 2633 echo "configure:2634: checking whether BSP supports networking" >&5 2629 2634 if eval "test \"`echo '$''{'rtems_cv_HAS_NETWORKING'+set}'`\" = set"; then 2630 2635 echo $ac_n "(cached) $ac_c" 1>&6 2631 2636 else 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 2649 fi 2650 2651 echo "$ac_t""$rtems_cv_HAS_NETWORKING" 1>&6 2652 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then 2653 HAS_NETWORKING="yes"; 2654 else 2655 HAS_NETWORKING="no"; 2656 fi 2640 2657 2641 2658 … … 2679 2696 2680 2697 echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}$bspdir""... $ac_c" 1>&6 2681 echo "configure:26 82: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&52698 echo "configure:2699: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5 2682 2699 if test -d $srcdir/libbsp/${bspcpudir}$bspdir; then 2683 2700 rtems_av_save_dir=`pwd`; … … 2694 2711 2695 2712 echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}shared""... $ac_c" 1>&6 2696 echo "configure:2 697: checking for Makefile.in in libbsp/${bspcpudir}shared" >&52713 echo "configure:2714: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5 2697 2714 if test -d $srcdir/libbsp/${bspcpudir}shared; then 2698 2715 rtems_av_save_dir=`pwd`; … … 2720 2737 if test "$HAS_MP" = "yes"; then 2721 2738 makefiles="$makefiles libbsp/shmdr/Makefile" 2739 else 2740 # HACK: sed out shmsupp/Makefile from makefiles 2741 t="libbsp/$bspcpudir$bspdir/shmsupp" 2742 makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"` 2722 2743 fi 2723 2744 … … 2734 2755 2735 2756 echo $ac_n "checking for Makefile.in in libcpu/$RTEMS_CPU""... $ac_c" 1>&6 2736 echo "configure:27 37: checking for Makefile.in in libcpu/$RTEMS_CPU" >&52757 echo "configure:2758: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5 2737 2758 if test -d $srcdir/libcpu/$RTEMS_CPU; then 2738 2759 rtems_av_save_dir=`pwd`; … … 2754 2775 2755 2776 echo $ac_n "checking for Makefile.in in start/$RTEMS_CPU""... $ac_c" 1>&6 2756 echo "configure:27 57: checking for Makefile.in in start/$RTEMS_CPU" >&52777 echo "configure:2778: checking for Makefile.in in start/$RTEMS_CPU" >&5 2757 2778 if test -d $srcdir/start/$RTEMS_CPU; then 2758 2779 rtems_av_save_dir=`pwd`; … … 2771 2792 2772 2793 # 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 2794 if test "$HAS_NETWORKING" = "yes"; then 2777 2795 2778 2796 echo $ac_n "checking for Makefile.in in libnetworking""... $ac_c" 1>&6 2779 echo "configure:27 80: checking for Makefile.in in libnetworking" >&52797 echo "configure:2798: checking for Makefile.in in libnetworking" >&5 2780 2798 if test -d $srcdir/libnetworking; then 2781 2799 rtems_av_save_dir=`pwd`; … … 2792 2810 2793 2811 echo $ac_n "checking for Makefile.in in librpc""... $ac_c" 1>&6 2794 echo "configure:2 795: checking for Makefile.in in librpc" >&52812 echo "configure:2813: checking for Makefile.in in librpc" >&5 2795 2813 if test -d $srcdir/librpc; then 2796 2814 rtems_av_save_dir=`pwd`; … … 2806 2824 2807 2825 2808 if test "$ RTEMS_HAS_RDBG" = "yes"; then2826 if test "$HAS_RDBG" = "yes"; then 2809 2827 echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6 2810 echo "configure:28 11: checking whether BSP supports librdbg" >&52828 echo "configure:2829: checking whether BSP supports librdbg" >&5 2811 2829 if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then 2812 2830 echo $ac_n "(cached) $ac_c" 1>&6 … … 2830 2848 set dummy rpcgen; ac_word=$2 2831 2849 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 2832 echo "configure:28 33: checking for $ac_word" >&52850 echo "configure:2851: checking for $ac_word" >&5 2833 2851 if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then 2834 2852 echo $ac_n "(cached) $ac_c" 1>&6 … … 2861 2879 set dummy $ac_prog; ac_word=$2 2862 2880 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 2863 echo "configure:28 64: checking for $ac_word" >&52881 echo "configure:2882: checking for $ac_word" >&5 2864 2882 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then 2865 2883 echo $ac_n "(cached) $ac_c" 1>&6 … … 2900 2918 2901 2919 echo $ac_n "checking for Makefile.in in librdbg""... $ac_c" 1>&6 2902 echo "configure:29 03: checking for Makefile.in in librdbg" >&52920 echo "configure:2921: checking for Makefile.in in librdbg" >&5 2903 2921 if test -d $srcdir/librdbg; then 2904 2922 rtems_av_save_dir=`pwd`; … … 2918 2936 2919 2937 # If the C++ support is enabled, then include the Makefiles 2920 if test "$ RTEMS_HAS_CPLUSPLUS" = "yes"; then2938 if test "$HAS_CPLUSPLUS" = "yes"; then 2921 2939 2922 2940 echo $ac_n "checking for Makefile.in in librtems++""... $ac_c" 1>&6 2923 echo "configure:29 24: checking for Makefile.in in librtems++" >&52941 echo "configure:2942: checking for Makefile.in in librtems++" >&5 2924 2942 if test -d $srcdir/librtems++; then 2925 2943 rtems_av_save_dir=`pwd`; … … 2952 2970 if test "$RTEMS_HAS_HWAPI" = "yes"; then 2953 2971 echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6 2954 echo "configure:29 55: checking whether libwapi is present" >&52972 echo "configure:2973: checking whether libwapi is present" >&5 2955 2973 if test -f ${srcdir}/libhwapi/Makefile.in ; then 2956 2974 echo "$ac_t""yes" 1>&6 … … 2958 2976 2959 2977 echo $ac_n "checking for Makefile.in in libhwapi/analog""... $ac_c" 1>&6 2960 echo "configure:29 61: checking for Makefile.in in libhwapi/analog" >&52978 echo "configure:2979: checking for Makefile.in in libhwapi/analog" >&5 2961 2979 if test -d $srcdir/libhwapi/analog; then 2962 2980 rtems_av_save_dir=`pwd`; … … 2973 2991 2974 2992 echo $ac_n "checking for Makefile.in in libhwapi/discrete""... $ac_c" 1>&6 2975 echo "configure:29 76: checking for Makefile.in in libhwapi/discrete" >&52993 echo "configure:2994: checking for Makefile.in in libhwapi/discrete" >&5 2976 2994 if test -d $srcdir/libhwapi/discrete; then 2977 2995 rtems_av_save_dir=`pwd`; … … 2988 3006 2989 3007 echo $ac_n "checking for Makefile.in in libhwapi/drivers""... $ac_c" 1>&6 2990 echo "configure: 2991: checking for Makefile.in in libhwapi/drivers" >&53008 echo "configure:3009: checking for Makefile.in in libhwapi/drivers" >&5 2991 3009 if test -d $srcdir/libhwapi/drivers; then 2992 3010 rtems_av_save_dir=`pwd`; … … 3003 3021 3004 3022 echo $ac_n "checking for Makefile.in in libhwapi/non_volatile_memory""... $ac_c" 1>&6 3005 echo "configure:30 06: checking for Makefile.in in libhwapi/non_volatile_memory" >&53023 echo "configure:3024: checking for Makefile.in in libhwapi/non_volatile_memory" >&5 3006 3024 if test -d $srcdir/libhwapi/non_volatile_memory; then 3007 3025 rtems_av_save_dir=`pwd`; … … 3018 3036 3019 3037 echo $ac_n "checking for Makefile.in in libhwapi/serial""... $ac_c" 1>&6 3020 echo "configure:30 21: checking for Makefile.in in libhwapi/serial" >&53038 echo "configure:3039: checking for Makefile.in in libhwapi/serial" >&5 3021 3039 if test -d $srcdir/libhwapi/serial; then 3022 3040 rtems_av_save_dir=`pwd`; … … 3033 3051 3034 3052 echo $ac_n "checking for Makefile.in in libhwapi/support""... $ac_c" 1>&6 3035 echo "configure:30 36: checking for Makefile.in in libhwapi/support" >&53053 echo "configure:3054: checking for Makefile.in in libhwapi/support" >&5 3036 3054 if test -d $srcdir/libhwapi/support; then 3037 3055 rtems_av_save_dir=`pwd`; … … 3048 3066 3049 3067 echo $ac_n "checking for Makefile.in in libhwapi/wrapup""... $ac_c" 1>&6 3050 echo "configure:30 51: checking for Makefile.in in libhwapi/wrapup" >&53068 echo "configure:3069: checking for Makefile.in in libhwapi/wrapup" >&5 3051 3069 if test -d $srcdir/libhwapi/wrapup; then 3052 3070 rtems_av_save_dir=`pwd`; … … 3074 3092 3075 3093 # pick up all the Makefiles in required parts of the tree 3094 if test "$RTEMS_CPU" != "unix"; then 3095 ## HACK: Suppress libchip for unix 3076 3096 3077 3097 echo $ac_n "checking for Makefile.in in libchip""... $ac_c" 1>&6 3078 echo "configure:30 79: checking for Makefile.in in libchip" >&53098 echo "configure:3099: checking for Makefile.in in libchip" >&5 3079 3099 if test -d $srcdir/libchip; then 3080 3100 rtems_av_save_dir=`pwd`; … … 3089 3109 3090 3110 3111 fi 3112 3091 3113 3092 3114 echo $ac_n "checking for Makefile.in in libmisc""... $ac_c" 1>&6 3093 echo "configure:3 094: checking for Makefile.in in libmisc" >&53115 echo "configure:3116: checking for Makefile.in in libmisc" >&5 3094 3116 if test -d $srcdir/libmisc; then 3095 3117 rtems_av_save_dir=`pwd`; -
c/src/lib/configure.in
re1929ce r01be59d 101 101 if test "$HAS_MP" = "yes"; then 102 102 makefiles="$makefiles libbsp/shmdr/Makefile" 103 else 104 # HACK: sed out shmsupp/Makefile from makefiles 105 t="libbsp/$bspcpudir$bspdir/shmsupp" 106 makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"` 103 107 fi 104 108 … … 119 123 120 124 # 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 125 if test "$HAS_NETWORKING" = "yes"; then 124 126 RTEMS_CHECK_MAKEFILE(libnetworking) 125 127 RTEMS_CHECK_MAKEFILE(librpc) 126 128 127 if test "$ RTEMS_HAS_RDBG" = "yes"; then129 if test "$HAS_RDBG" = "yes"; then 128 130 RTEMS_CHECK_RDBG(RTEMS_BSP) 129 131 … … 145 147 146 148 # If the C++ support is enabled, then include the Makefiles 147 if test "$ RTEMS_HAS_CPLUSPLUS" = "yes"; then149 if test "$HAS_CPLUSPLUS" = "yes"; then 148 150 RTEMS_CHECK_MAKEFILE(librtems++) 149 151 fi … … 176 178 177 179 # pick up all the Makefiles in required parts of the tree 180 if test "$RTEMS_CPU" != "unix"; then 181 ## HACK: Suppress libchip for unix 178 182 RTEMS_CHECK_MAKEFILE(libchip) 183 fi 184 179 185 RTEMS_CHECK_MAKEFILE(libmisc) 180 186 -
c/src/make/aclocal.m4
re1929ce r01be59d 1019 1019 AC_REQUIRE([RTEMS_CHECK_CPU])dnl 1020 1020 AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl 1021 AC_CACHE_ VAL(rtems_cv_HAS_CPLUSPLUS,1022 [dnl1023 1021 AC_CACHE_CHECK([whether to build rtems++], 1022 rtems_cv_HAS_CPLUSPLUS, 1023 [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then 1024 1024 if test -n "$CXX_FOR_TARGET"; then 1025 rtems_cv_HAS_CPLUSPLUS="yes" ;1025 rtems_cv_HAS_CPLUSPLUS="yes" 1026 1026 else 1027 rtems_cv_HAS_CPLUSPLUS="no" ;1027 rtems_cv_HAS_CPLUSPLUS="no" 1028 1028 fi 1029 1029 else 1030 rtems_cv_HAS_CPLUSPLUS="no"; 1031 fi 1032 ])dnl 1030 rtems_cv_HAS_CPLUSPLUS="no" 1031 fi]) 1033 1032 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS"; 1034 1033 AC_SUBST(HAS_CPLUSPLUS)dnl … … 1040 1039 [dnl 1041 1040 AC_REQUIRE([RTEMS_CHECK_CPU])dnl 1042 AC_CACHE_VAL(rtems_cv_HAS_NETWORKING, 1041 AC_CACHE_CHECK([whether BSP supports networking], 1042 rtems_cv_HAS_NETWORKING, 1043 1043 [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]) 1056 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then 1057 HAS_NETWORKING="yes"; 1058 else 1059 HAS_NETWORKING="no"; 1060 fi 1051 1061 AC_SUBST(HAS_NETWORKING)dnl 1052 1062 ]) -
c/src/make/configure
re1929ce r01be59d 2998 2998 fi 2999 2999 3000 echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6 3001 echo "configure:3002: checking whether to build rtems++" >&5 3000 3002 if eval "test \"`echo '$''{'rtems_cv_HAS_CPLUSPLUS'+set}'`\" = set"; then 3001 3003 echo $ac_n "(cached) $ac_c" 1>&6 3002 3004 else 3003 3005 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then 3004 3006 if test -n "$CXX_FOR_TARGET"; then 3005 rtems_cv_HAS_CPLUSPLUS="yes" ;3007 rtems_cv_HAS_CPLUSPLUS="yes" 3006 3008 else 3007 rtems_cv_HAS_CPLUSPLUS="no" ;3009 rtems_cv_HAS_CPLUSPLUS="no" 3008 3010 fi 3009 3011 else 3010 rtems_cv_HAS_CPLUSPLUS="no"; 3011 fi 3012 3013 fi 3012 rtems_cv_HAS_CPLUSPLUS="no" 3013 fi 3014 fi 3015 3016 echo "$ac_t""$rtems_cv_HAS_CPLUSPLUS" 1>&6 3014 3017 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS"; 3015 3018 3019 echo $ac_n "checking whether BSP supports networking""... $ac_c" 1>&6 3020 echo "configure:3021: checking whether BSP supports networking" >&5 3016 3021 if eval "test \"`echo '$''{'rtems_cv_HAS_NETWORKING'+set}'`\" = set"; then 3017 3022 echo $ac_n "(cached) $ac_c" 1>&6 3018 3023 else 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 3036 fi 3037 3038 echo "$ac_t""$rtems_cv_HAS_NETWORKING" 1>&6 3039 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then 3040 HAS_NETWORKING="yes"; 3041 else 3042 HAS_NETWORKING="no"; 3043 fi 3027 3044 3028 3045 -
c/src/tests/Makefile.in
re1929ce r01be59d 102 102 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal 103 103 104 SUBDIRS = support@subdirs@104 SUBDIRS = @subdirs@ 105 105 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 106 106 mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
Note: See TracChangeset
for help on using the changeset viewer.
