Added --enable-webkit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 4ec69caf89f1479bbc1810e561a9c918935e76ab..8985f44960db54ef34c3f4cd9830713714701f5f 100644 (file)
--- 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_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
   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_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
   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(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
 
 dnl ---------------------------------------------------------------------------
 dnl PostScript options


@@ -5630,6 +5633,10 @@ if test "$wxUSE_HTML" = "yes"; then
     fi
 fi
 
     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"
 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 b37e9917e71e5756af20ce9aaab68191d944235c..b746329504ea561f144720a9c5e3bc648a8f4061 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -907,6 +907,11 @@
  */
 #define wxUSE_HTML 0
 
  */
 #define wxUSE_HTML 0
 

+/*
+ * wxWebKitCtrl
+ */
+#define wxUSE_WEBKIT 0
+

 /*
  * (virtual) filesystems code
  */
 /*
  * (virtual) filesystems code
  */