generalized fix for clipboard code compilation configuration check

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

diff --git a/configure b/configure
index 4fc7628b62d842ca4e7df97ac1ce32f7acd211c8..aa354609768c57f32379b86039d9495694b58ac2 100755 (executable)
--- a/configure
+++ b/configure
@@ -17364,12 +17364,10 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
 EOF
 
 
-    if test "$wxUSE_GTK" = 1; then
-                cat >> confdefs.h <<\EOF
+        cat >> confdefs.h <<\EOF
 #define wxUSE_DATAOBJ 1
 EOF
 
-    fi
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
@@ -18168,7 +18166,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:18172: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18170: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 14acf4f21e056ef47093c809e067ea516581dec0..f9383cabb7a4ee6c228435595ae177bccb5ca24a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4098,10 +4098,8 @@ fi
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     AC_DEFINE(wxUSE_CLIPBOARD)
 
-    if test "$wxUSE_GTK" = 1; then
-        dnl required by clipboard code in wxGTK
-        AC_DEFINE(wxUSE_DATAOBJ)
-    fi
+    dnl required by clipboard code in configuration check
+    AC_DEFINE(wxUSE_DATAOBJ)
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then