disabled clipboard and dnd if dataobj is disabled

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

diff --git a/configure.in b/configure.in
index d4a121c1b863267821a9d340f73c667f6990a450..b88c06ef4799b732587870b4cf97deaf60b91aee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5683,6 +5683,14 @@ if test "$wxUSE_IPC" = "yes"; then
     fi
 fi
 
     fi
 fi
 

+if test "$wxUSE_DATAOBJ" = "yes"; then
+    AC_DEFINE(wxUSE_DATAOBJ)
+else
+    AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
+    wxUSE_CLIPBOARD=no
+    wxUSE_DRAG_AND_DROP=no
+fi
+

 if test "$wxUSE_CLIPBOARD" = "yes"; then
     if test "$wxUSE_MGL" = 1; then
         AC_MSG_WARN([Clipboard not yet supported under MGL... disabled])
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     if test "$wxUSE_MGL" = 1; then
         AC_MSG_WARN([Clipboard not yet supported under MGL... disabled])


@@ -5691,9 +5699,6 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
 
     if test "$wxUSE_CLIPBOARD" = "yes"; then
         AC_DEFINE(wxUSE_CLIPBOARD)
 
     if test "$wxUSE_CLIPBOARD" = "yes"; then
         AC_DEFINE(wxUSE_CLIPBOARD)

-
-        dnl required by clipboard code in configuration check
-        AC_DEFINE(wxUSE_DATAOBJ)

     fi
 fi
 
     fi
 fi