Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update configure to only define wxUSE_WEBVIEW_WEBKIT if all the required components are available.

Browse Source 
Fixes #13474

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-14 14:03:34 +00:00
parent 4794f127cd
commit 8240dea400
2 changed files with 61 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id.
# From configure.in Id: configure.in 69077 2011-09-13 12:06:06Z SJL .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.3.
#
@@ -48415,9 +48415,6 @@ _ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
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
echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
@@ -48453,18 +48450,8 @@ echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
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;}
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 0
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for webkitgtk includes" >&5
{ echo "$as_me:$LINENO: checking for webkitgtk includes" >&5
echo $ECHO_N "checking for webkitgtk includes... $ECHO_C" >&6; }
ac_find_includes=
@@ -48476,8 +48463,8 @@ 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
@@ -48492,18 +48479,9 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
fi
fi
CPPFLAGS="$ac_path_to_include $CPPFLAGS"
else
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
{ echo "$as_me:$LINENO: WARNING: webkit includes not found; disabling webkit backend" >&5
echo "$as_me: WARNING: webkit includes not found; disabling webkit backend" >&2;}
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 0
_ACEOF
CPPFLAGS="$ac_path_to_include $CPPFLAGS"
fi
{ echo "$as_me:$LINENO: checking for libsoup includes" >&5
{ echo "$as_me:$LINENO: checking for libsoup includes" >&5
echo $ECHO_N "checking for libsoup includes... $ECHO_C" >&6; }
ac_find_includes=
@@ -48515,8 +48493,8 @@ 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
@@ -48531,16 +48509,30 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
fi
fi
CPPFLAGS="$ac_path_to_include $CPPFLAGS"
else
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
{ echo "$as_me:$LINENO: WARNING: libsoup includes not found; disabling webkit backend" >&5
echo "$as_me: WARNING: libsoup includes not found; disabling webkit backend" >&2;}
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 0
CPPFLAGS="$ac_path_to_include $CPPFLAGS"
#if we have all the requirements then enable this backend
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 1
_ACEOF
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
fi
@@ -48604,27 +48596,13 @@ _ACEOF
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;}
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 0
_ACEOF
{ 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
CPPFLAGS="$old_CPPFLAGS"
elif test "$wxUSE_OLD_COCOA" = 1; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 1
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBVIEW_WEBKIT 0
_ACEOF
fi
fi