Mercurial > dwindows

diff configure.in @ 2267:7ac85e938b71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK4: Don't try to link webkit on GTK4... it doesn't support it yet. Also fix various issues with fonts, signals and implement dialogs.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 31 Jan 2021 02:54:40 +0000
parents 5c981407b0f3
children 829228de003f
line wrap: on
line diff
--- a/configure.in	Sat Jan 30 01:53:20 2021 +0000
+++ b/configure.in	Sun Jan 31 02:54:40 2021 +0000
@@ -249,18 +249,20 @@
                WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
             fi
          else
-            WEBKIT_PKG="webkitgtk-3.0"
-            WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
-            if test x"$WEBKIT_CFLAGS" = x; then
-               WEBKIT_PKG="webkitgtk-1.0"
+            if test $DW_DIR = "gtk3"; then
+               WEBKIT_PKG="webkitgtk-3.0"
                WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
                if test x"$WEBKIT_CFLAGS" = x; then
-                  AC_DEFINE(USE_WEBKIT10)
+                  WEBKIT_PKG="webkitgtk-1.0"
+                  WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
+                  if test x"$WEBKIT_CFLAGS" = x; then
+                     AC_DEFINE(USE_WEBKIT10)
+                     WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
+                  fi
+               else
+                  AC_DEFINE(USE_WEBKIT11)
                   WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
                fi
-            else
-               AC_DEFINE(USE_WEBKIT11)
-               WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
             fi
          fi
       else