summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-04-04 18:28:05 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-04-04 18:28:05 +0000
commit6d383cd95d34a8fa4ff47d3d2c45fe17e9db20d7 (patch)
tree783abc0f0a2720bce69d7efe26d2c902715b2c2d
parent8636ad37e0527cf965cfe56e81484087031ff2d1 (diff)
downloadATCD-6d383cd95d34a8fa4ff47d3d2c45fe17e9db20d7.tar.gz
Fri Apr 4 18:27:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/configure.ac8
2 files changed, 10 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 669374d8824..725d4a793cf 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Fri Apr 4 18:27:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * configure.ac:
+ Fixed iostream detection. This fixes bugzilla 3288
+ This to Thomas Girard <thomas dot g dot girard at free dot fr>
+ for reporting this.
+
Thu Apr 3 14:13:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_vxworks5.5.x.GNU:
diff --git a/ACE/configure.ac b/ACE/configure.ac
index d136a7c8e5d..19e1b1622f9 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -1013,11 +1013,9 @@ AC_CHECK_HEADER([memory],,)
dnl Check for availablity of "new style" C++ stream headers
AC_CHECK_HEADERS([iomanip ios iostream istream ostream fstream streambuf],
,
- [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])])
-
-AC_CHECK_HEADER([iostream.h],
- [AC_CHECK_HEADER([fstream.h],,[AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])],
- [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])
+ [AC_CHECK_HEADERS([iostream.h fstream.h],
+ [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])],
+ [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])])
dnl Check if platform needs to #include <regexpr.h> for
dnl regular expression support