diff --git a/configure.in b/configure.in index 4ec69caf89..8985f44960 100644 --- a/configure.in +++ b/configure.in @@ -476,6 +476,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MENUS=no DEFAULT_wxUSE_MINIFRAME=no DEFAULT_wxUSE_HTML=no + DEFAULT_wxUSE_WEBKIT=no DEFAULT_wxUSE_FILESYSTEM=no DEFAULT_wxUSE_FS_INET=no DEFAULT_wxUSE_FS_ZIP=no @@ -659,6 +660,7 @@ else DEFAULT_wxUSE_MENUS=yes DEFAULT_wxUSE_MINIFRAME=yes DEFAULT_wxUSE_HTML=yes + DEFAULT_wxUSE_WEBKIT=yes DEFAULT_wxUSE_FILESYSTEM=yes DEFAULT_wxUSE_FS_INET=yes DEFAULT_wxUSE_FS_ZIP=yes @@ -915,6 +917,7 @@ WX_ARG_ENABLE(mdidoc, [ --enable-mdidoc use docview architecture w WX_ARG_ENABLE(loggui, [ --enable-loggui use standard GUI logger], wxUSE_LOGGUI) WX_ARG_ENABLE(logwin, [ --enable-logwin use wxLogWindow], wxUSE_LOGWINDOW) WX_ARG_ENABLE(logdialog, [ --enable-logdialog use wxLogDialog], wxUSE_LOGDIALOG) +WX_ARG_ENABLE(webkit, [ --enable-webkit use wxWebKitCtrl (Mac)], wxUSE_WEBKIT) dnl --------------------------------------------------------------------------- dnl PostScript options @@ -5630,6 +5633,10 @@ if test "$wxUSE_HTML" = "yes"; then fi fi +if test "$wxUSE_WEBKIT" = "yes"; then + AC_DEFINE(wxUSE_WEBKIT) +fi + if test "$wxUSE_MENUS" = "yes"; then AC_DEFINE(wxUSE_MENUS) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" diff --git a/setup.h.in b/setup.h.in index b37e9917e7..b746329504 100644 --- a/setup.h.in +++ b/setup.h.in @@ -907,6 +907,11 @@ */ #define wxUSE_HTML 0 +/* + * wxWebKitCtrl + */ +#define wxUSE_WEBKIT 0 + /* * (virtual) filesystems code */