Patch rtems-rc-19990709-6-diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

applied.  This modified many Makefiles and custom files and makes many more
settings (network, multiprocessing, etc) gnerated by autoconf.

13 files changed, 171 insertions, 64 deletions

diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am
index 29ec3234bc..ee14822cdc 100644
--- a/c/src/make/Makefile.am
+++ b/c/src/make/Makefile.am
@@ -34,11 +34,6 @@ if MAINTAINER_MODE
 $(srcdir)/main.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/main.cfg
 	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@
 
-$(srcdir)/Makefile.inc.in: $(top_srcdir)/@RTEMS_TOPdir@/make/Templates/Makefile.inc.in
-	echo "RTEMS_BSP = @""RTEMS_BSP@" > $@
-	echo "" >> $@
-	cat $< >> $@
-
 $(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in
 	cp $< $@
 
diff --git a/c/src/make/Makefile.in b/c/src/make/Makefile.in
index ea4ff45c1b..e3f5dfc04e 100644
--- a/c/src/make/Makefile.in
+++ b/c/src/make/Makefile.in
@@ -87,7 +87,10 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_CPLUSPLUS = @HAS_CPLUSPLUS@
 HAS_MP = @HAS_MP@
+HAS_NETWORKING = @HAS_NETWORKING@
+HAS_POSIX_API = @HAS_POSIX_API@
 HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
@@ -481,11 +484,6 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 @MAINTAINER_MODE_TRUE@$(srcdir)/main.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/main.cfg
 @MAINTAINER_MODE_TRUE@	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@
 
-@MAINTAINER_MODE_TRUE@$(srcdir)/Makefile.inc.in: $(top_srcdir)/@RTEMS_TOPdir@/make/Templates/Makefile.inc.in
-@MAINTAINER_MODE_TRUE@	echo "RTEMS_BSP = @""RTEMS_BSP@" > $@
-@MAINTAINER_MODE_TRUE@	echo "" >> $@
-@MAINTAINER_MODE_TRUE@	cat $< >> $@
-
 @MAINTAINER_MODE_TRUE@$(srcdir)/host.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/host.cfg.in
 @MAINTAINER_MODE_TRUE@	cp $< $@
 
diff --git a/c/src/make/Makefile.inc.in b/c/src/make/Makefile.inc.in
index a908cb18bf..029e5f6768 100644
--- a/c/src/make/Makefile.inc.in
+++ b/c/src/make/Makefile.inc.in
@@ -1,19 +1,16 @@
-RTEMS_BSP = @RTEMS_BSP@
-
-#
 #
-# Target specific settings. To be included in application Makefiles.
+# BSP specific settings. To be included in application Makefiles
 #
 
 prefix = @prefix@
 
-CC_FOR_TARGET = @program_prefix@gcc
-AS_FOR_TARGET = @program_prefix@as
-AR_FOR_TARGET = @program_prefix@ar
-NM_FOR_TARGET = @program_prefix@nm
-LD_FOR_TARGET = @program_prefix@ld
-SIZE_FOR_TARGET = @program_prefix@size
-OBJCOPY_FOR_TARGET = @program_prefix@objcopy
+CC_FOR_TARGET = @CC_FOR_TARGET@
+AS_FOR_TARGET = @AS_FOR_TARGET@
+AR_FOR_TARGET = @AR_FOR_TARGET@
+NM_FOR_TARGET = @NM_FOR_TARGET@
+LD_FOR_TARGET = @LD_FOR_TARGET@
+SIZE_FOR_TARGET = @SIZE_FOR_TARGET@
+OBJCOPY_FOR_TARGET = @OBJCOPY_FOR_TARGET@
 
 CC= $(CC_FOR_TARGET)
 AS= $(AS_FOR_TARGET)
diff --git a/c/src/make/Templates/Makefile.in b/c/src/make/Templates/Makefile.in
index a3b12bbb0a..3febd9af58 100644
--- a/c/src/make/Templates/Makefile.in
+++ b/c/src/make/Templates/Makefile.in
@@ -86,7 +86,10 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_CPLUSPLUS = @HAS_CPLUSPLUS@
 HAS_MP = @HAS_MP@
+HAS_NETWORKING = @HAS_NETWORKING@
+HAS_POSIX_API = @HAS_POSIX_API@
 HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
diff --git a/c/src/make/aclocal.m4 b/c/src/make/aclocal.m4
index 43a52a9020..21cd0b71bd 100644
--- a/c/src/make/aclocal.m4
+++ b/c/src/make/aclocal.m4
@@ -937,7 +937,9 @@ else
 fi
 ])dnl
 
+dnl
 dnl $Id$
+dnl
 
 AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
 [dnl
@@ -954,8 +956,7 @@ AC_CACHE_CHECK([whether BSP supports multiprocessing],
       fi
     else
       rtems_cv_HAS_MP="no";
-    fi
-  ])
+    fi])
 if test "$rtems_cv_HAS_MP" = "yes"; then
 HAS_MP="yes"
 else
@@ -964,6 +965,8 @@ fi
 AC_SUBST(HAS_MP)
 ])
 
