Mercurial > dwindows

comparison configure.in @ 1094:b2a4cfc3cb87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable use of WebKit 1.0 under ubuntu Natty; package name: webkit-1.0 does not match name of library, libwebkitgtk-1.0
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 30 Jun 2011 04:48:10 +0000
parents c4dae8a3cf9a
children 1ab93c92d3ea
comparison
equal deleted inserted replaced
1093:25707e9f5ad1 1094:b2a4cfc3cb87
196 if test $build_gtk = "yes"; then 196 if test $build_gtk = "yes"; then
197 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) 197 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
198 if test x"$PKG_CFG" != x; then 198 if test x"$PKG_CFG" != x; then
199 GTK_PACKAGES="gtk+-3.0" 199 GTK_PACKAGES="gtk+-3.0"
200 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 200 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
201 WEBKIT_LIB="webkit-1.1" 201 WEBKIT_PKG="webkit-1.1"
202 if test x"$GTK_LIBS" = x; then 202 if test x"$GTK_LIBS" = x; then
203 GTK_PACKAGES="gtk+-2.0 gthread-2.0" 203 GTK_PACKAGES="gtk+-2.0 gthread-2.0"
204 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 204 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
205 else 205 else
206 DW_DIR=gtk3 206 DW_DIR=gtk3
207 WEBKIT_LIB="webkitgtk-3.0" 207 WEBKIT_PKG="webkitgtk-3.0"
208 fi 208 fi
209 if test $with_gtkmozembed = yes; then 209 if test $with_gtkmozembed = yes; then
210 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` 210 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed`
211 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` 211 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed`
212 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` 212 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-`
218 elif test $with_gtkhtml = yes; then 218 elif test $with_gtkhtml = yes; then
219 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0` 219 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0`
220 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0` 220 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0`
221 RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-` 221 RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-`
222 else 222 else
223 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 223 # test for webkit-1.1 or webkitgtk-3.0 packages
224 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-` 224 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
225 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
225 if test x"$MOZEMBED_CFLAGS" = x; then 226 if test x"$MOZEMBED_CFLAGS" = x; then
226 WEBKIT_LIB="webkit-1.0" 227 # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0
227 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 228 WEBKIT_PKG="webkit-1.0"
228 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-` 229 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
230 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
229 if test x"$MOZEMBED_CFLAGS" = x; then 231 if test x"$MOZEMBED_CFLAGS" = x; then
230 WEBKIT_LIB="WebKitGtk" 232 WEBKIT_PKG="WebKitGtk"
231 # MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_LIB` 233 # MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
232 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 234 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
233 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-` 235 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
234 else 236 else
235 AC_DEFINE(USE_WEBKIT10) 237 AC_DEFINE(USE_WEBKIT10)
238 AC_SEARCH_LIBS(webkit_web_view_new,webkit-1.0 webkitgtk-1.0,WEBKIT_LIB=`echo $ac_res | cut -b 3-`,WEBKIT_LIB="")
236 fi 239 fi
237 else 240 else
238 AC_DEFINE(USE_WEBKIT11) 241 AC_DEFINE(USE_WEBKIT11)
242 WEBKIT_LIB=$WEBKIT_PKG
239 fi 243 fi
240 AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB") 244 AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB")
241 fi 245 fi
242 if test x"$RPATH" != x; then 246 if test x"$RPATH" != x; then
243 RPATH="-Wl,-R$RPATH" 247 RPATH="-Wl,-R$RPATH"