Fix for decoding of utf-16 surrogates. Also remove #include that's not needed

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index e536f89454a570a0f4dbb6cad5cacdc217a6e5b1..b2f779d35ecc0d3c35c930a9c007bcbb73334eca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3870,7 +3870,7 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
     else
         AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
             [
-                AC_TRY_COMPILE([#include <cxxabi.h>],
+                AC_TRY_LINK([#include <cxxabi.h>],
                     [
                         int rc;
                         __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
@@ -4869,8 +4869,13 @@ if test "$wxUSE_STACKWALKER" = "yes"; then
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then
-    AC_DEFINE(wxUSE_DEBUGREPORT)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+    if test "$USE_OS2" = "1"; then
+        AC_MSG_WARN([Creating debug reports not supported under OS/2 yet, disabled])
+        wxUSE_DEBUGREPORT=no
+    else
+        AC_DEFINE(wxUSE_DEBUGREPORT)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+    fi
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then