Don't warn about wxMetaFile in configure by default.
Only warn if an explicit --enable-metafile was given, otherwise just turn it on only for the platforms that do support it, similarly to what was done for --enable-hotkey in the previous commit. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
97e477c557
commit
c2d4ceaf57
84
configure
vendored
84
configure
vendored
@ -1804,7 +1804,6 @@ Optional Features:
|
||||
--enable-graphics_ctx use graphics context 2D drawing API
|
||||
--enable-clipboard use wxClipboard class
|
||||
--enable-dnd use Drag'n'Drop classes
|
||||
--enable-metafile use win32 metafiles
|
||||
--disable-controls disable compilation of all standard controls
|
||||
--enable-markup support wxControl::SetLabelMarkup
|
||||
--enable-accel use accelerators
|
||||
@ -1898,7 +1897,7 @@ Optional Features:
|
||||
--enable-busyinfo use wxBusyInfo
|
||||
--enable-hotkey use wxWindow::RegisterHotKey()
|
||||
--enable-joystick use wxJoystick
|
||||
--enable-metafiles use wxMetaFile (Win32 only)
|
||||
--enable-metafiles use wxMetaFile
|
||||
--enable-dragimage use wxDragImage
|
||||
--enable-accessibility enable accessibility support
|
||||
--enable-uiactionsim use wxUIActionSimulator (experimental)
|
||||
@ -2998,6 +2997,7 @@ DEFAULT_wxUSE_OPENGL=auto
|
||||
DEFAULT_wxUSE_MEDIACTRL=auto
|
||||
DEFAULT_wxUSE_COMPILER_TLS=auto
|
||||
DEFAULT_wxUSE_HOTKEY=auto
|
||||
DEFAULT_wxUSE_METAFILE=auto
|
||||
|
||||
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
|
||||
|
||||
@ -9763,50 +9763,6 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
if test x"$enablestring" = xdisable; then
|
||||
defaultval=yes
|
||||
else
|
||||
defaultval=no
|
||||
fi
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
|
||||
# Check whether --enable-metafile was given.
|
||||
if test "${enable_metafile+set}" = set; then
|
||||
enableval=$enable_metafile;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_metafile='wxUSE_METAFILE=yes'
|
||||
else
|
||||
wx_cv_use_metafile='wxUSE_METAFILE=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_metafile"
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_METAFILE = no; then
|
||||
result=yes
|
||||
else
|
||||
result=no
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_METAFILE
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
|
||||
DEFAULT_wxUSE_CONTROLS=none
|
||||
|
||||
@ -47120,6 +47076,23 @@ if test "$wxUSE_METAFILE" = "yes"; then
|
||||
echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;}
|
||||
wxUSE_METAFILE=no
|
||||
fi
|
||||
elif test "$wxUSE_METAFILE" = "auto"; then
|
||||
if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
|
||||
wxUSE_METAFILE=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_METAFILE 1
|
||||
_ACEOF
|
||||
|
||||
if test "$wxUSE_MSW" = 1; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_ENH_METAFILE 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -47256,18 +47229,6 @@ echo "$as_me: WARNING: Some features disabled because OLE headers not found" >&2
|
||||
wxUSE_DATAOBJ=no
|
||||
wxUSE_OLE=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_METAFILE 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_ENH_METAFILE 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_IPC" = "yes"; then
|
||||
@ -48261,13 +48222,6 @@ _ACEOF
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_METAFILE 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MIMETYPE" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_MIMETYPE 1
|
||||
|
||||
29
configure.in
29
configure.in
@ -396,6 +396,7 @@ DEFAULT_wxUSE_OPENGL=auto
|
||||
DEFAULT_wxUSE_MEDIACTRL=auto
|
||||
DEFAULT_wxUSE_COMPILER_TLS=auto
|
||||
DEFAULT_wxUSE_HOTKEY=auto
|
||||
DEFAULT_wxUSE_METAFILE=auto
|
||||
|
||||
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
|
||||
|
||||
@ -862,7 +863,6 @@ dnl ---------------------------------------------------------------------------
|
||||
|
||||
WX_ARG_FEATURE(clipboard, [ --enable-clipboard use wxClipboard class], wxUSE_CLIPBOARD)
|
||||
WX_ARG_FEATURE(dnd, [ --enable-dnd use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
|
||||
WX_ARG_FEATURE(metafile, [ --enable-metafile use win32 metafiles], wxUSE_METAFILE)
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl optional GUI controls (in alphabetical order except the first one)
|
||||
@ -1042,7 +1042,7 @@ WX_ARG_FEATURE(validators, [ --enable-validators use wxValidator and deriv
|
||||
WX_ARG_FEATURE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO)
|
||||
WX_ARG_FEATURE(hotkey, [ --enable-hotkey use wxWindow::RegisterHotKey()], wxUSE_HOTKEY)
|
||||
WX_ARG_FEATURE(joystick, [ --enable-joystick use wxJoystick], wxUSE_JOYSTICK)
|
||||
WX_ARG_FEATURE(metafile, [ --enable-metafiles use wxMetaFile (Win32 only)], wxUSE_METAFILE)
|
||||
WX_ARG_FEATURE(metafile, [ --enable-metafiles use wxMetaFile], wxUSE_METAFILE)
|
||||
WX_ARG_FEATURE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE)
|
||||
WX_ARG_FEATURE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY)
|
||||
WX_ARG_FEATURE(uiactionsim, [ --enable-uiactionsim use wxUIActionSimulator (experimental)], wxUSE_UIACTIONSIMULATOR)
|
||||
@ -6649,7 +6649,7 @@ if test "$wxUSE_SVG" = "yes"; then
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl wxMetafile availability
|
||||
dnl wxMetafile
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
@ -6657,6 +6657,18 @@ if test "$wxUSE_METAFILE" = "yes"; then
|
||||
AC_MSG_WARN([wxMetafile is not available on this system... disabled])
|
||||
wxUSE_METAFILE=no
|
||||
fi
|
||||
elif test "$wxUSE_METAFILE" = "auto"; then
|
||||
if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
|
||||
wxUSE_METAFILE=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_METAFILE)
|
||||
if test "$wxUSE_MSW" = 1; then
|
||||
dnl this one should probably be made separately configurable
|
||||
AC_DEFINE(wxUSE_ENH_METAFILE)
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -6701,13 +6713,6 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
|
||||
wxUSE_DATAOBJ=no
|
||||
wxUSE_OLE=no
|
||||
fi
|
||||
|
||||
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
|
||||
@ -7331,10 +7336,6 @@ if test "$wxUSE_MENUS" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_METAFILE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_METAFILE)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MIMETYPE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_MIMETYPE)
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user