Mercurial > dwindows

comparison configure @ 2005:a17cc1958369

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
4683 GTK_LIBS="" 4683 GTK_LIBS=""
4684 if test $with_gtk2 = "yes"; then 4684 if test $with_gtk2 = "yes"; then
4685 GTK_PACKAGES="gtk+-2.0 gthread-2.0" 4685 GTK_PACKAGES="gtk+-2.0 gthread-2.0"
4686 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 4686 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
4687 fi 4687 fi
4688 WEBKIT_PKG="webkitgtk-3.0" 4688 WEBKIT_PKG="webkit2gtk-4.0"
4689 if test x"$GTK_LIBS" = x; then 4689 if test x"$GTK_LIBS" = x; then
4690 GTK_PACKAGES="gtk+-3.0" 4690 GTK_PACKAGES="gtk+-3.0"
4691 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 4691 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
4692 else 4692 else
4693 DW_DIR=gtk 4693 DW_DIR=gtk
4694 WEBKIT_PKG="webkit-1.1" 4694 WEBKIT_PKG="webkit-1.1"
4695 fi 4695 fi
4696 # test for webkit2gtk or webkitgtk packages 4696 # test for webkit2gtk or webkitgtk packages
4697 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 4697 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4698 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
4699 if test x"$WEBKIT_CFLAGS" = x; then 4698 if test x"$WEBKIT_CFLAGS" = x; then
4700 # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 4699 # no webkit2gtk-4.0 or webkitgtk-1.1
4701 WEBKIT_PKG="webkit-1.0" 4700 if test $DW_DIR = "gtk"; then
4702 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 4701 WEBKIT_PKG="webkit-1.0"
4703 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
4704 if test x"$WEBKIT_CFLAGS" = x; then
4705 WEBKIT_PKG="WebKitGtk"
4706 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4707 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 4702 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4708 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` 4703 if test x"$WEBKIT_CFLAGS" = x; then
4704 WEBKIT_PKG="WebKitGtk"
4705 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4706 if test x"$WEBKIT_CFLAGS" = x; then
4707 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4708 fi
4709 else
4710 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h
4711
4712 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4713 fi
4709 else 4714 else
4710 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h 4715 WEBKIT_PKG="webkitgtk-3.0"
4711 4716 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4712 WEBKIT_LIB=$WEBKIT_PKG 4717 if test x"$WEBKIT_CFLAGS" = x; then
4713 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` 4718 WEBKIT_PKG="webkitgtk-1.0"
4714 RESULT=`echo $WEBKIT_LIBS | grep lwebkitgtk-1.0` 4719 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4715 if test x"$RESULT" != x; then 4720 if test x"$WEBKIT_CFLAGS" = x; then
4716 WEBKIT_LIB=webkitgtk-1.0 4721 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h
4722
4723 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4724 fi
4725 else
4726 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h
4727
4728 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4717 fi 4729 fi
4718 fi 4730 fi
4719 else 4731 else
4732 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4720 if test $with_gtk2 = "yes"; then 4733 if test $with_gtk2 = "yes"; then
4721 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h 4734 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h
4722 4735
4723 else 4736 else
4724 $as_echo "#define USE_WEBKIT2 1" >>confdefs.h 4737 $as_echo "#define USE_WEBKIT2 1" >>confdefs.h
4725 4738
4726 fi 4739 fi
4727 WEBKIT_LIB=$WEBKIT_PKG
4728 fi 4740 fi
4729 cat >>confdefs.h <<_ACEOF
4730 #define WEBKIT_LIB "$WEBKIT_LIB"
4731 _ACEOF
4732
4733 if test x"$RPATH" != x; then 4741 if test x"$RPATH" != x; then
4734 RPATH="-Wl,-R$RPATH" 4742 RPATH="-Wl,-R$RPATH"
4735 fi 4743 fi
4736 fi 4744 fi
4737 4745
5678 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $WEBKIT_CFLAGS" 5686 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $WEBKIT_CFLAGS"
5679 5687
5680 if test $with_deprecated = yes; then 5688 if test $with_deprecated = yes; then
5681 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED" 5689 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED"
5682 fi 5690 fi
5683 if test x"$WEBKIT_CFLAGS" != x; then 5691 if test x"$WEBKIT_LIBS" != x; then
5684 SAVE_LIBS="$LIBS" 5692 WEBKIT_LIB=`echo $WEBKIT_LIBS | cut -b 3-`
5685 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS"
5686 as_ac_Lib=`$as_echo "ac_cv_lib_$WEBKIT_LIB''_webkit_web_view_new" | $as_tr_sh` 5693 as_ac_Lib=`$as_echo "ac_cv_lib_$WEBKIT_LIB''_webkit_web_view_new" | $as_tr_sh`
5687 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for webkit_web_view_new in -l$WEBKIT_LIB" >&5 5694 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for webkit_web_view_new in -l$WEBKIT_LIB" >&5
5688 $as_echo_n "checking for webkit_web_view_new in -l$WEBKIT_LIB... " >&6; } 5695 $as_echo_n "checking for webkit_web_view_new in -l$WEBKIT_LIB... " >&6; }
5689 if eval \${$as_ac_Lib+:} false; then : 5696 if eval \${$as_ac_Lib+:} false; then :
5690 $as_echo_n "(cached) " >&6 5697 $as_echo_n "(cached) " >&6
5724 if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : 5731 if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
5725 $as_echo "#define USE_WEBKIT 1" >>confdefs.h 5732 $as_echo "#define USE_WEBKIT 1" >>confdefs.h
5726 5733
5727 fi 5734 fi
5728 5735
5729 LIBS="$SAVE_LIBS"
5730 fi 5736 fi
5731 5737
5732 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS $PLATLIBS" 5738 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS $PLATLIBS"
5733 5739
5734 for ac_func in ubuntu_overlay_scrollbar_set_enabled 5740 for ac_func in ubuntu_overlay_scrollbar_set_enabled