Mercurial > dwindows

comparison configure @ 1189:c5419ef79a77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Committing the configure script now that it works on both FreeBSD and Ubuntu.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 27 Sep 2011 22:38:25 +0000
parents f1cb493f97fd
children 751f127439f7
comparison
equal deleted inserted replaced
1188:ec33913d379b 1189:c5419ef79a77
4732 WEBKIT_PKG="webkit-1.0" 4732 WEBKIT_PKG="webkit-1.0"
4733 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 4733 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4734 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` 4734 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
4735 if test x"$MOZEMBED_CFLAGS" = x; then 4735 if test x"$MOZEMBED_CFLAGS" = x; then
4736 WEBKIT_PKG="WebKitGtk" 4736 WEBKIT_PKG="WebKitGtk"
4737 # MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` 4737 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4738 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 4738 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
4739 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` 4739 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-`
4740 else 4740 else
4741 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h 4741 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h
4742 4742
4743 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing webkit_web_view_new" >&5 4743 WEBKIT_LIB=$WEBKIT_PKG
4744 $as_echo_n "checking for library containing webkit_web_view_new... " >&6; } 4744 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
4745 if ${ac_cv_search_webkit_web_view_new+:} false; then : 4745 RESULT=`echo $MOZEMBED_LIBS | grep lwebkitgtk-1.0`
4746 $as_echo_n "(cached) " >&6 4746 if test x"$RESULT" != x; then
4747 else 4747 WEBKIT_LIB=webkitgtk-1.0
4748 ac_func_search_save_LIBS=$LIBS 4748 fi
4749 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4750 /* end confdefs.h. */
4751
4752 /* Override any GCC internal prototype to avoid an error.
4753 Use char because int might match the return type of a GCC
4754 builtin and then its argument prototype would still apply. */
4755 #ifdef __cplusplus
4756 extern "C"
4757 #endif
4758 char webkit_web_view_new ();
4759 int
4760 main ()
4761 {
4762 return webkit_web_view_new ();
4763 ;
4764 return 0;
4765 }
4766 _ACEOF
4767 for ac_lib in '' webkit-1.0 webkitgtk-1.0; do
4768 if test -z "$ac_lib"; then
4769 ac_res="none required"
4770 else
4771 ac_res=-l$ac_lib
4772 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4773 fi
4774 if ac_fn_c_try_link "$LINENO"; then :
4775 ac_cv_search_webkit_web_view_new=$ac_res
4776 fi
4777 rm -f core conftest.err conftest.$ac_objext \
4778 conftest$ac_exeext
4779 if ${ac_cv_search_webkit_web_view_new+:} false; then :
4780 break
4781 fi
4782 done
4783 if ${ac_cv_search_webkit_web_view_new+:} false; then :
4784
4785 else
4786 ac_cv_search_webkit_web_view_new=no
4787 fi
4788 rm conftest.$ac_ext
4789 LIBS=$ac_func_search_save_LIBS
4790 fi
4791 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_webkit_web_view_new" >&5
4792 $as_echo "$ac_cv_search_webkit_web_view_new" >&6; }
4793 ac_res=$ac_cv_search_webkit_web_view_new
4794 if test "$ac_res" != no; then :
4795 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
4796 WEBKIT_LIB=`echo $ac_res | cut -b 3-`
4797 else
4798 WEBKIT_LIB=""
4799 fi
4800
4801 fi 4749 fi
4802 else 4750 else
4803 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h 4751 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h
4804 4752
4805 WEBKIT_LIB=$WEBKIT_PKG 4753 WEBKIT_LIB=$WEBKIT_PKG