diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | composer/ChangeLog | 4 | ||||
| -rw-r--r-- | composer/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 39 |
4 files changed, 13 insertions, 40 deletions
@@ -1,3 +1,7 @@ +2001-05-31 Christopher James Lahey <clahey@ximian.com> + + * configure.in (GTKHTML_DATADIR): Use --moddatadir to derive this. + 2001-05-30 Dan Winship <danw@ximian.com> * configure.in: Bump gal dependency to 0.8.99.1 diff --git a/composer/ChangeLog b/composer/ChangeLog index 2b11c3faf3..06603be064 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,7 @@ +2001-05-31 Christopher James Lahey <clahey@ximian.com> + + * Makefile.am (HTML_EDITOR_GENERATED): Use GTKHTML_DATADIR here. + 2001-05-31 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer.c (build_message): Fixed up the S/MIME diff --git a/composer/Makefile.am b/composer/Makefile.am index b7c7a38a5f..f51753a96e 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -22,10 +22,10 @@ $(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.id $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ -I $(selectnamesdir) $(srcdir)/Composer.idl -Editor-commmon.c: $(GTK_HTML_EDITOR_IDL) +Editor-commmon.c: $(GTKHTML_DATADIR)/gtkhtml/Editor.idl -$(HTML_EDITOR_GENERATED): $(GTK_HTML_EDITOR_IDL) - $(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL) +$(HTML_EDITOR_GENERATED): $(GTKHTML_DATADIR)/gtkhtml/Editor.idl + $(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(GTKHTML_DATADIR)/gtkhtml $(GTKHTML_DATADIR)/gtkhtml/Editor.idl ## diff --git a/configure.in b/configure.in index cb1d22989f..3304686ff0 100644 --- a/configure.in +++ b/configure.in @@ -374,45 +374,10 @@ AC_SUBST(GNOME_PRINT_CFLAGS) GTKHTML_CFLAGS="`gnome-config --cflags gtkhtml`" GTKHTML_LIBS="`gnome-config --libs gtkhtml`" +GTKHTML_DATADIR=`gnome-config --moddatadir gtkhtml` AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) - -if test x${prefix} = xNONE; then - html_prefix=$ac_default_prefix -else - html_prefix=$prefix -fi -AC_MSG_CHECKING(for Editor.idl in `gnome-config --datadir`/gtkhtml or ${html_prefix}/share/gtkhtml) -if test -f `gnome-config --datadir`/gtkhtml/Editor.idl; then - GTK_HTML_EDITOR_IDL=`gnome-config --datadir`/gtkhtml/Editor.idl - AC_MSG_RESULT(found - $GTK_HTML_EDITOR_IDL) -else - if test -f ${html_prefix}/share/gtkhtml/Editor.idl; then - GTK_HTML_EDITOR_IDL=${html_prefix}/share/gtkhtml/Editor.idl - AC_MSG_RESULT(found - $GTK_HTML_EDITOR_IDL) - else - AC_MSG_RESULT(not found) - if test "x$GNOME_PATH" != "x" ; then - for dir in `echo $GNOME_PATH | sed -e "s/:/ /" `; do - AC_MSG_CHECKING(for Editor.idl in ${dir}) - if test -f ${dir}/share/gtkhtml/Editor.idl ; then - GTK_HTML_EDITOR_IDL=${dir}/share/gtkhtml/Editor.idl - AC_MSG_RESULT(found - $GTK_HTML_EDITOR_IDL) - break - else - AC_MSG_RESULT(not found) - fi - done - fi - - if test "x$GTK_HTML_EDITOR_IDL" = "x" ; then - AC_MSG_ERROR(Editor.idl is required to compile Evolution; it's included in GtkHTML. -You need GtkHTML built with html-editor-control) - fi - fi -fi - -AC_SUBST(GTK_HTML_EDITOR_IDL) +AC_SUBST(GTKHTML_DATADIR) GNOME_VFS_LIBS="`gnome-config --libs vfs`" GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`" |