Changeset 51ca358 in rtems for testsuites/samples/configure.ac


Ignore:
Timestamp:
May 10, 2004, 4:02:11 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
92166f37
Parents:
e12ba0e
Message:

2004-05-10 Ralf Corsepius <ralf_corsepius@…>

  • 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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • testsuites/samples/configure.ac

    re12ba0e r51ca358  
    2424
    2525RTEMS_PROG_CXX_FOR_TARGET
    26 
    2726RTEMS_CANONICALIZE_TOOLS
    2827
     
    3231RTEMS_CHECK_NETWORKING
    3332
    34 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
    35 AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes")
    36 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
     33
     34CXXTESTS=$HAS_CPLUSPLUS
     35AS_IF([test $HAS_CPLUSPLUS = yes],[
     36  AC_LANG_PUSH([C++])
     37  AC_CHECK_HEADERS([cstdio cstdlib iostream],[],[CXXTESTS=no])
     38  AC_CACHE_CHECK(
     39  [if iostream supports std:: namespace],
     40  [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE],
     41  [AC_COMPILE_IFELSE(
     42    [AC_LANG_PROGRAM(
     43      [[#include <iostream>]],
     44      [[std::cout << "hello" << std::endl;]])
     45    ],
     46    [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE=yes],
     47    [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE=no])
     48  ])
     49  AS_IF([test $rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE = no],[CXXTESTS=no])
     50  AS_IF([test $CXXTESTS = no],[
     51    AC_MSG_WARN([disabling C++ tests])
     52  ])
     53  AC_LANG_POP
     54])
     55
     56AM_CONDITIONAL([CXXTESTS],[test $CXXTESTS = "yes"])
     57AM_CONDITIONAL(NETTESTS,test "$HAS_NETWORKING" = "yes")
     58AM_CONDITIONAL(MPTESTS,test "$HAS_MP" = "yes")
     59
    3760#FIXME: We should use a feature based check
    3861AM_CONDITIONAL(LIBCHIP,[test "$RTEMS_BSP_FAMILY" != "posix"])
     
    5174base_mp/node1/Makefile
    5275base_mp/node2/Makefile
     76iostream/Makefile
    5377cdtest/Makefile
    5478pppd/Makefile
Note: See TracChangeset for help on using the changeset viewer.