Mercurial > dwindows
comparison configure.in @ 1187:b561c169c115
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 | f1cb493f97fd |
children | ec33913d379b |
comparison
equal
deleted
inserted
replaced
1186:ce83df520be0 | 1187:b561c169c115 |
---|---|
250 WEBKIT_PKG="webkit-1.0" | 250 WEBKIT_PKG="webkit-1.0" |
251 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 251 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
252 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | 252 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` |
253 if test x"$MOZEMBED_CFLAGS" = x; then | 253 if test x"$MOZEMBED_CFLAGS" = x; then |
254 WEBKIT_PKG="WebKitGtk" | 254 WEBKIT_PKG="WebKitGtk" |
255 # MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | 255 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` |
256 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 256 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
257 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | 257 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` |
258 else | 258 else |
259 AC_DEFINE(USE_WEBKIT10) | 259 AC_DEFINE(USE_WEBKIT10) |
260 AC_SEARCH_LIBS(webkit_web_view_new,webkit-1.0 webkitgtk-1.0,WEBKIT_LIB=`echo $ac_res | cut -b 3-`,WEBKIT_LIB="") | 260 WEBKIT_LIB=$WEBKIT_PKG |
261 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
261 fi | 262 fi |
262 else | 263 else |
263 AC_DEFINE(USE_WEBKIT11) | 264 AC_DEFINE(USE_WEBKIT11) |
264 WEBKIT_LIB=$WEBKIT_PKG | 265 WEBKIT_LIB=$WEBKIT_PKG |
265 fi | 266 fi |