Mercurial > dwindows

comparison configure @ 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
4610 $as_echo "no" >&6; } 4610 $as_echo "no" >&6; }
4611 fi 4611 fi
4612 4612
4613 4613
4614 if test x"$PKG_CFG" != x; then 4614 if test x"$PKG_CFG" != x; then
4615 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0` 4615 GTK_PACKAGES="gtk+-3.0"
4616 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
4617 WEBKIT_PKG="webkit-1.1"
4618 if test x"$GTK_LIBS" = x; then
4619 GTK_PACKAGES="gtk+-2.0 gthread-2.0"
4620 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
4621 else
4622 DW_DIR=gtk3
4623 WEBKIT_PKG="webkitgtk-3.0"
4624 fi
4616 if test $with_gtkmozembed = yes; then 4625 if test $with_gtkmozembed = yes; then
4617 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` 4626 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed`
4618 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` 4627 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed`
4619 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` 4628 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-`
4620 if test x"$MOZEMBED_LIBS" = x; then 4629 if test x"$MOZEMBED_LIBS" = x; then
4625 elif test $with_gtkhtml = yes; then 4634 elif test $with_gtkhtml = yes; then
4626 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0` 4635 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0`
4627 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0` 4636 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0`
4628 RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-` 4637 RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-`
4629 else 4638 else
4630 WEBKIT_LIB="webkit-1.1" 4639 # test for webkit-1.1 or webkitgtk-3.0 packages
4631 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 4640 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4632 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-` 4641 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
4633 if test x"$MOZEMBED_CFLAGS" = x; then 4642 if test x"$MOZEMBED_CFLAGS" = x; then
4634 WEBKIT_LIB="webkit-1.0" 4643 # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0
4635 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 4644 WEBKIT_PKG="webkit-1.0"
4636 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-` 4645 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4646 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
4637 if test x"$MOZEMBED_CFLAGS" = x; then 4647 if test x"$MOZEMBED_CFLAGS" = x; then
4638 WEBKIT_LIB="WebKitGtk" 4648 WEBKIT_PKG="WebKitGtk"
4639 # MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_LIB` 4649 # MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4640 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 4650 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4641 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-` 4651 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
4642 else 4652 else
4643 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h 4653 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h
4654
4655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing webkit_web_view_new" >&5
4656 $as_echo_n "checking for library containing webkit_web_view_new... " >&6; }
4657 if test "${ac_cv_search_webkit_web_view_new+set}" = set; then :
4658 $as_echo_n "(cached) " >&6
4659 else
4660 ac_func_search_save_LIBS=$LIBS
4661 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4662 /* end confdefs.h. */
4663
4664 /* Override any GCC internal prototype to avoid an error.
4665 Use char because int might match the return type of a GCC
4666 builtin and then its argument prototype would still apply. */
4667 #ifdef __cplusplus
4668 extern "C"
4669 #endif
4670 char webkit_web_view_new ();
4671 int
4672 main ()
4673 {
4674 return webkit_web_view_new ();
4675 ;
4676 return 0;
4677 }
4678 _ACEOF
4679 for ac_lib in '' webkit-1.0 webkitgtk-1.0; do
4680 if test -z "$ac_lib"; then
4681 ac_res="none required"
4682 else
4683 ac_res=-l$ac_lib
4684 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4685 fi
4686 if ac_fn_c_try_link "$LINENO"; then :
4687 ac_cv_search_webkit_web_view_new=$ac_res
4688 fi
4689 rm -f core conftest.err conftest.$ac_objext \
4690 conftest$ac_exeext
4691 if test "${ac_cv_search_webkit_web_view_new+set}" = set; then :
4692 break
4693 fi
4694 done
4695 if test "${ac_cv_search_webkit_web_view_new+set}" = set; then :
4696
4697 else
4698 ac_cv_search_webkit_web_view_new=no
4699 fi
4700 rm conftest.$ac_ext
4701 LIBS=$ac_func_search_save_LIBS
4702 fi
4703 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_webkit_web_view_new" >&5
4704 $as_echo "$ac_cv_search_webkit_web_view_new" >&6; }
4705 ac_res=$ac_cv_search_webkit_web_view_new
4706 if test "$ac_res" != no; then :
4707 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
4708 WEBKIT_LIB=`echo $ac_res | cut -b 3-`
4709 else
4710 WEBKIT_LIB=""
4711 fi
4644 4712
4645 fi 4713 fi
4646 else 4714 else
4647 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h 4715 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h
4648 4716
4717 WEBKIT_LIB=$WEBKIT_PKG
4649 fi 4718 fi
4650 cat >>confdefs.h <<_ACEOF 4719 cat >>confdefs.h <<_ACEOF
4651 #define WEBKIT_LIB "$WEBKIT_LIB" 4720 #define WEBKIT_LIB "$WEBKIT_LIB"
4652 _ACEOF 4721 _ACEOF
4653 4722
5410 5479
5411 5480
5412 rm -f conf.gdkimlibtest 5481 rm -f conf.gdkimlibtest
5413 5482
5414 else 5483 else
5415 GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0` 5484 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES`
5416 GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0` 5485 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES`
5417 fi 5486 fi
5418 fi 5487 fi
5419 5488
5420 if test $check_pthreads = "yes"; then 5489 if test $check_pthreads = "yes"; then
5421 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" 5490 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
6536 echo "cat >conf$$subs.awk <<_ACEOF" && 6605 echo "cat >conf$$subs.awk <<_ACEOF" &&
6537 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 6606 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
6538 echo "_ACEOF" 6607 echo "_ACEOF"
6539 } >conf$$subs.sh || 6608 } >conf$$subs.sh ||
6540 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6609 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
6541 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 6610 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
6542 ac_delim='%!_!# ' 6611 ac_delim='%!_!# '
6543 for ac_last_try in false false false false false :; do 6612 for ac_last_try in false false false false false :; do
6544 . ./conf$$subs.sh || 6613 . ./conf$$subs.sh ||
6545 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 6614 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
6546 6615