Mercurial > dwindows

changeset 1187:b561c169c115

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the library search for webkit-1.0 during configure. Not sure if this was really needed, but the existing test was failing on FreeBSD. If it breaks something else I'll revisit.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 27 Sep 2011 21:03:19 +0000
parents ce83df520be0
children ec33913d379b
files configure.in
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Tue Sep 27 20:10:15 2011 +0000
+++ b/configure.in	Tue Sep 27 21:03:19 2011 +0000
@@ -252,12 +252,13 @@
             RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
             if test x"$MOZEMBED_CFLAGS" = x; then
                WEBKIT_PKG="WebKitGtk"
-#               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
+               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
                MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
                RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
             else
                AC_DEFINE(USE_WEBKIT10)
-               AC_SEARCH_LIBS(webkit_web_view_new,webkit-1.0 webkitgtk-1.0,WEBKIT_LIB=`echo $ac_res | cut -b 3-`,WEBKIT_LIB="")
+               WEBKIT_LIB=$WEBKIT_PKG
+               MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
             fi
          else
             AC_DEFINE(USE_WEBKIT11)