From f91544e61336d5ad0f8635fb38179f236f522e7a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 19 Oct 2013 12:05:47 +0000
Subject: [PATCH] Disable wxDataObject in wxDFB build at configure level.

Otherwise we'd just get an error when compiling wx/dfb/chkconf.h later.

Closes #15594.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure    | 8 +++++++-
 configure.in | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index c1d57af4fd..44ef5ddd8e 100755
--- a/configure
+++ b/configure
@@ -35824,8 +35824,14 @@ $as_echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    $as_echo "#define wxUSE_DATAOBJ 1" >>confdefs.h
+    if test "$wxUSE_DFB" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
+$as_echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
+        wxUSE_DATAOBJ=no
+    else
+        $as_echo "#define wxUSE_DATAOBJ 1" >>confdefs.h
 
+    fi
 else
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5
 $as_echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;}
diff --git a/configure.in b/configure.in
index 7d28dd00ec..33832fe8c9 100644
--- a/configure.in
+++ b/configure.in
@@ -6544,7 +6544,12 @@ if test "$wxUSE_IPC" = "yes"; then
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    AC_DEFINE(wxUSE_DATAOBJ)
+    if test "$wxUSE_DFB" = 1; then
+        AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
+        wxUSE_DATAOBJ=no
+    else
+        AC_DEFINE(wxUSE_DATAOBJ)
+    fi
 else
     AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
     wxUSE_CLIPBOARD=no