IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disable gtkhtml choice from gnucash as we now require the CSS/javascript features of webkit.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20482 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2011-03-26 08:59:07 +00:00
parent de7fec3b0e
commit 51e95d1840
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
configure.ac
View File

@ -949,35 +949,22 @@ then
AC_MSG_CHECKING([the html engine]) AC_MSG_CHECKING([the html engine])
AC_ARG_WITH(html_engine, AC_ARG_WITH(html_engine,
AS_HELP_STRING([--with-html-engine=@<:@webkit/gtkhtml@:>@], AS_HELP_STRING([--with-html-engine=@<:@webkit@:>@],
[Select HTML engine [default=gtkhtml]]), [Obsolete: Only webkit is used as HTML engine now]),
[],[with_html_engine="gtkhtml"]) [],[with_html_engine="webkit"])
AC_MSG_RESULT([$with_html_engine]) AC_MSG_RESULT([$with_html_engine])
case "$with_html_engine" in case "$with_html_engine" in
gtkhtml) gtkhtml)
# check for gtkhtml >= 3.14 with gtkprint support # No more gtkhtml in gnucash-2.5.0
gtkhtml=0 AC_MSG_ERROR([gtkhtml is no longer sufficient for gnucash, as we now require the CSS/javascript features using webkit. Please remove your --with-html-engine argument from configure.])
PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14, [
# check for gtkhtml >= 3.16 (includes gtk_html_print_operation_run())
AC_MSG_CHECKING(for GtkHTML - version >= 3.16.0)
if $PKG_CONFIG 'libgtkhtml-3.14 >= 3.16.0'; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GTKHTML_3_16,1,[System has gtkhtml 3.16.0 or better])
HAVE_GTKHTML_3_16=1
else
AC_MSG_RESULT(no)
fi
], [
AC_MSG_ERROR([cannot find GtkHTML >= 3.14])
])
;; ;;
webkit) webkit)
PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= "1.0") PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= "1.0")
AC_DEFINE(WANT_WEBKIT,1,[Use webkit instead of gtkhtml]) AC_DEFINE(WANT_WEBKIT,1,[Use webkit])
case "$platform" in case "$platform" in
win32) win32)
# 1.1.90 has both functions # 1.1.90 has both functions
@ -1008,26 +995,16 @@ then
esac esac
;; ;;
*) AC_MSG_ERROR([Invalid HTML engine: must be gtkhtml or webkit]) ;; *) AC_MSG_ERROR([Invalid HTML engine: must be webkit]) ;;
esac esac
AM_CONDITIONAL(HTML_USING_WEBKIT, [test x${with_html_engine} = xwebkit]) AM_CONDITIONAL(HTML_USING_WEBKIT, [test x${with_html_engine} = xwebkit])
AC_SUBST(WEBKIT_CFLAGS) AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LIBS) AC_SUBST(WEBKIT_LIBS)
AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
dnl if Mac OSX, also scrub /sw/include dnl if Mac OSX, also scrub /sw/include
dnl GIVEN_CFLAGS=$(echo $GIVEN_CFLAGS | sed -e "s;-I/sw/include ;;" | sed -e "s;-I/sw/include$;;") dnl GIVEN_CFLAGS=$(echo $GIVEN_CFLAGS | sed -e "s;-I/sw/include ;;" | sed -e "s;-I/sw/include$;;")
case $host_os in
darwin*)
GTKHTML_CFLAGS=`echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include ;;" | ${SED} -e "s;-I/sw/include$;;"`
GTKHTML_CFLAGS=`echo $GTKHTML_CFLAGS | ${SED} -e "s;-I/sw/include/gtkhtml ;;" | ${SED} -e "s;-I/sw/includ/gtkhtmle$;;"`
;;
esac
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
###----------------------------------------------------------------------- ###-----------------------------------------------------------------------
## Find a suitable password store ## Find a suitable password store