diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-01-11 14:37:24 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-01-23 10:50:19 +0100 |
| commit | 9bf3a868655f260c2fa6cbcab16f0218cf53e5b8 (patch) | |
| tree | 1d037991d58c72c56ce9595345c69857db494b8a /cpukit/aclocal | |
| parent | Support custom Makefiles. (diff) | |
| download | rtems-9bf3a868655f260c2fa6cbcab16f0218cf53e5b8.tar.bz2 | |
Google C++ Testing Framework 1.6.0.
Diffstat (limited to 'cpukit/aclocal')
| -rw-r--r-- | cpukit/aclocal/enable-cxx.m4 | 13 | ||||
| -rw-r--r-- | cpukit/aclocal/prog-cxx.m4 | 34 |
2 files changed, 47 insertions, 0 deletions
diff --git a/cpukit/aclocal/enable-cxx.m4 b/cpukit/aclocal/enable-cxx.m4 new file mode 100644 index 0000000000..8648743c2d --- /dev/null +++ b/cpukit/aclocal/enable-cxx.m4 @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000000..20175ee27c --- /dev/null +++ b/cpukit/aclocal/prog-cxx.m4 @@ -0,0 +1,34 @@ +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 +]) |