Changeset a719382 in rtems


Ignore:
Timestamp:
Aug 30, 1999, 6:38:26 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
d9c2e9f5
Parents:
6cc786f
Message:

Patch from Ralf Corsepius <corsepiu@…> to move
c/src/lib/librtems++ and c/src/lib/include/rtems++ to
their own package librtems++ at the top of the tree.

To apply:

mkdir c/src/librtems++
cp c/src/lib/librtems++/README c/src/librtems++
mkdir c/src/librtems++/src
cp c/src/lib/librtems++/*.cc c/src/librtems++/src
cp c/src/lib/librtems++/Makefile.in c/src/librtems++/src
mkdir c/src/librtems++/include
mkdir c/src/librtems++/include/rtems++
cp c/src/lib/include/rtems++/*.h c/src/librtems++/include/rtems++
patch -p1 <rtems-rc-19990802-5.diff
rm -rf c/src/lib/librtems++
rm -rf c/src/lib/include/rtems++
./autogen

Attention:

  • The procedure above copies the files first, then patches them and finally removes the old files afterwards. This has been done to enable you to copy the files in CVS to preserve their history.
Location:
c/src
Files:
17 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • c/src/Makefile.am

    r6cc786f ra719382  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 SUBDIRS= make exec lib tests
     8SUBDIRS= make exec lib librtems++ tests
    99
    1010rtems_bspdir=$(prefix)/@RTEMS_BSP@
  • c/src/Makefile.in

    r6cc786f ra719382  
    8686ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    8787
    88 SUBDIRS = make exec lib tests
     88SUBDIRS = make exec lib librtems++ tests
    8989
    9090rtems_bspdir = $(prefix)/@RTEMS_BSP@
  • c/src/configure

    r6cc786f ra719382  
    10171017subdirs="make exec lib"
    10181018
    1019 subdirs="make exec lib tests"
     1019subdirs="make exec lib librtems++"
     1020
     1021subdirs="make exec lib librtems++ tests"
    10201022
    10211023
     
    13421344  done
    13431345
    1344   for ac_config_dir in make exec lib tests; do
     1346  for ac_config_dir in make exec lib librtems++ tests; do
    13451347
    13461348    # Do not complain, so a configure script can configure whichever
  • c/src/configure.in

    r6cc786f ra719382  
    2424AC_CONFIG_SUBDIRS(exec)
    2525AC_CONFIG_SUBDIRS(lib)
     26AC_CONFIG_SUBDIRS(librtems++)
    2627AC_CONFIG_SUBDIRS(tests)
    2728
  • c/src/lib/Makefile.in

    r6cc786f ra719382  
    3535LIBRDBG = $(LIBRDBG_$(HAS_NETWORKING)_$(HAS_RDBG)_V)
    3636
    37 # We only build the rtems++ library if HAS_CPLUSPLUS was defined
    38 LIBRTEMSCPLUSPLUS_yes_V = librtems++
    39 LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V)
    40 
    4137# General Hardware API library
    4238LIBHWAPI = $(wildcard libhwapi)
  • c/src/lib/aclocal.m4

    r6cc786f ra719382  
    501501fi
    502502])
    503 ])
    504 
    505 dnl
    506 dnl $Id$
    507 dnl
    508 dnl Check for target g++
    509 dnl
    510 dnl 98/05/20 Ralf Corsepius     (corsepiu@faw.uni-ulm.de)
    511 dnl                             Completely reworked
    512 
    513 AC_DEFUN(RTEMS_PROG_CXX,
    514 [
    515 AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
    516 AC_BEFORE([$0], [AC_PROG_CXX])dnl
    517 AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
    518 
    519 dnl Only accept g++ and c++
    520 dnl NOTE: This might be too restrictive for native compilation
    521 AC_PATH_PROGS(CXX_FOR_TARGET, "$program_prefix"g++ "$program_prefix"c++)
    522 test -z "$CXX_FOR_TARGET" \
    523   && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
    524 
    525 dnl backup
    526 rtems_save_CXX=$CXX
    527 rtems_save_CXXFLAGS=$CXXFLAGS
    528 
    529 dnl temporarily set CXX
    530 CXX=$CXX_FOR_TARGET
    531 
    532 AC_PROG_CXX_WORKS
    533 AC_PROG_CXX_GNU
    534 
    535 if test $ac_cv_prog_gxx = yes; then
    536   GXX=yes
    537 dnl Check whether -g works, even if CXXFLAGS is set, in case the package
    538 dnl plays around with CXXFLAGS (such as to build both debugging and
    539 dnl normal versions of a library), tasteless as that idea is.
    540   ac_test_CXXFLAGS="${CXXFLAGS+set}"
    541   ac_save_CXXFLAGS="$CXXFLAGS"
    542   CXXFLAGS=
    543   AC_PROG_CXX_G
    544   if test "$ac_test_CXXFLAGS" = set; then
    545     CXXFLAGS="$ac_save_CXXFLAGS"
    546   elif test $ac_cv_prog_cxx_g = yes; then
    547     CXXFLAGS="-g -O2"
    548   else
    549     CXXFLAGS="-O2"
    550   fi
    551 else
    552   GXX=
    553   test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
    554 fi
    555 
    556 rtems_cv_prog_gxx=$ac_cv_prog_gxx
    557 rtems_cv_prog_cxx_g=$ac_cv_prog_cxx_g
    558 rtems_cv_prog_cxx_works=$ac_cv_prog_cxx_works
    559 rtems_cv_prog_cxx_cross=$ac_cv_prog_cxx_cross
    560 
    561 CXX=$rtems_save_CXX
    562 CXXFLAGS=$rtems_save_CXXFLAGS
    563 
    564 dnl restore initial values
    565 unset ac_cv_prog_gxx
    566 unset ac_cv_prog_cc_g
    567 unset ac_cv_prog_cxx_works
    568 unset ac_cv_prog_cxx_cross
    569 ])
    570 
    571 AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
    572 [
    573   RTEMS_PROG_CXX
    574   if test "$rtems_cv_prog_cc_cross" != "$rtems_cv_prog_cxx_cross"; then
    575     AC_MSG_ERROR([***]
    576      [Inconsistency in compiler configuration:]
    577      [Target C compiler and Target C++ compiler]
    578      [must both either be cross compilers or native compilers]
    579      [Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
    580   fi
    581503])
    582504
     
    812734dnl $Id$
    813735dnl
    814 AC_DEFUN(RTEMS_CHECK_CXX,
    815 [dnl
    816 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
    817 AC_REQUIRE([RTEMS_PROG_CXX_FOR_TARGET])dnl
    818 AC_CACHE_CHECK([whether to build rtems++],
    819   rtems_cv_HAS_CPLUSPLUS,
    820   [ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    821       if test -n "$CXX_FOR_TARGET"; then
    822         rtems_cv_HAS_CPLUSPLUS="yes"
    823       else
    824         rtems_cv_HAS_CPLUSPLUS="no"
    825       fi
    826     else
    827       rtems_cv_HAS_CPLUSPLUS="no"
    828     fi])
    829 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
    830 AC_SUBST(HAS_CPLUSPLUS)dnl
    831 ])
    832 
    833 dnl $Id$
    834 dnl
    835736AC_DEFUN(RTEMS_CHECK_NETWORKING,
    836737[dnl
  • c/src/lib/configure

    r6cc786f ra719382  
    12461246
    12471247
    1248 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    1249  
    1250  
    1251 
    1252 for ac_prog in "$program_prefix"g++ "$program_prefix"c++
    1253 do
    1254 # Extract the first word of "$ac_prog", so it can be a program name with args.
    1255 set dummy $ac_prog; ac_word=$2
    1256 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1257 echo "configure:1258: checking for $ac_word" >&5
    1258 if eval "test \"`echo '$''{'ac_cv_path_CXX_FOR_TARGET'+set}'`\" = set"; then
    1259   echo $ac_n "(cached) $ac_c" 1>&6
    1260 else
    1261   case "$CXX_FOR_TARGET" in
    1262   /*)
    1263   ac_cv_path_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test with a path.
    1264   ;;
    1265   ?:/*)                 
    1266   ac_cv_path_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test with a dos path.
    1267   ;;
    1268   *)
    1269   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
    1270   ac_dummy="$PATH"
    1271   for ac_dir in $ac_dummy; do
    1272     test -z "$ac_dir" && ac_dir=.
    1273     if test -f $ac_dir/$ac_word; then
    1274       ac_cv_path_CXX_FOR_TARGET="$ac_dir/$ac_word"
    1275       break
    1276     fi
    1277   done
    1278   IFS="$ac_save_ifs"
    1279   ;;
    1280 esac
    1281 fi
    1282 CXX_FOR_TARGET="$ac_cv_path_CXX_FOR_TARGET"
    1283 if test -n "$CXX_FOR_TARGET"; then
    1284   echo "$ac_t""$CXX_FOR_TARGET" 1>&6
    1285 else
    1286   echo "$ac_t""no" 1>&6
    1287 fi
    1288 
    1289 test -n "$CXX_FOR_TARGET" && break
    1290 done
    1291 
    1292 test -z "$CXX_FOR_TARGET" \
    1293   && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; }
    1294 
    1295 rtems_save_CXX=$CXX
    1296 rtems_save_CXXFLAGS=$CXXFLAGS
    1297 
    1298 CXX=$CXX_FOR_TARGET
    1299 
    1300 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    1301 echo "configure:1302: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
    1302 
    1303 ac_ext=C
    1304 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
    1305 ac_cpp='$CXXCPP $CPPFLAGS'
    1306 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
    1307 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
    1308 cross_compiling=$ac_cv_prog_cxx_cross
    1309 
    1310 cat > conftest.$ac_ext << EOF
    1311 
    1312 #line 1313 "configure"
    1313 #include "confdefs.h"
    1314 
    1315 int main(){return(0);}
    1316 EOF
    1317 if { (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    1318   ac_cv_prog_cxx_works=yes
    1319   # If we can't run a trivial program, we are probably using a cross compiler.
    1320   if (./conftest; exit) 2>/dev/null; then
    1321     ac_cv_prog_cxx_cross=no
    1322   else
    1323     ac_cv_prog_cxx_cross=yes
    1324   fi
    1325 else
    1326   echo "configure: failed program was:" >&5
    1327   cat conftest.$ac_ext >&5
    1328   ac_cv_prog_cxx_works=no
    1329 fi
    1330 rm -fr conftest*
    1331 ac_ext=c
    1332 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
    1333 ac_cpp='$CPP $CPPFLAGS'
    1334 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
    1335 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
    1336 cross_compiling=$ac_cv_prog_cc_cross
    1337 
    1338 echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
    1339 if test $ac_cv_prog_cxx_works = no; then
    1340   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
    1341 fi
    1342 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    1343 echo "configure:1344: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
    1344 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
    1345 cross_compiling=$ac_cv_prog_cxx_cross
    1346 
    1347 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
    1348 echo "configure:1349: checking whether we are using GNU C++" >&5
    1349 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    1350   echo $ac_n "(cached) $ac_c" 1>&6
    1351 else
    1352   cat > conftest.C <<EOF
    1353 #ifdef __GNUC__
    1354   yes;
    1355 #endif
    1356 EOF
    1357 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    1358   ac_cv_prog_gxx=yes
    1359 else
    1360   ac_cv_prog_gxx=no
    1361 fi
    1362 fi
    1363 
    1364 echo "$ac_t""$ac_cv_prog_gxx" 1>&6
    1365 
    1366 if test $ac_cv_prog_gxx = yes; then
    1367   GXX=yes
    1368   ac_test_CXXFLAGS="${CXXFLAGS+set}"
    1369   ac_save_CXXFLAGS="$CXXFLAGS"
    1370   CXXFLAGS=
    1371   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
    1372 echo "configure:1373: checking whether ${CXX-g++} accepts -g" >&5
    1373 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    1374   echo $ac_n "(cached) $ac_c" 1>&6
    1375 else
    1376   echo 'void f(){}' > conftest.cc
    1377 if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
    1378   ac_cv_prog_cxx_g=yes
    1379 else
    1380   ac_cv_prog_cxx_g=no
    1381 fi
    1382 rm -f conftest*
    1383 
    1384 fi
    1385 
    1386 echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
    1387   if test "$ac_test_CXXFLAGS" = set; then
    1388     CXXFLAGS="$ac_save_CXXFLAGS"
    1389   elif test $ac_cv_prog_cxx_g = yes; then
    1390     CXXFLAGS="-g -O2"
    1391   else
    1392     CXXFLAGS="-O2"
    1393   fi
    1394 else
    1395   GXX=
    1396   test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
    1397 fi
    1398 
    1399 rtems_cv_prog_gxx=$ac_cv_prog_gxx
    1400 rtems_cv_prog_cxx_g=$ac_cv_prog_cxx_g
    1401 rtems_cv_prog_cxx_works=$ac_cv_prog_cxx_works
    1402 rtems_cv_prog_cxx_cross=$ac_cv_prog_cxx_cross
    1403 
    1404 CXX=$rtems_save_CXX
    1405 CXXFLAGS=$rtems_save_CXXFLAGS
    1406 
    1407 unset ac_cv_prog_gxx
    1408 unset ac_cv_prog_cc_g
    1409 unset ac_cv_prog_cxx_works
    1410 unset ac_cv_prog_cxx_cross
    1411 
    1412   if test "$rtems_cv_prog_cc_cross" != "$rtems_cv_prog_cxx_cross"; then
    1413     { echo "configure: error: ***
    1414      Inconsistency in compiler configuration:
    1415      Target C compiler and Target C++ compiler
    1416      must both either be cross compilers or native compilers
    1417      Hint: If building a posix bsp: LD_LIBRARY_PATH? " 1>&2; exit 1; }
    1418   fi
    1419 
    1420 fi
    1421 
    14221248
    14231249 
    14241250echo $ac_n "checking target's ar""... $ac_c" 1>&6
    1425 echo "configure:1426: checking target's ar" >&5
     1251echo "configure:1252: checking target's ar" >&5
    14261252if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
    14271253  echo $ac_n "(cached) $ac_c" 1>&6
     
    14561282    # intends
    14571283    echo $ac_n "checking whether environment variable AR_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    1458 echo "configure:1459: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5
     1284echo "configure:1285: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5
    14591285    case "$AR_FOR_TARGET" in
    14601286    /*) # valid
     
    14731299set dummy "$program_prefix"ar; ac_word=$2
    14741300echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1475 echo "configure:1476: checking for $ac_word" >&5
     1301echo "configure:1302: checking for $ac_word" >&5
    14761302if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
    14771303  echo $ac_n "(cached) $ac_c" 1>&6
     
    15101336 
    15111337echo $ac_n "checking target's as""... $ac_c" 1>&6
    1512 echo "configure:1513: checking target's as" >&5
     1338echo "configure:1339: checking target's as" >&5
    15131339if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
    15141340  echo $ac_n "(cached) $ac_c" 1>&6
     
    15431369    # intends
    15441370    echo $ac_n "checking whether environment variable AS_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    1545 echo "configure:1546: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5
     1371echo "configure:1372: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5
    15461372    case "$AS_FOR_TARGET" in
    15471373    /*) # valid
     
    15601386set dummy "$program_prefix"as; ac_word=$2
    15611387echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1562 echo "configure:1563: checking for $ac_word" >&5
     1388echo "configure:1389: checking for $ac_word" >&5
    15631389if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
    15641390  echo $ac_n "(cached) $ac_c" 1>&6
     
    15971423 
    15981424echo $ac_n "checking target's ld""... $ac_c" 1>&6
    1599 echo "configure:1600: checking target's ld" >&5
     1425echo "configure:1426: checking target's ld" >&5
    16001426if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
    16011427  echo $ac_n "(cached) $ac_c" 1>&6
     
    16301456    # intends
    16311457    echo $ac_n "checking whether environment variable LD_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    1632 echo "configure:1633: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5
     1458echo "configure:1459: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5
    16331459    case "$LD_FOR_TARGET" in
    16341460    /*) # valid
     
    16471473set dummy "$program_prefix"ld; ac_word=$2
    16481474echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1649 echo "configure:1650: checking for $ac_word" >&5
     1475echo "configure:1476: checking for $ac_word" >&5
    16501476if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
    16511477  echo $ac_n "(cached) $ac_c" 1>&6
     
    16841510 
    16851511echo $ac_n "checking target's nm""... $ac_c" 1>&6
    1686 echo "configure:1687: checking target's nm" >&5
     1512echo "configure:1513: checking target's nm" >&5
    16871513if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
    16881514  echo $ac_n "(cached) $ac_c" 1>&6
     
    17171543    # intends
    17181544    echo $ac_n "checking whether environment variable NM_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    1719 echo "configure:1720: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5
     1545echo "configure:1546: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5
    17201546    case "$NM_FOR_TARGET" in
    17211547    /*) # valid
     
    17341560set dummy "$program_prefix"nm; ac_word=$2
    17351561echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1736 echo "configure:1737: checking for $ac_word" >&5
     1562echo "configure:1563: checking for $ac_word" >&5
    17371563if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
    17381564  echo $ac_n "(cached) $ac_c" 1>&6
     
    17721598 
    17731599echo $ac_n "checking target's ranlib""... $ac_c" 1>&6
    1774 echo "configure:1775: checking target's ranlib" >&5
     1600echo "configure:1601: checking target's ranlib" >&5
    17751601if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
    17761602  echo $ac_n "(cached) $ac_c" 1>&6
     
    18051631    # intends
    18061632    echo $ac_n "checking whether environment variable RANLIB_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    1807 echo "configure:1808: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5
     1633echo "configure:1634: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5
    18081634    case "$RANLIB_FOR_TARGET" in
    18091635    /*) # valid
     
    18221648set dummy "$program_prefix"ranlib; ac_word=$2
    18231649echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1824 echo "configure:1825: checking for $ac_word" >&5
     1650echo "configure:1651: checking for $ac_word" >&5
    18251651if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
    18261652  echo $ac_n "(cached) $ac_c" 1>&6
     
    18611687   
    18621688echo $ac_n "checking whether $AR_FOR_TARGET -s works""... $ac_c" 1>&6
    1863 echo "configure:1864: checking whether $AR_FOR_TARGET -s works" >&5
     1689echo "configure:1690: checking whether $AR_FOR_TARGET -s works" >&5
    18641690if eval "test \"`echo '$''{'rtems_cv_AR_FOR_TARGET_S'+set}'`\" = set"; then
    18651691  echo $ac_n "(cached) $ac_c" 1>&6
     
    18701696{ return b; }
    18711697EOF
    1872 if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:1873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
    1873   && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
     1698if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:1699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
     1699  && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
    18741700  && test -s conftest.a ; \
    18751701then
     
    18961722 
    18971723echo $ac_n "checking target's objcopy""... $ac_c" 1>&6
    1898 echo "configure:1899: checking target's objcopy" >&5
     1724echo "configure:1725: checking target's objcopy" >&5
    18991725if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then
    19001726  echo $ac_n "(cached) $ac_c" 1>&6
     
    19291755    # intends
    19301756    echo $ac_n "checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    1931 echo "configure:1932: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5
     1757echo "configure:1758: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5
    19321758    case "$OBJCOPY_FOR_TARGET" in
    19331759    /*) # valid
     
    19461772set dummy "$program_prefix"objcopy; ac_word=$2
    19471773echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1948 echo "configure:1949: checking for $ac_word" >&5
     1774echo "configure:1775: checking for $ac_word" >&5
    19491775if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then
    19501776  echo $ac_n "(cached) $ac_c" 1>&6
     
    19831809 
    19841810echo $ac_n "checking target's size""... $ac_c" 1>&6
    1985 echo "configure:1986: checking target's size" >&5
     1811echo "configure:1812: checking target's size" >&5
    19861812if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then
    19871813  echo $ac_n "(cached) $ac_c" 1>&6
     
    20161842    # intends
    20171843    echo $ac_n "checking whether environment variable SIZE_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    2018 echo "configure:2019: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5
     1844echo "configure:1845: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5
    20191845    case "$SIZE_FOR_TARGET" in
    20201846    /*) # valid
     
    20331859set dummy "$program_prefix"size; ac_word=$2
    20341860echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    2035 echo "configure:2036: checking for $ac_word" >&5
     1861echo "configure:1862: checking for $ac_word" >&5
    20361862if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then
    20371863  echo $ac_n "(cached) $ac_c" 1>&6
     
    20701896 
    20711897echo $ac_n "checking target's strip""... $ac_c" 1>&6
    2072 echo "configure:2073: checking target's strip" >&5
     1898echo "configure:1899: checking target's strip" >&5
    20731899if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
    20741900  echo $ac_n "(cached) $ac_c" 1>&6
     
    21031929    # intends
    21041930    echo $ac_n "checking whether environment variable STRIP_FOR_TARGET is an absolute path""... $ac_c" 1>&6
    2105 echo "configure:2106: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5
     1931echo "configure:1932: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5
    21061932    case "$STRIP_FOR_TARGET" in
    21071933    /*) # valid
     
    21201946set dummy "$program_prefix"strip; ac_word=$2
    21211947echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    2122 echo "configure:2123: checking for $ac_word" >&5
     1948echo "configure:1949: checking for $ac_word" >&5
    21231949if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
    21241950  echo $ac_n "(cached) $ac_c" 1>&6
     
    21591985 if test "${target_cpu}" = "i386"; then
    21601986    echo $ac_n "checking for 16 bit mode assembler support""... $ac_c" 1>&6
    2161 echo "configure:2162: checking for 16 bit mode assembler support" >&5
     1987echo "configure:1988: checking for 16 bit mode assembler support" >&5
    21621988if eval "test \"`echo '$''{'rtems_cv_prog_gas_code16'+set}'`\" = set"; then
    21631989  echo $ac_n "(cached) $ac_c" 1>&6
     
    21691995         lgdt 0
    21701996EOF
    2171       if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
     1997      if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
    21721998        rtems_cv_prog_gas_code16=yes
    21731999      else
     
    21992025
    22002026echo $ac_n "checking for make/custom/$RTEMS_BSP.cfg""... $ac_c" 1>&6
    2201 echo "configure:2202: checking for make/custom/$RTEMS_BSP.cfg" >&5
     2027echo "configure:2028: checking for make/custom/$RTEMS_BSP.cfg" >&5
    22022028if test -r "$srcdir/$RTEMS_TOPdir/make/custom/$RTEMS_BSP.cfg"; then
    22032029  echo "$ac_t""yes" 1>&6
     
    22072033
    22082034echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6
    2209 echo "configure:2210: checking whether BSP supports multiprocessing" >&5
     2035echo "configure:2036: checking whether BSP supports multiprocessing" >&5
    22102036if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then
    22112037  echo $ac_n "(cached) $ac_c" 1>&6
     
    22302056
    22312057
    2232 echo $ac_n "checking whether to build rtems++""... $ac_c" 1>&6
    2233 echo "configure:2234: checking whether to build rtems++" >&5
    2234 if eval "test \"`echo '$''{'rtems_cv_HAS_CPLUSPLUS'+set}'`\" = set"; then
    2235   echo $ac_n "(cached) $ac_c" 1>&6
    2236 else
    2237    if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    2238       if test -n "$CXX_FOR_TARGET"; then
    2239         rtems_cv_HAS_CPLUSPLUS="yes"
    2240       else
    2241         rtems_cv_HAS_CPLUSPLUS="no"
    2242       fi
    2243     else
    2244       rtems_cv_HAS_CPLUSPLUS="no"
    2245     fi
    2246 fi
    2247 
    2248 echo "$ac_t""$rtems_cv_HAS_CPLUSPLUS" 1>&6
    2249 HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
    2250 
    22512058echo $ac_n "checking whether BSP supports networking""... $ac_c" 1>&6
    2252 echo "configure:2253: checking whether BSP supports networking" >&5
     2059echo "configure:2060: checking whether BSP supports networking" >&5
    22532060if eval "test \"`echo '$''{'rtems_cv_HAS_NETWORKING'+set}'`\" = set"; then
    22542061  echo $ac_n "(cached) $ac_c" 1>&6
     
    23152122 
    23162123echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}$bspdir""... $ac_c" 1>&6
    2317 echo "configure:2318: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
     2124echo "configure:2125: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
    23182125if test -d $srcdir/libbsp/${bspcpudir}$bspdir; then
    23192126  rtems_av_save_dir=`pwd`;
     
    23302137 
    23312138echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}shared""... $ac_c" 1>&6
    2332 echo "configure:2333: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
     2139echo "configure:2140: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
    23332140if test -d $srcdir/libbsp/${bspcpudir}shared; then
    23342141  rtems_av_save_dir=`pwd`;
     
    23742181
    23752182echo $ac_n "checking for Makefile.in in libcpu/$RTEMS_CPU""... $ac_c" 1>&6
    2376 echo "configure:2377: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
     2183echo "configure:2184: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
    23772184if test -d $srcdir/libcpu/$RTEMS_CPU; then
    23782185  rtems_av_save_dir=`pwd`;
     
    23942201   
    23952202echo $ac_n "checking for Makefile.in in start/$RTEMS_CPU""... $ac_c" 1>&6
    2396 echo "configure:2397: checking for Makefile.in in start/$RTEMS_CPU" >&5
     2203echo "configure:2204: checking for Makefile.in in start/$RTEMS_CPU" >&5
    23972204if test -d $srcdir/start/$RTEMS_CPU; then
    23982205  rtems_av_save_dir=`pwd`;
     
    24142221 
    24152222echo $ac_n "checking for Makefile.in in libnetworking""... $ac_c" 1>&6
    2416 echo "configure:2417: checking for Makefile.in in libnetworking" >&5
     2223echo "configure:2224: checking for Makefile.in in libnetworking" >&5
    24172224if test -d $srcdir/libnetworking; then
    24182225  rtems_av_save_dir=`pwd`;
     
    24292236 
    24302237echo $ac_n "checking for Makefile.in in librpc""... $ac_c" 1>&6
    2431 echo "configure:2432: checking for Makefile.in in librpc" >&5
     2238echo "configure:2239: checking for Makefile.in in librpc" >&5
    24322239if test -d $srcdir/librpc; then
    24332240  rtems_av_save_dir=`pwd`;
     
    24452252  if test "$RTEMS_HAS_RDBG" = "yes"; then
    24462253    echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
    2447 echo "configure:2448: checking whether BSP supports librdbg" >&5
     2254echo "configure:2255: checking whether BSP supports librdbg" >&5
    24482255if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then
    24492256  echo $ac_n "(cached) $ac_c" 1>&6
     
    24672274set dummy rpcgen; ac_word=$2
    24682275echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    2469 echo "configure:2470: checking for $ac_word" >&5
     2276echo "configure:2277: checking for $ac_word" >&5
    24702277if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then
    24712278  echo $ac_n "(cached) $ac_c" 1>&6
     
    24982305set dummy $ac_prog; ac_word=$2
    24992306echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    2500 echo "configure:2501: checking for $ac_word" >&5
     2307echo "configure:2308: checking for $ac_word" >&5
    25012308if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
    25022309  echo $ac_n "(cached) $ac_c" 1>&6
     
    25372344     
    25382345echo $ac_n "checking for Makefile.in in librdbg""... $ac_c" 1>&6
    2539 echo "configure:2540: checking for Makefile.in in librdbg" >&5
     2346echo "configure:2347: checking for Makefile.in in librdbg" >&5
    25402347if test -d $srcdir/librdbg; then
    25412348  rtems_av_save_dir=`pwd`;
     
    25522359    fi
    25532360  fi
    2554 fi
    2555 
    2556 # If the C++ support is enabled, then include the Makefiles
    2557 if test "$HAS_CPLUSPLUS" = "yes"; then
    2558  
    2559 echo $ac_n "checking for Makefile.in in librtems++""... $ac_c" 1>&6
    2560 echo "configure:2561: checking for Makefile.in in librtems++" >&5
    2561 if test -d $srcdir/librtems++; then
    2562   rtems_av_save_dir=`pwd`;
    2563   cd $srcdir;
    2564   rtems_av_tmp=`find librtems++ -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
    2565   makefiles="$makefiles $rtems_av_tmp";
    2566   cd $rtems_av_save_dir;
    2567   echo "$ac_t""done" 1>&6
    2568 else
    2569   echo "$ac_t""no" 1>&6
    2570 fi
    2571 
    2572 
    25732361fi
    25742362
     
    25892377if test "$RTEMS_HAS_HWAPI" = "yes"; then
    25902378  echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6
    2591 echo "configure:2592: checking whether libwapi is present" >&5
     2379echo "configure:2380: checking whether libwapi is present" >&5
    25922380  if test -f ${srcdir}/libhwapi/Makefile.in ; then
    25932381    echo "$ac_t""yes" 1>&6
     
    25952383   
    25962384echo $ac_n "checking for Makefile.in in libhwapi/analog""... $ac_c" 1>&6
    2597 echo "configure:2598: checking for Makefile.in in libhwapi/analog" >&5
     2385echo "configure:2386: checking for Makefile.in in libhwapi/analog" >&5
    25982386if test -d $srcdir/libhwapi/analog; then
    25992387  rtems_av_save_dir=`pwd`;
     
    26102398   
    26112399echo $ac_n "checking for Makefile.in in libhwapi/discrete""... $ac_c" 1>&6
    2612 echo "configure:2613: checking for Makefile.in in libhwapi/discrete" >&5
     2400echo "configure:2401: checking for Makefile.in in libhwapi/discrete" >&5
    26132401if test -d $srcdir/libhwapi/discrete; then
    26142402  rtems_av_save_dir=`pwd`;
     
    26252413   
    26262414echo $ac_n "checking for Makefile.in in libhwapi/drivers""... $ac_c" 1>&6
    2627 echo "configure:2628: checking for Makefile.in in libhwapi/drivers" >&5
     2415echo "configure:2416: checking for Makefile.in in libhwapi/drivers" >&5
    26282416if test -d $srcdir/libhwapi/drivers; then
    26292417  rtems_av_save_dir=`pwd`;
     
    26402428   
    26412429echo $ac_n "checking for Makefile.in in libhwapi/non_volatile_memory""... $ac_c" 1>&6
    2642 echo "configure:2643: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
     2430echo "configure:2431: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
    26432431if test -d $srcdir/libhwapi/non_volatile_memory; then
    26442432  rtems_av_save_dir=`pwd`;
     
    26552443   
    26562444echo $ac_n "checking for Makefile.in in libhwapi/serial""... $ac_c" 1>&6
    2657 echo "configure:2658: checking for Makefile.in in libhwapi/serial" >&5
     2445echo "configure:2446: checking for Makefile.in in libhwapi/serial" >&5
    26582446if test -d $srcdir/libhwapi/serial; then
    26592447  rtems_av_save_dir=`pwd`;
     
    26702458   
    26712459echo $ac_n "checking for Makefile.in in libhwapi/support""... $ac_c" 1>&6
    2672 echo "configure:2673: checking for Makefile.in in libhwapi/support" >&5
     2460echo "configure:2461: checking for Makefile.in in libhwapi/support" >&5
    26732461if test -d $srcdir/libhwapi/support; then
    26742462  rtems_av_save_dir=`pwd`;
     
    26852473   
    26862474echo $ac_n "checking for Makefile.in in libhwapi/wrapup""... $ac_c" 1>&6
    2687 echo "configure:2688: checking for Makefile.in in libhwapi/wrapup" >&5
     2475echo "configure:2476: checking for Makefile.in in libhwapi/wrapup" >&5
    26882476if test -d $srcdir/libhwapi/wrapup; then
    26892477  rtems_av_save_dir=`pwd`;
     
    27152503
    27162504echo $ac_n "checking for Makefile.in in libchip""... $ac_c" 1>&6
    2717 echo "configure:2718: checking for Makefile.in in libchip" >&5
     2505echo "configure:2506: checking for Makefile.in in libchip" >&5
    27182506if test -d $srcdir/libchip; then
    27192507  rtems_av_save_dir=`pwd`;
     
    27322520
    27332521echo $ac_n "checking for Makefile.in in libmisc""... $ac_c" 1>&6
    2734 echo "configure:2735: checking for Makefile.in in libmisc" >&5
     2522echo "configure:2523: checking for Makefile.in in libmisc" >&5
    27352523if test -d $srcdir/libmisc; then
    27362524  rtems_av_save_dir=`pwd`;
     
    29422730s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g
    29432731s%@GCCSED@%$GCCSED%g
    2944 s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g
    29452732s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g
    29462733s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g
     
    29552742s%@RTEMS_GAS_CODE16_FALSE@%$RTEMS_GAS_CODE16_FALSE%g
    29562743s%@HAS_MP@%$HAS_MP%g
    2957 s%@HAS_CPLUSPLUS@%$HAS_CPLUSPLUS%g
    29582744s%@HAS_NETWORKING@%$HAS_NETWORKING%g
    29592745s%@RTEMS_LIBBSP_CPU_SUBDIR@%$RTEMS_LIBBSP_CPU_SUBDIR%g
  • c/src/lib/configure.in

    r6cc786f ra719382  
    3434RTEMS_PROG_CC_FOR_TARGET
    3535
    36 dnl check for g++
    37 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    38   RTEMS_PROG_CXX_FOR_TARGET
    39 fi
    40 
    4136RTEMS_CANONICALIZE_TOOLS
    4237
     
    5449RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    5550RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
    56 RTEMS_CHECK_CXX(RTEMS_BSP)
    5751RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    5852
     
    144138fi
    145139
    146 # If the C++ support is enabled, then include the Makefiles
    147 if test "$HAS_CPLUSPLUS" = "yes"; then
    148   RTEMS_CHECK_MAKEFILE(librtems++)
    149 fi
    150 
    151140# If the HWAPI is enabled, the find the HWAPI Makefiles
    152141RTEMS_ENABLE_HWAPI
  • c/src/lib/include/Makefile.in

    r6cc786f ra719382  
    4242ZILOG_H_FILES = $(ZILOG_H_PIECES:%=$(srcdir)/zilog/%.h)
    4343
    44 RTEMSCPLUSPLUS_H_PIECES_yes_V = rtemsEvent rtemsInterrupt rtemsMessageQueue \
    45     rtemsSemaphore rtemsStatusCode rtemsTask rtemsTaskMode rtemsTimer
    46 RTEMSCPLUSPLUS_H_PIECES = $(RTEMSCPLUSPLUS_H_PIECES_$(HAS_CPLUSPLUS)_V)
    47 RTEMSCPLUSPLUS_H_FILES = $(RTEMSCPLUSPLUS_H_PIECES:%=$(srcdir)/rtems++/%.h)
    48 
    4944RPC_H_PIECES = auth clnt rpc rpc_msg svc svc_auth types xdr
    5045RPC_H_FILES = $(RPC_H_PIECES:%=$(srcdir)/rpc/%.h)
     
    6964LIBRDBGdir = $(LIBRDBG_$(HAS_NETWORKING)_$(HAS_RDBG)_V)
    7065
    71 # We only make the rtems++ install point if it is enabled.
    72 LIBRTEMSCPLUSPLUS_yes_V = $(PROJECT_INCLUDE)/rtems++
    73 LIBRTEMSCPLUSPLUSdir = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V)
    74 
    7566all: preinstall
    7667
     
    8071        @$(INSTALL_CHANGE) -m 644 $(MOTOROLA_H_FILES) $(PROJECT_INCLUDE)/motorola
    8172        @$(INSTALL_CHANGE) -m 644 $(ZILOG_H_FILES) $(PROJECT_INCLUDE)/zilog
    82         @if test "$(HAS_CPLUSPLUS)" = "yes"; then \
    83         $(INSTALL_CHANGE) -m 644 $(RTEMSCPLUSPLUS_H_FILES) $(LIBRTEMSCPLUSPLUSdir); \
    84         fi
    8573        @if test "$(HAS_NETWORKING)" = "yes"; then \
    8674        $(INSTALL_CHANGE) -m 644 $(RPC_H_FILES) $(LIBRPCdir); \
  • c/src/librtems++/src/Makefile.in

    r6cc786f ra719382  
    77top_srcdir = @top_srcdir@
    88top_builddir = ..
    9 subdir = librtems++
     9subdir = src
    1010
    1111RTEMS_ROOT = @RTEMS_ROOT@
Note: See TracChangeset for help on using the changeset viewer.