Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed <iostream> detection

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-19 12:12:27 +00:00
parent d6e969f677
commit 57fe5ed056
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -10867,13 +10867,13 @@ fi
done done
if test "x$HAVE_IOSTREAM" = x ; then if test "$ac_cv_header_iostream" = "yes" ; then
:
else
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define wxUSE_IOSTREAMH 1 #define wxUSE_IOSTREAMH 1
EOF EOF
else
:
fi fi
ac_ext=c ac_ext=c
@@ -15339,7 +15339,7 @@ fi
done done
if test "$ac_cv_header_ole2_h" = "yes" ; then if test "$ac_cv_header_ole2_h" = "yes" ; then
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)" ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"

9
configure.in
View File

@@ -184,10 +184,10 @@ AC_DEFUN(WX_CPP_NEW_HEADERS,
AC_CHECK_HEADERS(iostream) AC_CHECK_HEADERS(iostream)
if test "x$HAVE_IOSTREAM" = x ; then if test "$ac_cv_header_iostream" = "yes" ; then
ifelse([$2], , :, [$2])
else
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])
else
ifelse([$2], , :, [$2])
fi fi
AC_LANG_RESTORE AC_LANG_RESTORE
@@ -3760,9 +3760,6 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
AC_CHECK_HEADERS(ole2.h) AC_CHECK_HEADERS(ole2.h)
dnl for some reason this test always fails here??
dnl if test "x$HAVE_OLE2_H" != x ; then
dnl this one does the right thing though
if test "$ac_cv_header_ole2_h" = "yes" ; then if test "$ac_cv_header_ole2_h" = "yes" ; then
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"