From 1dd6996f8421ae26f818d97d0190e9a90b10f886 Mon Sep 17 00:00:00 2001 From: Phil Longstaff Date: Sun, 18 Apr 2010 20:20:31 +0000 Subject: [PATCH] Assume webkit functions exist on win32 git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19035 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.in | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/configure.in b/configure.in index c20f983d84..a6df007d39 100644 --- a/configure.in +++ b/configure.in @@ -1059,25 +1059,35 @@ then webkit) PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= "1.0") AC_DEFINE(WANT_WEBKIT,1,[Use webkit instead of gtkhtml]) - oLIBS="$LIBS" - LIBS="$LIBS -lwebkit-1.0" - AC_CHECK_FUNCS(webkit_web_view_load_uri) - LIBS="$oLIBS" - AC_MSG_CHECKING(for webkit_web_frame_print_full) - saved_CFLAGS="${CFLAGS}" + case "$platform" in + win32) + # 1.1.90 has both functions + AC_DEFINE(HAVE_WEBKIT_WEB_VIEW_LOAD_URI,1,[webkit_web_view_load_uri exists]) + AC_DEFINE(HAVE_WEBKIT_WEB_FRAME_PRINT_FULL,1,[webkit_web_frame_print_full exists]) + ;; + *) + # Unsure - check functions exist + oLIBS="$LIBS" + LIBS="$LIBS -lwebkit-1.0" + AC_CHECK_FUNCS(webkit_web_view_load_uri) + LIBS="$oLIBS" + AC_MSG_CHECKING(for webkit_web_frame_print_full) + saved_CFLAGS="${CFLAGS}" saved_LIBS="${LIBS}" CFLAGS="${CFLAGS} ${WEBKIT_CFLAGS}" LIBS="${LIBS} ${WEBKIT_LIBS}" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[webkit_web_frame_print_full( 0, 0, 0, 0 );]])], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_WEBKIT_WEB_FRAME_PRINT_FULL,1,[webkit_web_frame_print_full exists])], - [AC_MSG_RESULT(no)]) - CFLAGS="${saved_CFLAGS}" - LIBS="${saved_LIBS}" - ;; + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[webkit_web_frame_print_full( 0, 0, 0, 0 );]])], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_WEBKIT_WEB_FRAME_PRINT_FULL,1,[webkit_web_frame_print_full exists])], + [AC_MSG_RESULT(no)]) + CFLAGS="${saved_CFLAGS}" + LIBS="${saved_LIBS}" + ;; + esac + ;; *) AC_MSG_ERROR([Invalid HTML engine: must be gtkhtml or webkit]) ;; esac