From 697761cc337aa77a47140c8df50ed84bc25e23f6 Mon Sep 17 00:00:00 2001 From: Hans Petter Date: Thu, 11 Sep 2003 22:04:44 +0000 Subject: Import new libical from mainline HEAD and make appropriate changes to Evolution. svn path=/trunk/; revision=22538 --- libical/src/Makefile.am | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'libical/src/Makefile.am') diff --git a/libical/src/Makefile.am b/libical/src/Makefile.am index 7a3f9fcdff..5e5cd331db 100644 --- a/libical/src/Makefile.am +++ b/libical/src/Makefile.am @@ -4,6 +4,16 @@ else PYTHON_DIR = endif -# For evolution we only build libical at present. -SUBDIRS = libical libicalvcal -#SUBDIRS = libical libicalss libicalvcal # $(PYTHON_DIR) test +if WITH_JAVA +JAVA_DIR = java +else +JAVA_DIR = +endif + +if WITH_CAP +LIBICALCAP_DIR = libicalcap +else +LIBICALCAP_DIR = +endif + +SUBDIRS = libical libicalss $(LIBICALCAP_DIR) libicalvcal $(PYTHON_DIR) $(JAVA_DIR) test -- cgit