From e1d8abbe2800defb344dcce54c401733edd1d37a Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 7 Sep 1999 13:45:03 +0000
Subject: Applied patch rtems-rc-19990820-6.diff.gz from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> which converted many Makefile.in's to
 Makefile.am's.  This added a lot of files.

---
 c/src/configure.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'c/src/configure.in')

diff --git a/c/src/configure.in b/c/src/configure.in
index f94b5e04ba..cdc548910a 100644
--- a/c/src/configure.in
+++ b/c/src/configure.in
@@ -7,6 +7,8 @@ AC_INIT(exec)
 RTEMS_TOP(../..)
 AC_CONFIG_AUX_DIR(../..)
 
+RTEMS_ENABLE_CXX
+
 RTEMS_CANONICAL_TARGET_CPU
 
 AM_INIT_AUTOMAKE(rtems-c-src,$RTEMS_VERSION,no)
@@ -20,10 +22,14 @@ RTEMS_PROJECT_ROOT
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
+## Note: the order of the directories below is essential
 AC_CONFIG_SUBDIRS(make)
 AC_CONFIG_SUBDIRS(exec)
 AC_CONFIG_SUBDIRS(lib)
-AC_CONFIG_SUBDIRS(librtems++)
+if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
+cfg_subdirs="librtems++";
+fi 
+AC_CONFIG_SUBDIRS($cfg_subdirs)
 AC_CONFIG_SUBDIRS(tests)
 
 AC_OUTPUT( 
-- 
cgit v1.2.3