fixed all the other ports broken by controls labels in wxToolBar patch commit

[wxWidgets.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index d2fb3cda6f4f4a32bcf6de799444b96180eff956..4c86f58ec728b9eb936478ebb1f11c1056423ad8 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 

-    AC_CHECK_HEADERS(iostream)
+    AC_CHECK_HEADER(iostream,,, [ ])

 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])


@@ -544,7 +544,7 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
             dnl to use it for cygwin/mingw32, keep in mind that replacing last
             dnl comma with the equal sign works) so
             dnl simply disable it
             dnl to use it for cygwin/mingw32, keep in mind that replacing last
             dnl comma with the equal sign works) so
             dnl simply disable it

-            found_versioning=no
+            wx_cv_version_script=no

             ;;
 
         *)
             ;;
 
         *)