Mercurial > dwindows

changeset 2062:1a93c508bb51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK: Fix check for webkit when pkg-config returns a library path first.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 17 Apr 2020 20:45:31 +0000
parents 966ef0eeed4f
children f7c462f27829
files configure configure.in
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Apr 16 13:34:36 2020 +0000
+++ b/configure	Fri Apr 17 20:45:31 2020 +0000
@@ -6414,7 +6414,7 @@
    CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED"
 fi
 if test x"$WEBKIT_LIBS" != x; then
-   WEBKIT_LIB=`echo $WEBKIT_LIBS | cut -b 3-`
+   WEBKIT_LIB=`$PKG_CFG --silence-errors --libs-only-l $WEBKIT_PKG | cut -b 3-`
    as_ac_Lib=`$as_echo "ac_cv_lib_$WEBKIT_LIB''_webkit_web_view_new" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for webkit_web_view_new in -l$WEBKIT_LIB" >&5
 $as_echo_n "checking for webkit_web_view_new in -l$WEBKIT_LIB... " >&6; }
--- a/configure.in	Thu Apr 16 13:34:36 2020 +0000
+++ b/configure.in	Fri Apr 17 20:45:31 2020 +0000
@@ -282,7 +282,7 @@
    CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED"
 fi
 if test x"$WEBKIT_LIBS" != x; then
-   WEBKIT_LIB=`echo $WEBKIT_LIBS | cut -b 3-`
+   WEBKIT_LIB=`$PKG_CFG --silence-errors --libs-only-l $WEBKIT_PKG | cut -b 3-`
    AC_CHECK_LIB($WEBKIT_LIB,webkit_web_view_new,AC_DEFINE(USE_WEBKIT),)
 fi