diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-30 18:38:26 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-30 18:38:26 +0000 |
commit | a71938283c65531e49a6398905be59705c36b748 (patch) | |
tree | 510baa09390975da38b75eae9dab4b267c7e3674 /c/src/lib/aclocal.m4 | |
parent | Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>: (diff) | |
download | rtems-a71938283c65531e49a6398905be59705c36b748.tar.bz2 |
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> 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.
Diffstat (limited to 'c/src/lib/aclocal.m4')
-rw-r--r-- | c/src/lib/aclocal.m4 | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/c/src/lib/aclocal.m4 b/c/src/lib/aclocal.m4 index 51eae57574..8a3fc923bf 100644 --- a/c/src/lib/aclocal.m4 +++ b/c/src/lib/aclocal.m4 @@ -504,84 +504,6 @@ fi dnl dnl $Id$ -dnl -dnl Check for target g++ -dnl -dnl 98/05/20 Ralf Corsepius (corsepiu@faw.uni-ulm.de) -dnl Completely reworked - -AC_DEFUN(RTEMS_PROG_CXX, -[ -AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl -AC_BEFORE([$0], [AC_PROG_CXX])dnl -AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl - -dnl Only accept g++ and c++ -dnl NOTE: This might be too restrictive for native compilation -AC_PATH_PROGS(CXX_FOR_TARGET, "$program_prefix"g++ "$program_prefix"c++) -test -z "$CXX_FOR_TARGET" \ - && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) - -dnl backup -rtems_save_CXX=$CXX -rtems_save_CXXFLAGS=$CXXFLAGS - -dnl temporarily set CXX -CXX=$CXX_FOR_TARGET - -AC_PROG_CXX_WORKS -AC_PROG_CXX_GNU - -if test $ac_cv_prog_gxx = yes; then - GXX=yes -dnl Check whether -g works, even if CXXFLAGS is set, in case the package -dnl plays around with CXXFLAGS (such as to build both debugging and -dnl normal versions of a library), tasteless as that idea is. - ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - AC_PROG_CXX_G - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" - elif test $ac_cv_prog_cxx_g = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-O2" - fi -else - GXX= - test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" -fi - -rtems_cv_prog_gxx=$ac_cv_prog_gxx -rtems_cv_prog_cxx_g=$ac_cv_prog_cxx_g -rtems_cv_prog_cxx_works=$ac_cv_prog_cxx_works -rtems_cv_prog_cxx_cross=$ac_cv_prog_cxx_cross - -CXX=$rtems_save_CXX -CXXFLAGS=$rtems_save_CXXFLAGS - -dnl restore initial values -unset ac_cv_prog_gxx -unset ac_cv_prog_cc_g -unset ac_cv_prog_cxx_works -unset ac_cv_prog_cxx_cross -]) - -AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET, -[ - RTEMS_PROG_CXX - if test "$rtems_cv_prog_cc_cross" != "$rtems_cv_prog_cxx_cross"; then - AC_MSG_ERROR([***] - [Inconsistency in compiler configuration:] - [Target C compiler and Target C++ compiler] - [must both either be cross compilers or native compilers] - [Hint: If building a posix bsp: LD_LIBRARY_PATH?] ) - fi -]) - -dnl -dnl $Id$ dnl dnl Set target tools dnl @@ -811,27 +733,6 @@ AC_SUBST(HAS_MP) 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_CHECK([whether to build rtems++], - rtems_cv_HAS_CPLUSPLUS, - [ 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]) -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 |