aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--camel/providers/mbox/Makefile.am10
-rw-r--r--configure.in23
-rw-r--r--libical/ChangeLog5
-rw-r--r--libical/src/libicalss/Makefile.am5
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/Makefile.am7
-rw-r--r--shell/Makefile.am10
-rw-r--r--widgets/e-table/ChangeLog4
-rw-r--r--widgets/e-table/Makefile.am4
10 files changed, 70 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f338003c8..df146093e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-03-01 Ettore Perazzoli <ettore@helixcode.com>
+
+ * shell/Makefile.am (INCLUDES): use `top_srcdir' instead of
+ `srcdir'. Also, add `$(top_srcdir)'. And put the srcdir includes
+ before everything else.
+ (evolution_LDADD): `libeutil.la', not `libeutil.a'.
+
+ * configure.in: Build `filter/Makefile'. Added check for GtkHTML.
+ Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values
+ for linking with GtkHTML.
+
2000-03-01 Federico Mena Quintero <federico@helixcode.com>
* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,
diff --git a/camel/providers/mbox/Makefile.am b/camel/providers/mbox/Makefile.am
index 431ad054fa..e3234ce228 100644
--- a/camel/providers/mbox/Makefile.am
+++ b/camel/providers/mbox/Makefile.am
@@ -9,11 +9,15 @@ providerdir = $(pkglibdir)/camel-providers/$(VERSION)
provider_LTLIBRARIES = libcamelmbox.la
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
+INCLUDES = -I.. \
+ -I$(srcdir)/.. \
+ -I$(top_srcdir)/camel \
-I$(top_srcdir)/intl \
- $(GTK_INCLUDEDIR) -I$(top_srcdir)/camel \
-I$(top_srcdir)/libibex \
- -I$(top_srcdir)/e-util
+ -I$(top_srcdir)/e-util \
+ -I$(top_srcdir) \
+ -I$(includedir) \
+ $(GTK_INCLUDEDIR)
libcamelmbox_la_SOURCES = \
camel-mbox-folder.c \
diff --git a/configure.in b/configure.in
index 77d10672eb..9fa9ab94ab 100644
--- a/configure.in
+++ b/configure.in
@@ -179,6 +179,28 @@ BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gtkh
AC_SUBST(BONOBO_HTML_GNOME_LIBS)
AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
+dnl ******************************
+dnl GtkHTML checking
+dnl ******************************
+
+AC_MSG_CHECKING(for GtkHTML)
+if gnome-config --libs gtkhtml > /dev/null 2>&1; then
+ gtkhtml_ok=true
+else
+ gtkhtml_ok=false
+fi
+
+if $gtkhtml_ok; then
+ AC_MSG_RESULT(found)
+else
+ AC_MSG_ERROR(GtkHTML is required to compile Evolution)
+fi
+
+GTKHTML_CFLAGS="`gnome-config --cflags gtkhtml`"
+GTKHTML_LIBS="`gnome-config --libs gtkhtml`"
+
+AC_SUBST(GTKHTML_CFLAGS)
+AC_SUBST(GTKHTML_LIBS)
dnl ******************************
dnl Gnome-VFS checking
@@ -258,4 +280,5 @@ calendar/doc/C/Makefile
calendar/idl/Makefile
calendar/cal-client/Makefile
calendar/pcs/Makefile
+filter/Makefile
])
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 895ee32505..0e8848ea69 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-01 Ettore Perazzoli <ettore@helixcode.com>
+
+ * src/libicalss/Makefile.am (INCLUDES): Include from
+ `$(top_srcdir)/src/libical'.
+
2000-02-26 Seth Alves <alves@hungry.com>
* src/libical/icalitipy.y: renamed icalitip.y so automake bung is easy
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
index fd229b7b8a..d2f65de885 100644
--- a/libical/src/libicalss/Makefile.am
+++ b/libical/src/libicalss/Makefile.am
@@ -1,3 +1,6 @@
+INCLUDES = \
+ -I$(top_srcdir)/src/libical
+
lib_LTLIBRARIES = libicalss.la
libicalss_la_SOURCES = \
@@ -8,5 +11,3 @@ libicalss_la_SOURCES = \
icalcomponent.h \
icalstore.c \
icalstore.h
-
-INCLUDES = -I../libical/
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 93a24b078e..bf1987d547 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-01 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am (INCLUDES): Add `$(top_srcdir)'. Also, the
+ `top_srcdir' includes must come first everything else to avoid
+ including installed headers instead of our fresh ones.
+
2000-02-28 NotZed <NotZed@HelixCode.com>
* Makefile.am (evolution_mail_LDADD): Fixed references to eutil.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index c1e7a7c530..5659053b79 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -3,14 +3,15 @@ bin_PROGRAMS = evolution-mail test-mail
providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
INCLUDES = \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/e-text \
+ -I$(top_srcdir) \
$(BONOBO_HTML_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
- -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
- -I$(top_srcdir)/widgets \
- -I$(top_srcdir)/widgets/e-text
+ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
EVOLUTION_MAIL_CORBA_GENERATED = \
Mail.h \
diff --git a/shell/Makefile.am b/shell/Makefile.am
index dc568fc2bd..878c94a11b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,12 +1,12 @@
bin_PROGRAMS = evolution
-INCLUDES = \
+INCLUDES = \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir) \
$(BONOBO_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
- -I$(srcdir)/../widgets
-
+ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
EVOLUTION_CORBA_GENERATED = \
Evolution.h \
@@ -40,7 +40,7 @@ $(EVOLUTION_CORBA_GENERATED): Evolution.idl
evolution_LDADD = \
../widgets/shortcut-bar/libshortcut-bar.a \
../widgets/e-text/libetext.a \
- ../e-util/libeutil.a \
+ ../e-util/libeutil.la \
$(BONOBO_GNOME_LIBS)
EXTRA_DIST = Evolution.idl
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index 5f3d997ab7..a536a37fe5 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-01 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am: Use `libeutil.la', not `libeutil.a'.
+
2000-02-29 Christopher James Lahey <clahey@helixcode.com>
* test-table.c: Test frozen columns
diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am
index 4364c1fbc0..d32b74d406 100644
--- a/widgets/e-table/Makefile.am
+++ b/widgets/e-table/Makefile.am
@@ -69,7 +69,7 @@ table_example_1_SOURCES = \
table_example_1_LDADD = \
libetable.a \
$(EXTRA_GNOME_LIBS) \
- $(top_builddir)/e-util/libeutil.a \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/e-text/libetext.a
table_example_1_LDFLAGS = `gnome-config --libs gdk_pixbuf`
@@ -80,7 +80,7 @@ table_example_2_SOURCES = \
table_example_2_LDADD = \
libetable.a \
$(EXTRA_GNOME_LIBS) \
- $(top_builddir)/e-util/libeutil.a \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/e-text/libetext.a
table_example_2_LDFLAGS = `gnome-config --libs gdk_pixbuf`