GTK2 port is not experimental anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
54
configure
vendored
54
configure
vendored
@@ -872,7 +872,7 @@ Optional Features:
|
|||||||
--enable-plugins build parts of wxWidgets as loadable components
|
--enable-plugins build parts of wxWidgets as loadable components
|
||||||
--enable-universal use wxWidgets GUI controls instead of native ones
|
--enable-universal use wxWidgets GUI controls instead of native ones
|
||||||
--enable-nanox use NanoX
|
--enable-nanox use NanoX
|
||||||
--enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)
|
--enable-gtk2 use GTK+ 2.0 if available
|
||||||
--enable-gpe use GNOME PDA Environment features if possible
|
--enable-gpe use GNOME PDA Environment features if possible
|
||||||
--enable-shared create shared library code
|
--enable-shared create shared library code
|
||||||
--enable-optimise create optimised code
|
--enable-optimise create optimised code
|
||||||
@@ -951,6 +951,7 @@ Optional Features:
|
|||||||
--enable-loggui use standard GUI logger
|
--enable-loggui use standard GUI logger
|
||||||
--enable-logwin use wxLogWindow
|
--enable-logwin use wxLogWindow
|
||||||
--enable-logdialog use wxLogDialog
|
--enable-logdialog use wxLogDialog
|
||||||
|
--enable-webkit use wxWebKitCtrl (Mac)
|
||||||
--enable-postscript use wxPostscriptDC device context (default for gtk+)
|
--enable-postscript use wxPostscriptDC device context (default for gtk+)
|
||||||
--enable-prologio not available; see contrib
|
--enable-prologio not available; see contrib
|
||||||
--enable-resources not available; see contrib
|
--enable-resources not available; see contrib
|
||||||
@@ -2126,6 +2127,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
|||||||
DEFAULT_wxUSE_MENUS=no
|
DEFAULT_wxUSE_MENUS=no
|
||||||
DEFAULT_wxUSE_MINIFRAME=no
|
DEFAULT_wxUSE_MINIFRAME=no
|
||||||
DEFAULT_wxUSE_HTML=no
|
DEFAULT_wxUSE_HTML=no
|
||||||
|
DEFAULT_wxUSE_WEBKIT=no
|
||||||
DEFAULT_wxUSE_FILESYSTEM=no
|
DEFAULT_wxUSE_FILESYSTEM=no
|
||||||
DEFAULT_wxUSE_FS_INET=no
|
DEFAULT_wxUSE_FS_INET=no
|
||||||
DEFAULT_wxUSE_FS_ZIP=no
|
DEFAULT_wxUSE_FS_ZIP=no
|
||||||
@@ -2309,6 +2311,7 @@ else
|
|||||||
DEFAULT_wxUSE_MENUS=yes
|
DEFAULT_wxUSE_MENUS=yes
|
||||||
DEFAULT_wxUSE_MINIFRAME=yes
|
DEFAULT_wxUSE_MINIFRAME=yes
|
||||||
DEFAULT_wxUSE_HTML=yes
|
DEFAULT_wxUSE_HTML=yes
|
||||||
|
DEFAULT_wxUSE_WEBKIT=yes
|
||||||
DEFAULT_wxUSE_FILESYSTEM=yes
|
DEFAULT_wxUSE_FILESYSTEM=yes
|
||||||
DEFAULT_wxUSE_FS_INET=yes
|
DEFAULT_wxUSE_FS_INET=yes
|
||||||
DEFAULT_wxUSE_FS_ZIP=yes
|
DEFAULT_wxUSE_FS_ZIP=yes
|
||||||
@@ -6535,6 +6538,47 @@ echo "${ECHO_T}no" >&6
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
enablestring=
|
||||||
|
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
|
||||||
|
echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6
|
||||||
|
no_cache=0
|
||||||
|
# Check whether --enable-webkit or --disable-webkit was given.
|
||||||
|
if test "${enable_webkit+set}" = set; then
|
||||||
|
enableval="$enable_webkit"
|
||||||
|
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
ac_cv_use_webkit='wxUSE_WEBKIT=yes'
|
||||||
|
else
|
||||||
|
ac_cv_use_webkit='wxUSE_WEBKIT=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
LINE=`grep "wxUSE_WEBKIT" ${wx_arg_cache_file}`
|
||||||
|
if test "x$LINE" != x ; then
|
||||||
|
eval "DEFAULT_$LINE"
|
||||||
|
else
|
||||||
|
no_cache=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
ac_cv_use_webkit='wxUSE_WEBKIT='$DEFAULT_wxUSE_WEBKIT
|
||||||
|
|
||||||
|
fi;
|
||||||
|
|
||||||
|
eval "$ac_cv_use_webkit"
|
||||||
|
if test "$no_cache" != 1; then
|
||||||
|
echo $ac_cv_use_webkit >> ${wx_arg_cache_file}.tmp
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$wxUSE_WEBKIT" = yes; then
|
||||||
|
echo "$as_me:$LINENO: result: yes" >&5
|
||||||
|
echo "${ECHO_T}yes" >&6
|
||||||
|
else
|
||||||
|
echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
echo "${ECHO_T}no" >&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
enablestring=
|
||||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
|
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
|
||||||
@@ -38016,6 +38060,13 @@ _ACEOF
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "$wxUSE_WEBKIT" = "yes"; then
|
||||||
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
#define wxUSE_WEBKIT 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_MENUS" = "yes"; then
|
if test "$wxUSE_MENUS" = "yes"; then
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define wxUSE_MENUS 1
|
#define wxUSE_MENUS 1
|
||||||
@@ -40585,6 +40636,7 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-precomp-headers or --disable-precomp-headers was given.
|
# Check whether --enable-precomp-headers or --disable-precomp-headers was given.
|
||||||
if test "${enable_precomp_headers+set}" = set; then
|
if test "${enable_precomp_headers+set}" = set; then
|
||||||
enableval="$enable_precomp_headers"
|
enableval="$enable_precomp_headers"
|
||||||
|
@@ -773,7 +773,7 @@ AC_ARG_WITH(microwin, [ --with-microwin use MicroWindows], [wxUSE_
|
|||||||
AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
|
AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
|
||||||
WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX)
|
WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX)
|
||||||
|
|
||||||
WX_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)], wxUSE_GTK2)
|
WX_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available], wxUSE_GTK2)
|
||||||
WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE)
|
WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE)
|
||||||
|
|
||||||
WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
|
WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
|
||||||
|
Reference in New Issue
Block a user