+dnl $Id$
+dnl
 AC_DEFUN(RTEMS_CHECK_RDBG,
 [dnl
 AC_REQUIRE([RTEMS_TOP])dnl
@@ -981,3 +984,70 @@ HAS_RDBG="$rtems_cv_HAS_RDBG"
 AC_SUBST(HAS_RDBG)
 ])
 
+dnl $Id$
+dnl
+AC_DEFUN(RTEMS_CHECK_POSIX_API,
+[dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_CACHE_CHECK([whether BSP supports libposix],
+  rtems_cv_HAS_POSIX_API,
+  [dnl
+    case "$RTEMS_CPU" in
+    unix*)
+      rtems_cv_HAS_POSIX_API="no"
+      ;;
+    *)
+      if test "${RTEMS_HAS_POSIX_API}" = "yes"; then
+        rtems_cv_HAS_POSIX_API="yes";
+      else
+        rtems_cv_HAS_POSIX_API="disabled";
+      fi
+      ;;
+    esac])
+if test "$rtems_cv_HAS_POSIX_API" = "yes"; then
+  HAS_POSIX_API="yes";
+else
+  HAS_POSIX_API="no";
+fi
+AC_SUBST(HAS_POSIX_API)dnl
+])
+
+dnl $Id$
+dnl
+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
+      if test -n "$CXX_FOR_TARGET"; then
+        rtems_cv_HAS_CPLUSPLUS="yes";
+      else
+        rtems_cv_HAS_CPLUSPLUS="no";
+      fi
+    else
+      rtems_cv_HAS_CPLUSPLUS="no";
+    fi
+  ])dnl
+HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
+AC_SUBST(HAS_CPLUSPLUS)dnl
+])
+
+dnl $Id$
+dnl
+AC_DEFUN(RTEMS_CHECK_NETWORKING,
+[dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_CACHE_VAL(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";
+AC_SUBST(HAS_NETWORKING)dnl
+])
+
diff --git a/c/src/make/bsp.cfg.in b/c/src/make/bsp.cfg.in
index f2acdebb4c..356dd72c20 100644
--- a/c/src/make/bsp.cfg.in
+++ b/c/src/make/bsp.cfg.in
@@ -1,3 +1,5 @@
+## BSP configuration flags for BSP "@RTEMS_BSP@"
+
 ##
 ## Does this BSP support multiprocessing ?
 ##
@@ -7,3 +9,18 @@ HAS_MP = @HAS_MP@
 ## Does this BSP support RTEMS's remote debugger ?
 ##
 HAS_RDBG = @HAS_RDBG@
+
+##
+## Does this BSP support RTEMS's posix API ?
+##
+HAS_POSIX_API = @HAS_POSIX_API@
+
+##
+## Does this BSP support RTEMS's CXX API ?
+##
+HAS_CPLUSPLUS = @HAS_CPLUSPLUS@
+
+##
+## Does this BSP support RTEMS's networking ?
+##
+HAS_NETWORKING = @HAS_NETWORKING@
diff --git a/c/src/make/compilers/Makefile.in b/c/src/make/compilers/Makefile.in
index d488642e79..6a737104bd 100644
--- a/c/src/make/compilers/Makefile.in
+++ b/c/src/make/compilers/Makefile.in
@@ -86,7 +86,10 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_CPLUSPLUS = @HAS_CPLUSPLUS@
 HAS_MP = @HAS_MP@
+HAS_NETWORKING = @HAS_NETWORKING@
+HAS_POSIX_API = @HAS_POSIX_API@
 HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg
index 49f1326f78..835b22c558 100644
--- a/c/src/make/compilers/gcc-target-default.cfg
+++ b/c/src/make/compilers/gcc-target-default.cfg
@@ -87,10 +87,7 @@ endif
 # Define this to yes if C++ is included in the development environment.
 # This requires that at least the GNU C++ compiler and libg++ be installed.
 ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
-HAS_CPLUSPLUS=yes
 CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
-else
-HAS_CPLUSPLUS=no
 endif
 
 # debug flag;
@@ -287,15 +284,13 @@ endif
 LINK_OBJS =\
     $(CONSTRUCTOR) \
     $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \
-    $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA)
+    $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
 
 LINK_FILES =\
     $(START_FILE) \
     $(CONSTRUCTOR) \
     $(OBJS) \
     $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \
-    $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA) \
     $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA)
 
 ifeq ($(RTEMS_USE_GCC272),yes)
diff --git a/c/src/make/configure b/c/src/make/configure
index 82445b67ce..9a874f12d2 100644
--- a/c/src/make/configure
+++ b/c/src/make/configure
@@ -2943,7 +2943,6 @@ else
     else
       rtems_cv_HAS_MP="no";
     fi
-  
 fi
 
 echo "$ac_t""$rtems_cv_HAS_MP" 1>&6
@@ -2955,7 +2954,7 @@ fi
 
 
 echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
-echo "configure:2959: checking whether BSP supports librdbg" >&5
+echo "configure:2958: 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
@@ -2972,6 +2971,60 @@ echo "$ac_t""$rtems_cv_HAS_RDBG" 1>&6
 HAS_RDBG="$rtems_cv_HAS_RDBG"
 
 
