Mercurial > octave-libtiff
comparison m4/acinclude.m4 @ 21183:e7fda94aec6b
eliminate OCTAVE_CXX_ISO_COMPLIANT_LIBRARY macro
* m4/acinclude.m4 (OCTAVE_CXX_ISO_COMPLIANT_LIBRARY):
Delete macro definition.
* configure.ac: Don't use it.
* c-file-ptr-stream.h, c-file-ptr-stream.cc, oct-fstrm.cc:
Always assume CXX_ISO_COMPLIANT_LIBRARY is true.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 03 Feb 2016 16:50:38 -0500 |
parents | b5b531ba93ce |
children | f569ba0ee237 |
comparison
equal
deleted
inserted
replaced
21182:82a44483dbff | 21183:e7fda94aec6b |
---|---|
1455 [CXXFLAGS="$CXXFLAGS $1" | 1455 [CXXFLAGS="$CXXFLAGS $1" |
1456 AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2]) | 1456 AC_MSG_RESULT([adding $1 to CXXFLAGS])], [$2]) |
1457 else | 1457 else |
1458 AC_MSG_RESULT([no]) | 1458 AC_MSG_RESULT([no]) |
1459 ifelse([$3], , , [$3]) | 1459 ifelse([$3], , , [$3]) |
1460 fi | |
1461 ]) | |
1462 dnl | |
1463 dnl Check if the C++ library is ISO compliant. | |
1464 dnl FIXME: This is obviously very simplistic, and trivially fooled. | |
1465 dnl | |
1466 AC_DEFUN([OCTAVE_CXX_ISO_COMPLIANT_LIBRARY], [ | |
1467 AC_REQUIRE([AC_PROG_CXX]) | |
1468 AC_MSG_CHECKING([if C++ library is ISO compliant]) | |
1469 AC_CACHE_VAL([octave_cv_cxx_iso_compliant_library], | |
1470 [AC_LANG_PUSH(C++) | |
1471 rm -f conftest.h | |
1472 ## Omitting cwctype for now, since it is broken with gcc-3.0.x and | |
1473 ## possibly other versions... | |
1474 for inc in algorithm bitset cassert cctype cerrno cfloat ciso646 \ | |
1475 climits clocale cmath complex csetjmp csignal cstdarg cstddef \ | |
1476 cstdio cstdlib cstring ctime cwchar deque exception \ | |
1477 fstream functional iomanip ios iosfwd iostream istream iterator \ | |
1478 limits list locale map memory new numeric ostream queue set \ | |
1479 sstream stack stdexcept streambuf string strstream typeinfo \ | |
1480 utility valarray vector; do | |
1481 echo "#include <$inc>" >> conftest.h | |
1482 done | |
1483 AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | |
1484 #include "conftest.h" | |
1485 ]], [[ | |
1486 std::bitset<50> flags; | |
1487 flags.set(); | |
1488 int digits = std::numeric_limits<unsigned long>::digits; | |
1489 digits = 0; | |
1490 ]])], | |
1491 octave_cv_cxx_iso_compliant_library=yes, | |
1492 octave_cv_cxx_iso_compliant_library=no) | |
1493 AC_LANG_POP(C++) | |
1494 ]) | |
1495 AC_MSG_RESULT([$octave_cv_cxx_iso_compliant_library]) | |
1496 if test $octave_cv_cxx_iso_compliant_library = yes; then | |
1497 AC_DEFINE(CXX_ISO_COMPLIANT_LIBRARY, 1, | |
1498 [Define to 1 if your C++ runtime library is ISO compliant.]) | |
1499 fi | 1460 fi |
1500 ]) | 1461 ]) |
1501 dnl | 1462 dnl |
1502 dnl Allow the user disable support for command line editing using GNU | 1463 dnl Allow the user disable support for command line editing using GNU |
1503 dnl readline. | 1464 dnl readline. |