r18230 - gnucash/trunk - Change --enable-webkit configure option to --with-html-engine=XXX where XXX is "gtkhtml" (default)
Phil Longstaff
plongstaff at code.gnucash.org
Sat Aug 1 23:00:29 EDT 2009
Author: plongstaff
Date: 2009-08-01 23:00:28 -0400 (Sat, 01 Aug 2009)
New Revision: 18230
Trac: http://svn.gnucash.org/trac/changeset/18230
Modified:
gnucash/trunk/configure.in
gnucash/trunk/packaging/win32/install.sh
Log:
Change --enable-webkit configure option to --with-html-engine=XXX where XXX is "gtkhtml" (default)
or "webkit".
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2009-08-02 02:42:50 UTC (rev 18229)
+++ gnucash/trunk/configure.in 2009-08-02 03:00:28 UTC (rev 18230)
@@ -311,12 +311,12 @@
AC_CHECK_FUNCS(dlerror,,)
LIBS="$oLIBS"
AC_SUBST(DL_LIB)
- 10.x requires some special handling...
### --------------------------------------------------------------------------
### MacOS
# Some systems (MacOS) require -lintl
# not true for darwin 10.3 - halts the build.
+# 10.x requires some special handling...
#AC_SEARCH_LIBS(gettext, intl, ,[
# AC_MSG_ERROR([Cannot find gettext -- do you need to build -lintl?])], )
@@ -541,22 +541,39 @@
AC_SUBST(GCONF_LIBS)
### --------------------------------------------------------------------------
-### look for webkit
+### determine the HTML engine
-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_MSG_CHECKING([the html engine])
+AC_ARG_WITH(html_engine,
+ AS_HELP_STRING([--with-html-engine=@<:@webkit/gtkhtml@:>@],
+ [Select HTML engine [default=gtkhtml]]),
+ [],[with_html_engine="gtkhtml"])
+
+case "$with_html_engine" in
+ gtkhtml) ;;
+ webkit)
+ PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= "1.0")
+ AC_DEFINE(WANT_WEBKIT,1,[Use webkit instead of gtkhtml])
+ ;;
+ *) AC_MSG_ERROR([Invalid HTML engine: must be gtkhtml or webkit]) ;;
+esac
+
+AC_MSG_RESULT([$with_html_engine])
+
+#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${with_html_engine} = xwebkit])
AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LIBS)
@@ -1660,16 +1677,17 @@
-------------------------
gnucash version ...... : $VERSION
Build for host ....... : $host
- Optional components....: $components
+ Optional components... : $components
+ HTML engine .......... : $with_html_engine
Extra Warnings ....... : $warnFLAGS
CPPFLAGS ............. : $CPPFLAGS
CFLAGS ............... : $CFLAGS
LDFLAGS .............. : $LDFLAGS
- prefix.................: ${prefix}
- QOF support ...........: $QOF_VERSION
- QOF location ..........: $output_qof_prefix
- QOF library dir .......: $output_qof_lib_dir
- QOF backend config ....: $output_qof_xml_dir
+ prefix................ : ${prefix}
+ QOF support .......... : $QOF_VERSION
+ QOF location ......... : $output_qof_prefix
+ QOF library dir ...... : $output_qof_lib_dir
+ QOF backend config ... : $output_qof_xml_dir
])
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2009-08-02 02:42:50 UTC (rev 18229)
+++ gnucash/trunk/packaging/win32/install.sh 2009-08-02 03:00:28 UTC (rev 18230)
@@ -1206,7 +1206,7 @@
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- --enable-webkit \
+ --with-html-engine=webkit \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
More information about the gnucash-changes
mailing list