Revert r67137.

GTK_DISABLE_SINGLE_INCLUDES causes trouble with other included
libraries (libgnomeprint this time) too. This check for trivially fixed
problems is not worth the continuing trouble.

Fixes #13078.

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

diff --git a/configure b/configure
index fb29f08cb98a97ef0878ebecc4b17f1472450c64..72979f91e0e94de1ea29281b25d52e38d6fee045 100755 (executable)
--- a/configure
+++ b/configure
@@ -30954,9 +30954,6 @@ done
 
                 TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
 
-                GTK_CHECKS_FLAGS="-DGTK_DISABLE_SINGLE_INCLUDES"
-        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $GTK_CHECKS_FLAGS"
-
         AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST

diff --git a/configure.in b/configure.in
index 2ab4a20ac2a33f39300d97eb155d445e6010d457..cf52e22b54e4d7c6c8b6b4b3e540460e93ccd6fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3101,10 +3101,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
         dnl disable GTK runtime type checks
         TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
 
-        dnl enable useful GTK+ compile-time checks to ease transition to GTK+ 3:
-        GTK_CHECKS_FLAGS="-DGTK_DISABLE_SINGLE_INCLUDES"
-        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $GTK_CHECKS_FLAGS"
-
         AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST