aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Ewing <lewing@src.gnome.org>2003-07-27 08:03:02 +0800
committerLarry Ewing <lewing@src.gnome.org>2003-07-27 08:03:02 +0800
commit4c7064adae0585113a2cd04e3a3e9674ef356140 (patch)
tree8cdb92b0a2f0a1b0d8e0328286ae3ed215091637
parentcc8c3d2a38768e1184138534e81f4df568fba9fb (diff)
downloadgsoc2013-evolution-4c7064adae0585113a2cd04e3a3e9674ef356140.tar.gz
gsoc2013-evolution-4c7064adae0585113a2cd04e3a3e9674ef356140.tar.zst
gsoc2013-evolution-4c7064adae0585113a2cd04e3a3e9674ef356140.zip
update to gtkhtml-3.1
svn path=/trunk/; revision=21983
-rw-r--r--ChangeLog4
-rw-r--r--configure.in14
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e7bd33f8ea..5878e5205b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-26 Larry Ewing <lewing@ximian.com>
+
+ * configure.in: use libgtkhtml-3.1 for linking.
+
2003-07-26 Rodney Dawes <dobey@ximian.com>
* configure.in: Bump version to "1.5", so that we end up being
diff --git a/configure.in b/configure.in
index 951548e33e..9a4ee07411 100644
--- a/configure.in
+++ b/configure.in
@@ -523,10 +523,10 @@ dnl *********
dnl Libraries
dnl *********
-PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.0)
+PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1)
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
-GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.0`
+GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.1`
AC_SUBST(GTKHTML_DATADIR)
@@ -1052,7 +1052,7 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
dnl --- Required version numbers
GAL_REQUIRED=1.99.8
-GTKHTML_REQUIRED=3.0.6
+GTKHTML_REQUIRED=3.1.0
AC_SUBST(GAL_REQUIRED)
AC_SUBST(GTKHTML_REQUIRED)
@@ -1101,7 +1101,7 @@ AC_SUBST(LIBFILTER_LIBS)
dnl --- evolution (shell) flags
-EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-3.0 >= $GTKHTML_REQUIRED)
+EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-3.1 >= $GTKHTML_REQUIRED)
AC_SUBST(SHELL_CFLAGS)
AC_SUBST(SHELL_LIBS)
@@ -1121,13 +1121,13 @@ fi
dnl -- evolution-executive-summary flags
-EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 soup-2.0 libgtkhtml-3.0 >= $GTKHTML_REQUIRED)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 soup-2.0 libgtkhtml-3.1 >= $GTKHTML_REQUIRED)
AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
dnl --- evolution-calendar flags
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.0 >= $GTKHTML_REQUIRED, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS})
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
@@ -1139,7 +1139,7 @@ fi
dnl --- evolution-mail flags
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 soup-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.0 >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 soup-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.1 >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss)
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS)