# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1317157399 0 # Node ID b561c169c115446fc7f44d55104c54f1f97d227d # Parent ce83df520be06736dad67dc66c2191b30e4f943d 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. diff -r ce83df520be0 -r b561c169c115 configure.in --- 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)