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
This commit is contained in:
6
configure
vendored
6
configure
vendored
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user