COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEB_1
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEB_1
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
COND_MONOLITHIC_0_USE_RIBBON_1
COND_MONOLITHIC_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_USE_STC_1
-COND_MONOLITHIC_0_USE_WEB_1
+COND_MONOLITHIC_0_USE_WEBVIEW_1
COND_MONOLITHIC_0_USE_XRC_1
COND_MONOLITHIC_1
COND_MONOLITHIC_1_SHARED_0
--enable-mdidoc use docview architecture with MDI
--enable-mediactrl use wxMediaCtrl class
--enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
- --enable-webkit use wxWebKitCtrl (Mac)
--enable-richtext use wxRichTextCtrl
--enable-postscript use wxPostscriptDC device context (default for gtk+)
--enable-printarch use printing architecture
--enable-svg use wxSVGFileDC device context
- --enable-web use wxWeb library
+ --enable-webkit use wxWebKitCtrl (Mac-only, use wxWebView instead)
+ --enable-webview use wxWebView library
--enable-graphics_ctx use graphics context 2D drawing API
--enable-clipboard use wxClipboard class
--enable-dnd use Drag'n'Drop classes
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}-webkit" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
- # Check whether --enable-webkit was given.
-if test "${enable_webkit+set}" = set; then
- enableval=$enable_webkit;
- if test "$enableval" = yes; then
- wx_cv_use_webkit='wxUSE_WEBKIT=yes'
- else
- wx_cv_use_webkit='wxUSE_WEBKIT=no'
- fi
-
-else
-
- wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_webkit"
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_WEBKIT = no; then
- result=yes
- else
- result=no
- fi
- else
- result=$wxUSE_WEBKIT
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-web" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-web... $ECHO_C" >&6; }
- # Check whether --enable-web was given.
-if test "${enable_web+set}" = set; then
- enableval=$enable_web;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
+ # Check whether --enable-webkit was given.
+if test "${enable_webkit+set}" = set; then
+ enableval=$enable_webkit;
if test "$enableval" = yes; then
- wx_cv_use_web='wxUSE_WEB=yes'
+ wx_cv_use_webkit='wxUSE_WEBKIT=yes'
else
- wx_cv_use_web='wxUSE_WEB=no'
+ wx_cv_use_webkit='wxUSE_WEBKIT=no'
fi
else
- wx_cv_use_web='wxUSE_WEB=${'DEFAULT_wxUSE_WEB":-$defaultval}"
+ wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
fi
- eval "$wx_cv_use_web"
+ eval "$wx_cv_use_webkit"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_WEB = no; then
+ if test $wxUSE_WEBKIT = no; then
result=yes
else
result=no
fi
else
- result=$wxUSE_WEB
+ result=$wxUSE_WEBKIT
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+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}-webview" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-webview... $ECHO_C" >&6; }
+ # Check whether --enable-webview was given.
+if test "${enable_webview+set}" = set; then
+ enableval=$enable_webview;
+ if test "$enableval" = yes; then
+ wx_cv_use_webview='wxUSE_WEBVIEW=yes'
+ else
+ wx_cv_use_webview='wxUSE_WEBVIEW=no'
+ fi
+
+else
+
+ wx_cv_use_webview='wxUSE_WEBVIEW=${'DEFAULT_wxUSE_WEBVIEW":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_webview"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_WEBVIEW = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_WEBVIEW
fi
{ echo "$as_me:$LINENO: result: $result" >&5
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
int
main ()
{
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+ #include <stdio.h>
int
main ()
{
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
;
return 0;
}
\
/usr/openwin/share/include"
-{ echo "$as_me:$LINENO: checking for libraries directory" >&5
-echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for libraries directories" >&5
+echo $ECHO_N "checking for libraries directories... $ECHO_C" >&6; }
case "${host}" in
*-*-irix6* )
fi
done
done
- if test "x$wx_cv_std_libpath" = "x"; then
- wx_cv_std_libpath="lib"
- fi
fi
*-*-solaris2* )
if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
wx_cv_std_libpath="lib/64"
- else
- wx_cv_std_libpath="lib"
fi
;;
*-*-linux* )
- if test "$ac_cv_sizeof_void_p" = 8 -a \
- -d "/usr/lib64" -a ! -h "/usr/lib64"; then
- wx_cv_std_libpath="lib64"
+ if test "$ac_cv_sizeof_void_p" = 8; then
+ if test -d "/usr/lib/`uname -m`-linux-gnu"; then
+ wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu"
+ elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+ wx_cv_std_libpath="lib64"
+ fi
else
- wx_cv_std_libpath="lib"
+ case "${host}" in
+ i*86-*-linux* )
+ if test -d '/usr/lib/i386-linux-gnu'; then
+ wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu'
+ fi
+ esac
fi
- ;;
- *)
- wx_cv_std_libpath="lib";
+ if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then
+ wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib"
+ fi
;;
esac
-{ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
-echo "${ECHO_T}$wx_cv_std_libpath" >&6; }
+if test -z "$wx_cv_std_libpath"; then
+ wx_cv_std_libpath="lib"
+fi
+
+if test -z "$wx_cv_std_libfullpath"; then
+ wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath"
+fi
+
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+{ echo "$as_me:$LINENO: result: $wx_cv_std_libfullpath" >&5
+echo "${ECHO_T}$wx_cv_std_libfullpath" >&6; }
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
if test "$build" != "$host" -a "$GCC" = yes; then
if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
fi
fi
-if test "$wxUSE_TREECTRL" = "yes"; then
+if test "$wxUSE_TREELISTCTRL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_TREELISTCTRL 1
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
fi
-USE_WEB=0
-if test "$wxUSE_WEB" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEB 1
-_ACEOF
-
- USE_WEB=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
-
- if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 1
-_ACEOF
-
- { echo "$as_me:$LINENO: checking for webkitgtk libraries" >&5
+if test "$wxUSE_WEBVIEW" = "yes"; then
+ USE_WEBVIEW_WEBKIT=0
+ if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
+ if test "$wxUSE_GTK" = 1; then
+ { echo "$as_me:$LINENO: checking for webkitgtk libraries" >&5
echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
ac_find_libraries=
done
done
- if test "$ac_find_libraries" != "" ; then
+ if test "$ac_find_libraries" != "" ; then
if test "$ac_find_libraries" = "default location"; then
ac_path_to_link=""
fi
fi
- if test "$ac_path_to_link" != " -L/usr/lib" ; then
- LDFLAGS="$LDFLAGS $ac_path_to_link"
- fi
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
- { echo "$as_me:$LINENO: result: yes" >&5
+ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS="$LDFLAGS $ac_path_to_link"
+ fi
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
+ { 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; }
- { echo "$as_me:$LINENO: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&5
-echo "$as_me: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&2;}
- wxUSE_WEBVIEW_WEBKIT="no"
- fi
- { echo "$as_me:$LINENO: checking for webkitgtk includes" >&5
-echo $ECHO_N "checking for webkitgtk includes... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for webkitgtk headers" >&5
+echo $ECHO_N "checking for webkitgtk headers... $ECHO_C" >&6; }
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE /usr/include/webkit-1.0 /usr/include
fi
done
- if test "$ac_find_includes" != "" ; then
- { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
+ if test "$ac_find_includes" != "" ; then
+ { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
echo "${ECHO_T}found in $ac_find_includes" >&6; }
if test "x$ac_find_includes" = "x/usr/include"; then
fi
fi
- CPPFLAGS="$ac_path_to_include $CPPFLAGS"
- else
- { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
- fi
- { echo "$as_me:$LINENO: checking for libsoup includes" >&5
-echo $ECHO_N "checking for libsoup includes... $ECHO_C" >&6; }
+ CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+
+ { echo "$as_me:$LINENO: checking for libsoup headers" >&5
+echo $ECHO_N "checking for libsoup headers... $ECHO_C" >&6; }
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE /usr/include/libsoup-2.4 /usr/include
fi
done
- if test "$ac_find_includes" != "" ; then
- { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
+ if test "$ac_find_includes" != "" ; then
+ { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
echo "${ECHO_T}found in $ac_find_includes" >&6; }
if test "x$ac_find_includes" = "x/usr/include"; then
fi
fi
- CPPFLAGS="$ac_path_to_include $CPPFLAGS"
- else
- { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
- fi
- fi
+ CPPFLAGS="$ac_path_to_include $CPPFLAGS"
- if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-x objective-c++ $CPPFLAGS"
- { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5
+ USE_WEBVIEW_WEBKIT=1
+ else
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+ { echo "$as_me:$LINENO: WARNING: libsoup headers not found; disabling WebKit backend" >&5
+echo "$as_me: WARNING: libsoup headers not found; disabling WebKit backend" >&2;}
+ fi
+ else
+ { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+ { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling WebKit backend" >&5
+echo "$as_me: WARNING: WebKit headers not found; disabling WebKit backend" >&2;}
+ fi
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: WebKit libraries not found; disabling WebKit backend" >&5
+echo "$as_me: WARNING: WebKit libraries not found; disabling WebKit backend" >&2;}
+ fi
+ elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="-x objective-c++ $CPPFLAGS"
+ { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5
echo $ECHO_N "checking for WebKit/HIWebView.h... $ECHO_C" >&6; }
if test "${ac_cv_header_WebKit_HIWebView_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <Carbon/Carbon.h>
- #include <WebKit/WebKit.h>
+ #include <Carbon/Carbon.h>
+ #include <WebKit/WebKit.h>
#include <WebKit/HIWebView.h>
echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6; }
if test $ac_cv_header_WebKit_HIWebView_h = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBVIEW_WEBKIT 1
-_ACEOF
-
- WEBKIT_LINK="-framework WebKit"
+ USE_WEBVIEW_WEBKIT=1
+ WEBKIT_LINK="-framework WebKit"
else
- { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&5
-echo "$as_me: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&2;}
- wxUSE_WEBVIEW_WEBKIT=no
+ { echo "$as_me:$LINENO: WARNING: WebKit headers not found" >&5
+echo "$as_me: WARNING: WebKit headers not found" >&2;}
fi
- CPPFLAGS="$old_CPPFLAGS"
- elif test "$wxUSE_OLD_COCOA" = 1; then
- cat >>confdefs.h <<\_ACEOF
+ CPPFLAGS="$old_CPPFLAGS"
+ fi
+ fi
+
+ wxUSE_WEBVIEW="no"
+ if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then
+ if test "$USE_WEBVIEW_WEBKIT" = 1; then
+ wxUSE_WEBVIEW="yes"
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 1
_ACEOF
- else
- wxUSE_WEBVIEW_WEBKIT=no
+ else
+ { echo "$as_me:$LINENO: WARNING: WebKit not available, disabling wxWebView" >&5
+echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;}
+ fi
+ elif test "$wxUSE_MSW" = 1; then
+ if test "wxUSE_WEBVIEW_IE" = "yes"; then
+ wxUSE_WEBVIEW="yes"
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW_IE 1
+_ACEOF
+
+ fi
fi
fi
+if test "$wxUSE_WEBVIEW" = "yes"; then
+ USE_WEBVIEW=1
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+else
+ USE_WEBVIEW=0
+fi
+
if test "$wxUSE_IMAGE" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
if test "$wxUSE_STC" = "yes" ; then
BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
fi
- if test "$wxUSE_WEB" = "yes" ; then
- STD_GUI_LIBS="web $STD_GUI_LIBS"
- BUILT_WX_LIBS="web $BUILT_WX_LIBS"
+ if test "$wxUSE_WEBVIEW" = "yes" ; then
+ STD_GUI_LIBS="webview $STD_GUI_LIBS"
+ BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
fi
if test "$wxUSE_XRC" = "yes" ; then
STD_GUI_LIBS="xrc $STD_GUI_LIBS"
fi
- { echo "$as_me:$LINENO: checking for command to install directories" >&5
-echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; }
- INSTALL_TEST_DIR=acbftest$$
- $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
- if test $? = 0 -a -d $INSTALL_TEST_DIR; then
- rmdir $INSTALL_TEST_DIR
- INSTALL_DIR='$(INSTALL) -d'
- { echo "$as_me:$LINENO: result: $INSTALL -d" >&5
-echo "${ECHO_T}$INSTALL -d" >&6; }
- else
- INSTALL_DIR="mkdir -p"
- { echo "$as_me:$LINENO: result: mkdir -p" >&5
-echo "${ECHO_T}mkdir -p" >&6; }
- fi
+ INSTALL_DIR="mkdir -p"
LDFLAGS_GUI=
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
fi
- COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEB_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEB" = "x1" ; then
- COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEB_1=""
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1=""
fi
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
fi
- COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEB_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEB" = "x1" ; then
- COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEB_1=""
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1=""
fi
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
COND_MONOLITHIC_0_USE_STC_1=""
fi
- COND_MONOLITHIC_0_USE_WEB_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$USE_WEB" = "x1" ; then
- COND_MONOLITHIC_0_USE_WEB_1=""
+ COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
+ COND_MONOLITHIC_0_USE_WEBVIEW_1=""
fi
COND_MONOLITHIC_0_USE_XRC_1="#"
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEB_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEB_1$ac_delim
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEB_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEB_1$ac_delim
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_USE_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_1$ac_delim
COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
-COND_MONOLITHIC_0_USE_WEB_1!$COND_MONOLITHIC_0_USE_WEB_1$ac_delim
+COND_MONOLITHIC_0_USE_WEBVIEW_1!$COND_MONOLITHIC_0_USE_WEBVIEW_1$ac_delim
COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim
COND_MONOLITHIC_1!$COND_MONOLITHIC_1$ac_delim
COND_MONOLITHIC_1_SHARED_0!$COND_MONOLITHIC_1_SHARED_0$ac_delim
projects / wxWidgets.git / blobdiff