mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge webkit branch into trunk.
In order to use the webkit as the html engine, use --enable-webkit on the configure command. In SCM files, gnc-html-engine-supports-css can be used to determine whether the html engine is webkit (supports css) or gtkhtml (doesn't support css). git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18041 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
21
configure.in
21
configure.in
@@ -514,6 +514,26 @@ AC_SUBST(GCONFTOOL)
|
||||
AC_SUBST(GCONF_CFLAGS)
|
||||
AC_SUBST(GCONF_LIBS)
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
### look for webkit
|
||||
|
||||
AC_ARG_ENABLE(webkit,
|
||||
[AS_HELP_STRING([--enable-webkit],[build with the webkit HTML engine])],
|
||||
[case "${enableval}" in
|
||||
yes) want_webkit=true ;;
|
||||
no) want_webkit=false ;;
|
||||
*) want_webkit=false ;;
|
||||
esac],
|
||||
[want_webkit=false])
|
||||
if test x${want_webkit} = xtrue
|
||||
then
|
||||
PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= "1.0")
|
||||
AC_DEFINE(WANT_WEBKIT,1,[Use webkit instead of gtkhtml])
|
||||
fi
|
||||
AM_CONDITIONAL(HTML_USING_WEBKIT, test x${want_webkit} = xtrue)
|
||||
AC_SUBST(WEBKIT_CFLAGS)
|
||||
AC_SUBST(WEBKIT_LIBS)
|
||||
|
||||
### --------------------------------------------------------------------------
|
||||
### LIBXML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK
|
||||
|
||||
@@ -1511,6 +1531,7 @@ AC_CONFIG_FILES(po/Makefile.in
|
||||
src/gnome-utils/test/Makefile
|
||||
src/gnome-utils/ui/Makefile
|
||||
src/gnome-search/Makefile
|
||||
src/html/Makefile
|
||||
src/import-export/Makefile
|
||||
src/import-export/test/Makefile
|
||||
src/import-export/qif-import/Makefile
|
||||
|
||||
Reference in New Issue
Block a user