From be42aa1aefec81b3d226af13a934f48d335191d3 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 26 Jan 2012 09:58:10 +0100 Subject: Revert "Google C++ Testing Framework 1.6.0." This reverts commit 9bf3a868655f260c2fa6cbcab16f0218cf53e5b8. --- cpukit/aclocal/enable-cxx.m4 | 13 ------------- cpukit/aclocal/prog-cxx.m4 | 34 ---------------------------------- 2 files changed, 47 deletions(-) delete mode 100644 cpukit/aclocal/enable-cxx.m4 delete mode 100644 cpukit/aclocal/prog-cxx.m4 (limited to 'cpukit/aclocal') diff --git a/cpukit/aclocal/enable-cxx.m4 b/cpukit/aclocal/enable-cxx.m4 deleted file mode 100644 index 8648743c2d..0000000000 --- a/cpukit/aclocal/enable-cxx.m4 +++ /dev/null @@ -1,13 +0,0 @@ -dnl $Id$ - -AC_DEFUN([RTEMS_ENABLE_CXX], -[ -AC_ARG_ENABLE(cxx, -[AS_HELP_STRING([--enable-cxx], -[enable C++ support and build the rtems++ library])], -[case "${enable_cxx}" in - yes) RTEMS_HAS_CPLUSPLUS=yes ;; - no) RTEMS_HAS_CPLUSPLUS=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for enable-cxx option) ;; -esac], [RTEMS_HAS_CPLUSPLUS=no]) -]) diff --git a/cpukit/aclocal/prog-cxx.m4 b/cpukit/aclocal/prog-cxx.m4 deleted file mode 100644 index 20175ee27c..0000000000 --- a/cpukit/aclocal/prog-cxx.m4 +++ /dev/null @@ -1,34 +0,0 @@ -dnl -dnl $Id$ -dnl -dnl Check for target g++ -dnl - -AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET], -[ -AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl -AC_REQUIRE([RTEMS_ENABLE_CXX]) -RTEMS_CHECK_TOOL(CXX,g++) -if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; -then - CXXFLAGS=${CXXFLAGS-${CFLAGS}} - -dnl Only accept g++ -dnl NOTE: This might be too restrictive -test -z "$CXX" \ - && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) -AC_PROG_CXX -AC_PROG_CXXCPP - - if test "$ac_cv_prog_cc_cross" != "$ac_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 -else -## Work-around to a bug in automake -AM_CONDITIONAL([am__fastdepCXX],[false]) -fi -]) -- cgit v1.2.3