don't try compile wxClipboard without OLE support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
44d5b352ae
commit
2b9bdf7146
129
configure
vendored
129
configure
vendored
@ -17211,7 +17211,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h so it won't be compiled without it" 1>&2
|
||||
echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h, disabled" 1>&2
|
||||
wxUSE_MS_HTML_HELP=no
|
||||
|
||||
fi
|
||||
@ -17267,63 +17267,22 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_IPC" = "yes"; then
|
||||
if test "$wxUSE_SOCKETS" != "yes"; then
|
||||
echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
|
||||
fi
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_IPC 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_CLIPBOARD" = "yes"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_CLIPBOARD 1
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_DATAOBJ 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
if test "$WXGTK12" != 1; then
|
||||
echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MOTIF" = 1; then
|
||||
echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$USE_WIN32" = 1; then
|
||||
|
||||
for ac_hdr in ole2.h
|
||||
if test "$USE_WIN32" = 1; then
|
||||
for ac_hdr in ole2.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:17317: checking for $ac_hdr" >&5
|
||||
echo "configure:17276: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17322 "configure"
|
||||
#line 17281 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:17327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:17286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -17350,34 +17309,80 @@ fi
|
||||
done
|
||||
|
||||
|
||||
if test "$ac_cv_header_ole2_h" = "yes" ; then
|
||||
if test "$GCC" = yes ; then
|
||||
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
|
||||
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
|
||||
LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
|
||||
cat >> confdefs.h <<\EOF
|
||||
if test "$ac_cv_header_ole2_h" = "yes" ; then
|
||||
if test "$GCC" = yes ; then
|
||||
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
|
||||
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
|
||||
LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_OLE 1
|
||||
EOF
|
||||
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
fi
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_DATAOBJ 1
|
||||
EOF
|
||||
|
||||
else
|
||||
echo "configure: warning: Some features disabled because OLE headers not found" 1>&2
|
||||
|
||||
wxUSE_CLIPBOARD=no
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
wxUSE_DATAOBJ=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_METAFILE 1
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_ENH_METAFILE 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_IPC" = "yes"; then
|
||||
if test "$wxUSE_SOCKETS" != "yes"; then
|
||||
echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
|
||||
fi
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_IPC 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_CLIPBOARD" = "yes"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_CLIPBOARD 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
if test "$WXGTK12" != 1; then
|
||||
echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MOTIF" = 1; then
|
||||
echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define wxUSE_DRAG_AND_DROP 1
|
||||
@ -18156,7 +18161,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:18160: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:18165: 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
|
||||
|
||||
65
configure.in
65
configure.in
@ -4011,7 +4011,7 @@ if test "$wxUSE_HELP" = "yes"; then
|
||||
AC_DEFINE(wxUSE_MS_HTML_HELP)
|
||||
],
|
||||
[
|
||||
AC_MSG_WARN(MS HTML Help cannot be used without htmlhelp.h so it won't be compiled without it)
|
||||
AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h, disabled])
|
||||
wxUSE_MS_HTML_HELP=no
|
||||
])
|
||||
fi
|
||||
@ -4053,6 +4053,40 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl IPC: IPC, Drag'n'Drop, Clipboard, ...
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
dnl check for ole headers and disable a few features requiring it if not
|
||||
dnl present (earlier versions of mingw32 don't have ole2.h)
|
||||
if test "$USE_WIN32" = 1; then
|
||||
AC_CHECK_HEADERS(ole2.h)
|
||||
|
||||
if test "$ac_cv_header_ole2_h" = "yes" ; then
|
||||
if test "$GCC" = yes ; then
|
||||
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
|
||||
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
|
||||
LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
|
||||
AC_DEFINE(wxUSE_OLE)
|
||||
|
||||
fi
|
||||
|
||||
dnl for OLE clipboard and dnd
|
||||
AC_DEFINE(wxUSE_DATAOBJ)
|
||||
else
|
||||
AC_MSG_WARN([Some features disabled because OLE headers not found])
|
||||
|
||||
wxUSE_CLIPBOARD=no
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
wxUSE_DATAOBJ=no
|
||||
fi
|
||||
|
||||
dnl this is for MSW only, so we test for it inside "if USE_WIN32"
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_METAFILE)
|
||||
|
||||
dnl this one should probably be made separately configurable
|
||||
AC_DEFINE(wxUSE_ENH_METAFILE)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_IPC" = "yes"; then
|
||||
if test "$wxUSE_SOCKETS" != "yes"; then
|
||||
AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
|
||||
@ -4063,7 +4097,6 @@ fi
|
||||
|
||||
if test "$wxUSE_CLIPBOARD" = "yes"; then
|
||||
AC_DEFINE(wxUSE_CLIPBOARD)
|
||||
AC_DEFINE(wxUSE_DATAOBJ)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
|
||||
@ -4084,34 +4117,6 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$USE_WIN32" = 1; then
|
||||
dnl check for ole headers and disable DnD if not present (earlier
|
||||
dnl versions of mingw32 don't have them)
|
||||
|
||||
AC_CHECK_HEADERS(ole2.h)
|
||||
|
||||
if test "$ac_cv_header_ole2_h" = "yes" ; then
|
||||
if test "$GCC" = yes ; then
|
||||
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
|
||||
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
|
||||
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
|
||||
LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
|
||||
AC_DEFINE(wxUSE_OLE)
|
||||
|
||||
dnl metafiles need the ole code, right?? if not this
|
||||
dnl doesn't need to be in here.
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_METAFILE)
|
||||
dnl this one should probably be made separately configurable
|
||||
AC_DEFINE(wxUSE_ENH_METAFILE)
|
||||
fi
|
||||
fi
|
||||
else
|
||||
AC_MSG_WARN(Drag and drop disabled because OLE headers not found)
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
|
||||
AC_DEFINE(wxUSE_DRAG_AND_DROP)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user