fixed <iostream> detection

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index f2e49f4c2c5dba3c9ff6401d4173b7b306737b25..d2e5edc1a5d8910f71d7bc08110c8d50a07d0715 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
 #define wxUSE_IOSTREAMH 1
 EOF
 
       cat >> confdefs.h <<\EOF
 #define wxUSE_IOSTREAMH 1
 EOF
 

-    else
-      :

     fi
 
     ac_ext=c
     fi
 
     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
                 ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
                 ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
             if test "$GCC" = yes ; then
                 ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
                 ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"

diff --git a/configure.in b/configure.in
index db7b9261ab87eade9ecb5070aa86f6769100e9db..9278311d15b409de3d36177f413b90f0f0d9831c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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
-      ifelse([$2], , :, [$2])
-    else
+    if test "$ac_cv_header_iostream" = "yes" ; then

       ifelse([$1], , :, [$1])
       ifelse([$1], , :, [$1])

+    else
+      ifelse([$2], , :, [$2])

     fi
 
     AC_LANG_RESTORE
     fi
 
     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 "$GCC" = yes ; then
                 ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
         if test "$ac_cv_header_ole2_h" = "yes" ; then
             if test "$GCC" = yes ; then
                 ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"