r18350 - gnucash/trunk - If webkit chosen as html engine, don't bother looking for gtkhtml.
Phil Longstaff
plongstaff at code.gnucash.org
Fri Sep 25 22:21:05 EDT 2009
Author: plongstaff
Date: 2009-09-25 22:21:05 -0400 (Fri, 25 Sep 2009)
New Revision: 18350
Trac: http://svn.gnucash.org/trac/changeset/18350
Modified:
gnucash/trunk/configure.in
gnucash/trunk/src/gnome-utils/print-session.c
gnucash/trunk/src/gnome-utils/print-session.h
gnucash/trunk/src/html/gnc-html-graph-gog.c
Log:
If webkit chosen as html engine, don't bother looking for gtkhtml.
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2009-09-26 00:07:49 UTC (rev 18349)
+++ gnucash/trunk/configure.in 2009-09-26 02:21:05 UTC (rev 18350)
@@ -541,43 +541,6 @@
AC_SUBST(GCONF_LIBS)
### --------------------------------------------------------------------------
-### determine the HTML engine
-
-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)
-
-### --------------------------------------------------------------------------
### LIBXML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK
LIBXML2_REQUIRED=2.5.10
@@ -1204,55 +1167,82 @@
CPPFLAGS="${saved_CPPFLAGS}"
fi
- # check for gtkhtml >= 3.14 with gtkprint support
- gtkhtml=0
- PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14, [
- if test "x$HAVE_GTK_2_10" != "xyes"; then
- AC_MSG_NOTICE([Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10])
- elif test "x$goffice_with_cairo" != "x1"; then
- AC_MSG_NOTICE([Found libgtkhtml-3.14, but goffice lacks a cairo renderer])
- else
- gtkhtml=1
- AC_DEFINE(GTKHTML_USES_GTKPRINT,1,[GtkHTML uses GtkPrint for printing operations])
- fi
- ], [gtkhtml=0])
- AM_CONDITIONAL(GTKHTML_USES_GTKPRINT,test "x$gtkhtml" = "x1")
+ ### --------------------------------------------------------------------------
+ ### determine the HTML engine
- # GOffice >= 0.5 requires GtkHTML >= 3.14
- if test x$have_goffice_0_5 = x1 -a x$gtkhtml = x0 ; then
- AC_MSG_ERROR([Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support])
- fi
+ 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"])
- # check for gtkhtml >= 3.16 (includes gtk_html_print_operation_run())
- if test x$gtkhtml = x1; then
- 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
- fi
+ case "$with_html_engine" in
+ gtkhtml)
- # fallback to older gtkhtml versions and gnomeprint
- if test x$gtkhtml = x0
- then
- PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8 , [gtkhtml=1], [
- PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.6 , [gtkhtml=1], [
- PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.2 , [gtkhtml=1], [
- PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1 , [gtkhtml=1], [
- AC_MSG_ERROR([Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)])
- ])
- ])
- ])
- ])
+ # check for gtkhtml >= 3.14 with gtkprint support
+ gtkhtml=0
+ PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14, [
+ if test "x$HAVE_GTK_2_10" != "xyes"; then
+ AC_MSG_NOTICE([Found libgtkhtml-3.14, but not gtk+-2.0 >= 2.10])
+ elif test "x$goffice_with_cairo" != "x1"; then
+ AC_MSG_NOTICE([Found libgtkhtml-3.14, but goffice lacks a cairo renderer])
+ else
+ gtkhtml=1
+ AC_DEFINE(GTKHTML_USES_GTKPRINT,1,[GtkHTML uses GtkPrint for printing operations])
+ fi
+ ], [gtkhtml=0])
+ AM_CONDITIONAL(GTKHTML_USES_GTKPRINT,test "x$gtkhtml" = "x1")
+
+ # GOffice >= 0.5 requires GtkHTML >= 3.14
+ if test x$have_goffice_0_5 = x1 -a x$gtkhtml = x0 ; then
+ AC_MSG_ERROR([Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support])
+ fi
- PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2 libgnomeprintui-2.2)
- AS_SCRUB_INCLUDE(GNOME_PRINT_CFLAGS)
- AC_SUBST(GNOME_PRINT_CFLAGS)
- AC_SUBST(GNOME_PRINT_LIBS)
- fi
+ # check for gtkhtml >= 3.16 (includes gtk_html_print_operation_run())
+ if test x$gtkhtml = x1; then
+ 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
+ fi
+
+ # fallback to older gtkhtml versions and gnomeprint
+ if test x$gtkhtml = x0
+ then
+ PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8 , [gtkhtml=1], [
+ PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.6 , [gtkhtml=1], [
+ PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.2 , [gtkhtml=1], [
+ PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1 , [gtkhtml=1], [
+ AC_MSG_ERROR([Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8 or 3.14)])
+ ])
+ ])
+ ])
+ ])
+
+ PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2 libgnomeprintui-2.2)
+ AS_SCRUB_INCLUDE(GNOME_PRINT_CFLAGS)
+ AC_SUBST(GNOME_PRINT_CFLAGS)
+ AC_SUBST(GNOME_PRINT_LIBS)
+ fi
+ ;;
+
+ webkit)
+ PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= "1.0")
+ AC_DEFINE(WANT_WEBKIT,1,[Use webkit instead of gtkhtml])
+ AM_CONDITIONAL(GTKHTML_USES_GTKPRINT,false)
+ ;;
+ *) AC_MSG_ERROR([Invalid HTML engine: must be gtkhtml or webkit]) ;;
+ esac
+
+ AC_MSG_RESULT([$with_html_engine])
+
+ AM_CONDITIONAL(HTML_USING_WEBKIT, [test x${with_html_engine} = xwebkit])
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
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$;;")
Modified: gnucash/trunk/src/gnome-utils/print-session.c
===================================================================
--- gnucash/trunk/src/gnome-utils/print-session.c 2009-09-26 00:07:49 UTC (rev 18349)
+++ gnucash/trunk/src/gnome-utils/print-session.c 2009-09-26 02:21:05 UTC (rev 18350)
@@ -26,7 +26,7 @@
# include <gtk/gtkprintoperation.h>
#endif
-#ifndef GTKHTML_USES_GTKPRINT
+#if !WANT_WEBKIT && !defined(GTKHTML_USES_GTKPRINT)
# include <gnome.h>
# include <glib/gi18n.h>
# include <libgnomeprint/gnome-font.h>
@@ -126,7 +126,7 @@
#endif /* HAVE_GTK_2_10 */
-#ifndef GTKHTML_USES_GTKPRINT
+#if !WANT_WEBKIT && !defined(GTKHTML_USES_GTKPRINT)
static void gnc_print_session_fontsel_cb(GtkButton *widget, gpointer user_data)
{
PrintSession *ps = (PrintSession *)user_data;
Modified: gnucash/trunk/src/gnome-utils/print-session.h
===================================================================
--- gnucash/trunk/src/gnome-utils/print-session.h 2009-09-26 00:07:49 UTC (rev 18349)
+++ gnucash/trunk/src/gnome-utils/print-session.h 2009-09-26 02:21:05 UTC (rev 18350)
@@ -66,7 +66,7 @@
#endif /* HAVE_GTK_2_10 */
-#ifndef GTKHTML_USES_GTKPRINT
+#if !WANT_WEBKIT && !defined(GTKHTML_USES_GTKPRINT)
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-job.h>
Modified: gnucash/trunk/src/html/gnc-html-graph-gog.c
===================================================================
--- gnucash/trunk/src/html/gnc-html-graph-gog.c 2009-09-26 00:07:49 UTC (rev 18349)
+++ gnucash/trunk/src/html/gnc-html-graph-gog.c 2009-09-26 02:21:05 UTC (rev 18350)
@@ -40,7 +40,7 @@
#else
# include <goffice/graph/gog-renderer-pixbuf.h>
#endif
-#ifndef GTKHTML_USES_GTKPRINT
+#if !WANT_WEBKIT && !defined(GTKHTML_USES_GTKPRINT)
# include <goffice/graph/gog-renderer-gnome-print.h>
#endif
/* everything inside the following #ifndef can be safely removed when gnucash
More information about the gnucash-changes
mailing list