Mercurial > dwindows
comparison configure.in @ 2005:a17cc1958369
GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
Use linker to pull in webkit libraries instead of dlopen() etc.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 06 Nov 2019 08:48:49 +0000 |
parents | dee122916f3c |
children | 966ef0eeed4f |
comparison
equal
deleted
inserted
replaced
2004:ebbdb2120659 | 2005:a17cc1958369 |
---|---|
187 GTK_LIBS="" | 187 GTK_LIBS="" |
188 if test $with_gtk2 = "yes"; then | 188 if test $with_gtk2 = "yes"; then |
189 GTK_PACKAGES="gtk+-2.0 gthread-2.0" | 189 GTK_PACKAGES="gtk+-2.0 gthread-2.0" |
190 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | 190 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` |
191 fi | 191 fi |
192 WEBKIT_PKG="webkitgtk-3.0" | 192 WEBKIT_PKG="webkit2gtk-4.0" |
193 if test x"$GTK_LIBS" = x; then | 193 if test x"$GTK_LIBS" = x; then |
194 GTK_PACKAGES="gtk+-3.0" | 194 GTK_PACKAGES="gtk+-3.0" |
195 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | 195 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` |
196 else | 196 else |
197 DW_DIR=gtk | 197 DW_DIR=gtk |
198 WEBKIT_PKG="webkit-1.1" | 198 WEBKIT_PKG="webkit-1.1" |
199 fi | 199 fi |
200 # test for webkit2gtk or webkitgtk packages | 200 # test for webkit2gtk or webkitgtk packages |
201 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 201 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
202 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | |
203 if test x"$WEBKIT_CFLAGS" = x; then | 202 if test x"$WEBKIT_CFLAGS" = x; then |
204 # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 | 203 # no webkit2gtk-4.0 or webkitgtk-1.1 |
205 WEBKIT_PKG="webkit-1.0" | 204 if test $DW_DIR = "gtk"; then |
206 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 205 WEBKIT_PKG="webkit-1.0" |
207 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | |
208 if test x"$WEBKIT_CFLAGS" = x; then | |
209 WEBKIT_PKG="WebKitGtk" | |
210 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
211 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 206 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
212 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | 207 if test x"$WEBKIT_CFLAGS" = x; then |
208 WEBKIT_PKG="WebKitGtk" | |
209 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | |
210 if test x"$WEBKIT_CFLAGS" = x; then | |
211 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
212 fi | |
213 else | |
214 AC_DEFINE(USE_WEBKIT10) | |
215 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
216 fi | |
213 else | 217 else |
214 AC_DEFINE(USE_WEBKIT10) | 218 WEBKIT_PKG="webkitgtk-3.0" |
215 WEBKIT_LIB=$WEBKIT_PKG | 219 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
216 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | 220 if test x"$WEBKIT_CFLAGS" = x; then |
217 RESULT=`echo $WEBKIT_LIBS | grep lwebkitgtk-1.0` | 221 WEBKIT_PKG="webkitgtk-1.0" |
218 if test x"$RESULT" != x; then | 222 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
219 WEBKIT_LIB=webkitgtk-1.0 | 223 if test x"$WEBKIT_CFLAGS" = x; then |
224 AC_DEFINE(USE_WEBKIT10) | |
225 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
226 fi | |
227 else | |
228 AC_DEFINE(USE_WEBKIT11) | |
229 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
220 fi | 230 fi |
221 fi | 231 fi |
222 else | 232 else |
233 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
223 if test $with_gtk2 = "yes"; then | 234 if test $with_gtk2 = "yes"; then |
224 AC_DEFINE(USE_WEBKIT11) | 235 AC_DEFINE(USE_WEBKIT11) |
225 else | 236 else |
226 AC_DEFINE(USE_WEBKIT2) | 237 AC_DEFINE(USE_WEBKIT2) |
227 fi | 238 fi |
228 WEBKIT_LIB=$WEBKIT_PKG | |
229 fi | 239 fi |
230 AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB") | |
231 if test x"$RPATH" != x; then | 240 if test x"$RPATH" != x; then |
232 RPATH="-Wl,-R$RPATH" | 241 RPATH="-Wl,-R$RPATH" |
233 fi | 242 fi |
234 fi | 243 fi |
235 | 244 |
267 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $WEBKIT_CFLAGS" | 276 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $WEBKIT_CFLAGS" |
268 | 277 |
269 if test $with_deprecated = yes; then | 278 if test $with_deprecated = yes; then |
270 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED" | 279 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED" |
271 fi | 280 fi |
272 if test x"$WEBKIT_CFLAGS" != x; then | 281 if test x"$WEBKIT_LIBS" != x; then |
273 SAVE_LIBS="$LIBS" | 282 WEBKIT_LIB=`echo $WEBKIT_LIBS | cut -b 3-` |
274 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS" | |
275 AC_CHECK_LIB($WEBKIT_LIB,webkit_web_view_new,AC_DEFINE(USE_WEBKIT),) | 283 AC_CHECK_LIB($WEBKIT_LIB,webkit_web_view_new,AC_DEFINE(USE_WEBKIT),) |
276 LIBS="$SAVE_LIBS" | |
277 fi | 284 fi |
278 | 285 |
279 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS $PLATLIBS" | 286 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS $PLATLIBS" |
280 | 287 |
281 AC_CHECK_FUNCS(ubuntu_overlay_scrollbar_set_enabled, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS,1,Define if we have Ubuntu overlay scrollbars)) | 288 AC_CHECK_FUNCS(ubuntu_overlay_scrollbar_set_enabled, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS,1,Define if we have Ubuntu overlay scrollbars)) |