aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in9
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3abac282b2..c2594b72f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-06 Radek Doulik <rodo@helixcode.com>
+
+ * configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in
+ ${prefix}/share/gtkhtml
+
2000-11-03 Radek Doulik <rodo@helixcode.com>
* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version
diff --git a/configure.in b/configure.in
index a291ce33dd..5ad702ca3b 100644
--- a/configure.in
+++ b/configure.in
@@ -351,13 +351,18 @@ GTKHTML_LIBS="`gnome-config --libs gtkhtml`"
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
-AC_MSG_CHECKING(for HTMLEditor.idl)
+AC_MSG_CHECKING(for HTMLEditor.idl in `gnome-config --datadir`/gtkhtml or ${prefix}/share/gtkhtml)
if test -f `gnome-config --datadir`/gtkhtml/HTMLEditor.idl; then
GTK_HTML_EDITOR_IDL=`gnome-config --datadir`/gtkhtml/HTMLEditor.idl
AC_MSG_RESULT(found)
else
- AC_MSG_ERROR(HTMLEditor.idl is required to compile Evolution composer, it's included in GtkHTML
+ if test -f ${prefix}/share/gtkhtml/HTMLEditor.idl; then
+ GTK_HTML_EDITOR_IDL=${prefix}/share/gtkhtml/HTMLEditor.idl
+ AC_MSG_RESULT(found)
+ else
+ AC_MSG_ERROR(HTMLEditor.idl is required to compile Evolution composer, it's included in GtkHTML
You need GtkHTML build with html-editor-control)
+ fi
fi
AC_SUBST(GTK_HTML_EDITOR_IDL)