From 338b9ab89b94c9daeec1377e4063bec6f67ab713 Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Tue, 15 Jan 2008 14:41:29 +0200 Subject: [PATCH] Allow building with new gtkhtml. Fallback to 3.8 if 3.14 is not found. Split out gtkhtml *FLAGS from common gtk flags. --- configure.ac | 10 +++++++++- src/Makefile.am | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 56748e1..2a840ef 100644 --- a/configure.ac +++ b/configure.ac @@ -44,10 +44,18 @@ fi CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall -Wmissing-prototypes -Wmissing-declarations" -PKG_CHECK_MODULES(GLIBGTK, glib-2.0 gconf-2.0 dbus-glib-1 gtk+-2.0 libgtkhtml-3.8) +PKG_CHECK_MODULES(GLIBGTK, glib-2.0 gconf-2.0 dbus-glib-1 gtk+-2.0) AC_SUBST(GLIBGTK_LIBS) AC_SUBST(GLIBGTK_CFLAGS) +dnl Maemo has 3.8, but prefer new version in case it's available +PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14, HAVE_GTKHTML=yes, HAVE_GTKHTML=no) +if test "x$HAVE_GTKHTML" = "xno"; then + PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8) +fi +AC_SUBST(GTKHTML_LIBS) +AC_SUBST(GTKHTML_CFLAGS) + AC_ARG_ENABLE([770],AS_HELP_STRING([--enable-770],[Build for Nokia 770/N800]), [enable_770=$enableval], [enable_770=no]) diff --git a/src/Makefile.am b/src/Makefile.am index 44c0b08..647175b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE bin_PROGRAMS = mapper osm2db -mapper_CFLAGS = $(GLIBGTK_CFLAGS) \ +mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) \ $(OSSO_CFLAGS) $(CONIC_CFLAGS) \ $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAGS) $(OSSO_HELP_CFLAGS) \ $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) \ @@ -33,7 +33,7 @@ mapper_CFLAGS = $(GLIBGTK_CFLAGS) \ $(BLUEZ_CFLAGS) \ $(GYPSY_CFLAGS) -mapper_LDADD = $(GLIBGTK_LIBS) \ +mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) \ $(OSSO_LIBS) $(CONIC_LIBS) \ $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(OSSO_HELP_LIBS) \ $(GNOME_VFS_LIBS) $(GCONF_LIBS) \ -- 2.39.5