diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-05-10 16:02:11 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-05-10 16:02:11 +0000 |
| commit | 51ca358ac75271c6ddd10cc0fd2460ba88a45015 (patch) | |
| tree | 18a995a3fd2833223c849c39e6e0af8b066dcda5 /testsuites/samples/configure.ac | |
| parent | 2004-05-10 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-51ca358ac75271c6ddd10cc0fd2460ba88a45015.tar.bz2 | |
2004-05-10 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Add CXX-checks. New conditionals CXXTESTS, MPTESTS,
NETTESTS. Add iostream/.
* Makefile.am, base_mp/node1/Makefile.am, base_mp/node2/Makefile.am
cdtest/Makefile.am, loopback/Makefile.am, pppd/Makefile.am:
Reflect changes above.
* cdtest/main.cc: Adaptation to new C++ standards.
Diffstat (limited to '')
| -rw-r--r-- | testsuites/samples/configure.ac | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/testsuites/samples/configure.ac b/testsuites/samples/configure.ac index ef1a0b059e..862b37a6c9 100644 --- a/testsuites/samples/configure.ac +++ b/testsuites/samples/configure.ac @@ -23,7 +23,6 @@ RTEMS_PROJECT_ROOT RTEMS_PROG_CC_FOR_TARGET RTEMS_PROG_CXX_FOR_TARGET - RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) @@ -31,9 +30,33 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_CXX(RTEMS_BSP) RTEMS_CHECK_NETWORKING -AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") + +CXXTESTS=$HAS_CPLUSPLUS +AS_IF([test $HAS_CPLUSPLUS = yes],[ + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([cstdio cstdlib iostream],[],[CXXTESTS=no]) + AC_CACHE_CHECK( + [if iostream supports std:: namespace], + [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <iostream>]], + [[std::cout << "hello" << std::endl;]]) + ], + [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE=yes], + [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE=no]) + ]) + AS_IF([test $rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE = no],[CXXTESTS=no]) + AS_IF([test $CXXTESTS = no],[ + AC_MSG_WARN([disabling C++ tests]) + ]) + AC_LANG_POP +]) + +AM_CONDITIONAL([CXXTESTS],[test $CXXTESTS = "yes"]) +AM_CONDITIONAL(NETTESTS,test "$HAS_NETWORKING" = "yes") +AM_CONDITIONAL(MPTESTS,test "$HAS_MP" = "yes") + #FIXME: We should use a feature based check AM_CONDITIONAL(LIBCHIP,[test "$RTEMS_BSP_FAMILY" != "posix"]) @@ -50,6 +73,7 @@ unlimited/Makefile base_mp/Makefile base_mp/node1/Makefile base_mp/node2/Makefile +iostream/Makefile cdtest/Makefile pppd/Makefile ]) |