r19035 - gnucash/trunk - Assume webkit functions exist on win32

[Phil Longstaff]

Author: plongstaff
Date: 2010-04-18 16:20:31 -0400 (Sun, 18 Apr 2010)
New Revision: 19035
Trac: http://svn.gnucash.org/trac/changeset/19035

Modified:
   gnucash/trunk/configure.in
Log:
Assume webkit functions exist on win32


Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2010-04-18 18:08:42 UTC (rev 19034)
+++ gnucash/trunk/configure.in	2010-04-18 20:20:31 UTC (rev 19035)
@@ -1059,25 +1059,35 @@
 	     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/webkit.h>]],
-  		            [[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/webkit.h>]],
+  		                [[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