2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* configure.ac: Merge-in librpc/configure.ac.
	* Makefile.am: Add librpc to SUBDIRS.
	Remove @subdirs@.

cpukit/ChangeLog

@@ -1,3 +1,9 @@
+2003-07-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Merge-in librpc/configure.ac.
+	* Makefile.am: Add librpc to SUBDIRS.
+	Remove @subdirs@.
+
 2003-07-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Merge-in libcsupport/configure.ac.

cpukit/Makefile.am

@@ -8,8 +8,7 @@ include $(top_srcdir)/automake/multilib.am
 
 SUBDIRS = . include ada score rtems sapi posix itron
 SUBDIRS += libcsupport libblock libfs
-SUBDIRS += libnetworking
+SUBDIRS += libnetworking librpc
-SUBDIRS += @subdirs@ 
 SUBDIRS += libmisc
 SUBDIRS += wrapup
 

cpukit/configure.ac

@@ -58,9 +58,6 @@ AC_MSG_CHECKING([whether CPU supports librpc])
   * )    LIBRPC=yes;;
   esac
 AC_MSG_RESULT([$LIBRPC])
-  AS_IF([test "$LIBRPC" = "yes"],
-    [AC_CONFIG_SUBDIRS([librpc])
-  ])
 ])
 
 AC_ARG_ENABLE([ada],
@@ -248,6 +245,11 @@ libnetworking/Makefile
 libnetworking/lib/Makefile
 libnetworking/libc/Makefile
 libnetworking/wrapup/Makefile
+librpc/Makefile
+librpc/include/Makefile
+librpc/src/Makefile
+librpc/src/xdr/Makefile
+librpc/src/rpc/Makefile
 libmisc/Makefile
 libmisc/cpuuse/Makefile
 libmisc/shell/Makefile