+echo $ac_n "checking whether BSP supports libposix""... $ac_c" 1>&6
+echo "configure:2976: checking whether BSP supports libposix" >&5
+if eval "test \"`echo '$''{'rtems_cv_HAS_POSIX_API'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+      case "$RTEMS_CPU" in
+    unix*)
+      rtems_cv_HAS_POSIX_API="no"
+      ;;
+    *)
+      if test "${RTEMS_HAS_POSIX_API}" = "yes"; then
+        rtems_cv_HAS_POSIX_API="yes";
+      else
+        rtems_cv_HAS_POSIX_API="disabled";
+      fi
+      ;;
+    esac
+fi
+
+echo "$ac_t""$rtems_cv_HAS_POSIX_API" 1>&6
+if test "$rtems_cv_HAS_POSIX_API" = "yes"; then
+  HAS_POSIX_API="yes";
+else
+  HAS_POSIX_API="no";
+fi
+
+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 -n "$CXX_FOR_TARGET"; then
+        rtems_cv_HAS_CPLUSPLUS="yes";
+      else
+        rtems_cv_HAS_CPLUSPLUS="no";
+      fi
+    else
+      rtems_cv_HAS_CPLUSPLUS="no";
+    fi
+  
+fi
+HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
+
+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
+  
+fi
+HAS_NETWORKING="$rtems_cv_HAS_NETWORKING";
+
 
 
 
@@ -3243,6 +3296,9 @@ s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
 s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
 s%@HAS_MP@%$HAS_MP%g
 s%@HAS_RDBG@%$HAS_RDBG%g
+s%@HAS_POSIX_API@%$HAS_POSIX_API%g
+s%@HAS_CPLUSPLUS@%$HAS_CPLUSPLUS%g
+s%@HAS_NETWORKING@%$HAS_NETWORKING%g
 s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g
 s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g
 s%@RTEMS_USE_GCC272@%$RTEMS_USE_GCC272%g
diff --git a/c/src/make/configure.in b/c/src/make/configure.in
index 2382b6d0c2..06c4c54bc6 100644
--- a/c/src/make/configure.in
+++ b/c/src/make/configure.in
@@ -73,6 +73,9 @@ RTEMS_I386_GAS_CODE16
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_RDBG(RTEMS_BSP)
+RTEMS_CHECK_POSIX_API(RTEMS_BSP)
+RTEMS_CHECK_CXX(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 
 AC_SUBST(rtems_cv_prog_cc_cross)
 AC_SUBST(RTEMS_HAS_CPLUSPLUS)
diff --git a/c/src/make/custom/Makefile.in b/c/src/make/custom/Makefile.in
index 973bb58484..1ba4c11d09 100644
--- a/c/src/make/custom/Makefile.in
+++ b/c/src/make/custom/Makefile.in
@@ -86,7 +86,10 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_CPLUSPLUS = @HAS_CPLUSPLUS@
 HAS_MP = @HAS_MP@
+HAS_NETWORKING = @HAS_NETWORKING@
+HAS_POSIX_API = @HAS_POSIX_API@
 HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
diff --git a/c/src/make/custom/default.cfg.in b/c/src/make/custom/default.cfg.in
index 872af0d183..0ec951c199 100644
--- a/c/src/make/custom/default.cfg.in
+++ b/c/src/make/custom/default.cfg.in
@@ -40,34 +40,6 @@ CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
 ## GCC specs extension file location
 RTEMS_BSP_SPECS = $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs
 
-## LIBC support
-## Specify the one you want here and fill in the blanks.
-## Currently CYGNUS newlib is supported.
-## NOTE: RTEMS libcsupport.a includes RTEMS versions of stuff like
-##       malloc, gettimeofday, etc.
-
-# Define this to yes if C++ is included in the development environment.
-# This requires that at least the GNU C++ compiler and libg++ be installed.
-ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
-HAS_CPLUSPLUS=yes
-else
-HAS_CPLUSPLUS=no
-endif
-
-# Define this to yes if this target wants the TCP/IP stack
-ifeq ($(RTEMS_HAS_NETWORKING),yes)
-HAS_NETWORKING=yes
-else
-HAS_NETWORKING=no
-endif
-
-# Define this to yes if this target wants the posix api
-ifeq ($(RTEMS_HAS_POSIX_API),yes)
-HAS_POSIX_API=yes
-else
-HAS_POSIX_API=no
-endif
-
 # Base name of start file
 START_BASE=start
 
diff --git a/c/src/make/host.cfg.in b/c/src/make/host.cfg.in
index 18ddc85d8b..c048042977 100644
--- a/c/src/make/host.cfg.in
+++ b/c/src/make/host.cfg.in
@@ -48,11 +48,6 @@ GCCSED = @GCCSED@
 KSH=@KSH@
 
 #
-# RCS support
-#
-RCS_CLEAN=$(PROJECT_BIN)/rcs-clean
-
-#
 #  Rule to install a shell script with the proper shell to run it.
 #