Disable GTK cast checks in wx code

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

diff --git a/configure.in b/configure.in
index 5e6d0068f1028bd95a09ceafa675da31cb627f36..bd4ea494d05fbe564659df3d8f273dc2abaa6b11 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2997,6 +2997,9 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
         GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
 
+        dnl disable GTK runtime type checks
+        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
+
         AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
@@ -4435,21 +4438,24 @@ fi
 
 dnl backtrace() and backtrace_symbols() for wxStackWalker
 if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
-    AC_LANG_PUSH(C++)
-    AC_SEARCH_LIBS(backtrace, execinfo,
-        [AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
-            [AC_TRY_LINK([#include <execinfo.h>],
+    AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
+        [
+            AC_LANG_PUSH(C++)
+            AC_TRY_COMPILE([#include <execinfo.h>],
                 [
                     void *trace[1];
                     char **messages;
+
                     backtrace(trace, 1);
                     messages = backtrace_symbols(trace, 1);
                 ],
                 wx_cv_func_backtrace=yes,
                 wx_cv_func_backtrace=no
-            )]
-        )],
-        wx_cv_func_backtrace=no)
+            )
+            AC_LANG_POP()
+        ]
+    )
+
 
     if test "$wx_cv_func_backtrace" = "no"; then
         AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available])
@@ -4457,6 +4463,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_LANG_PUSH(C++)
                 AC_TRY_LINK([#include <cxxabi.h>],
                     [
                         int rc;
@@ -4465,6 +4472,7 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
                     wx_cv_func_cxa_demangle=yes,
                     wx_cv_func_cxa_demangle=no
                 )
+                AC_LANG_POP()
             ]
         )
 
@@ -4472,7 +4480,6 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
             AC_DEFINE(HAVE_CXA_DEMANGLE)
         fi
     fi
-    AC_LANG_POP()
 fi
 
 if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then