Prefer JavaScriptCore to pkg-config for WebKit.

diff --git a/configure.ac b/configure.ac
index fa4d7dd2a4b4ad02ce9b7b9a9166364363b61134..763f6bdf42378d51c59db06147d1502b74787106 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -148,24 +148,20 @@ AC_ARG_WITH([frameworks], [AS_HELP_STRING(
 ]) dnl }}}
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
-    PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [
+    AC_CHECK_FRAMEWORK([JavaScriptCore], [
+        #include <JavaScriptCore/JSBase.h>
+    ], [
+        JSEvaluateScript(0, 0, 0, 0, 0, 0);
+    ], [
         AC_SUBST([CY_EXECUTE], [1])
-        CY_COMPILE_FLAG([`$PKG_CONFIG --cflags webkit-1.0`])
-        AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs webkit-1.0`])
     ], [
-        PKG_CHECK_MODULES([WEBKIT], [WebKitGtk], [
-            AC_SUBST([CY_EXECUTE], [1])
-            CY_COMPILE_FLAG([`$PKG_CONFIG --cflags WebKitGtk`])
-            AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs WebKitGtk`])
-        ], [
-            AC_CHECK_FRAMEWORK([JavaScriptCore], [
-                #include <JavaScriptCore/JSBase.h>
-            ], [
-                JSEvaluateScript(0, 0, 0, 0, 0, 0);
-            ], [
+        for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do
+            PKG_CHECK_MODULES([WEBKIT], [$cy_webkit_pkg], [
                 AC_SUBST([CY_EXECUTE], [1])
-            ])
-        ])
+                CY_COMPILE_FLAG([`$PKG_CONFIG --cflags $cy_webkit_pkg`])
+                AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs $cy_webkit_pkg`])
+            ], [:]); if test "x$CY_EXECUTE" = x1; then break; fi
+        done
     ])
 ])