Merge commit 'origin/kill-bonobo'

1 files changed, 263 insertions, 168 deletions

diff --git a/configure.ac b/configure.ac
index 607ceb01ae..8f771064ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,15 +28,18 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(README)
 
+dnl User Documentation
+GNOME_DOC_INIT
+
+dnl Developer Documentation
+GTK_DOC_CHECK(1.9)
+
 dnl This is for the autoconf tests only - it set's the language we use
 AC_LANG(C)
 
 dnl Automake 1.11 - Silent Build Rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-dnl Gnome Doc Initialization
-GNOME_DOC_INIT
-
 dnl Some requirements have versioned package names
 dnl XXX In the spirit of getting rid of versioned
 dnl     files, can we please drop these suffixes?
@@ -50,7 +53,6 @@ m4_define([eds_minimum_version], [evo_version])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([gnome_desktop_minimum_version], [2.26.0])
 m4_define([libbonobo_minimum_version], [2.20.3])
-m4_define([libbonoboui_minimum_version], [2.4.2])
 m4_define([libgtkhtml_minimum_version], [3.27.90])
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libglade_minimum_version], [2.0.0])		dnl XXX Just a Guess
@@ -59,6 +61,7 @@ m4_define([libgnomeui_minimum_version], [2.0.0])	dnl XXX Just a Guess
 m4_define([libxml_minimum_version], [2.7.3])
 m4_define([shared_mime_info_minimum_version], [0.22])
 m4_define([libpst_minimum_version], [0.6.41])
+m4_define([unique_minimum_version], [1.0.8])
 
 dnl Optional Packages
 m4_define([dbus_minimum_version], [0.74])
@@ -68,15 +71,15 @@ m4_define([libnotify_minimum_version], [0.3.0])
 m4_define([gnome_pilot_minimum_version], [2.0.15])
 m4_define([gweather_minimum_version], [2.25.3])
 
+dnl ******************************
 dnl Compiler Warning Flags
-
+dnl ******************************
 AS_COMPILER_FLAGS(WARNING_FLAGS,
 	"-DG_DISABLE_DEPRECATED
 	-DPANGO_DISABLE_DEPRECATED
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
 	-DGDK_DISABLE_DEPRECATED
 	-DG_DISABLE_SINGLE_INCLUDES
-	-DGTK_DISABLE_SINGLE_INCLUDES
 	-Wall -Wextra
 	-Wno-missing-field-initializers
 	-Wno-sign-compare
@@ -95,15 +98,24 @@ dnl	-Wmissing-format-attribute
 dnl	-Wshadow
 dnl	-Wformat-nonliteral
 
+dnl Disabled until libunique fixes its headers.  Think it's
+dnl already fixed in git, just waiting for a formal release.
+dnl	-DGTK_DISABLE_SINGLE_INCLUDES
+
 CFLAGS="$CFLAGS $WARNING_FLAGS"
+LDFLAGS="$LDFLAGS -Wl,--no-undefined"
 
 AC_CANONICAL_HOST
 AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number])
 
+dnl *************************************
 dnl Put the ACLOCAL flags in the Makefile
+dnl *************************************
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
+dnl ******************************
 dnl Initialize maintainer mode
+dnl ******************************
 AM_MAINTAINER_MODE
 
 if test "$evo_version" != "$evo_stable_version"; then
@@ -136,7 +148,9 @@ case $YACC in
 esac
 AC_ARG_PROGRAM
 
+dnl ******************************
 dnl  Test whether jw is installed
+dnl ******************************
 AC_PATH_PROG(JW,jw,no)
 if test x$JW = xno; then
 	HAVE_JW="no"
@@ -146,7 +160,9 @@ fi
 AM_CONDITIONAL(HAVE_JW, [test x$HAVE_JW = xyes])
 AC_SUBST(HAVE_JW)
 
+dnl ******************************
 dnl I18N stuff
+dnl ******************************
 IT_PROG_INTLTOOL([0.35.5])
 
 AM_GLIB_GNU_GETTEXT
@@ -158,10 +174,12 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettex
 localedir='$(prefix)/$(DATADIRNAME)/locale'
 AC_SUBST(localedir)
 
-dnl Initialize libtool
+dnl ******************************
+dnl Initialize libtool \ DOLT
 dnl if switch to libtool >= 2.2, replace existing with following:
 dnl LT_PREREQ(2.2)
 dnl LT_INIT(disable-static win32-dll)
+dnl ******************************
 AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
@@ -169,7 +187,9 @@ DOLT
 
 PKG_PROG_PKG_CONFIG
 
+dnl ******************************
 dnl Win32
+dnl ******************************
 AC_MSG_CHECKING([for Win32])
 case "$host" in
 *-mingw*)
@@ -198,6 +218,9 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
 AC_SUBST(NO_UNDEFINED)
 AC_SUBST(SOEXT)
 
+MATH_LIB="-lm"
+AC_SUBST(MATH_LIB)
+
 if test "$os_win32" = "yes"; then
 	AC_CHECK_TOOL(WINDRES, windres, :)
 else
@@ -208,35 +231,42 @@ AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:")
 
 AC_SUBST(WINDRES)
 
+dnl **********************************
 dnl Check for base dependencies early.
+dnl **********************************
 PKG_CHECK_MODULES([GNOME_PLATFORM],
 	[glib-2.0 >= glib_minimum_version
-	gtk+-2.0 >= gtk_minimum_version
-	gconf-2.0 >= gconf_minimum_version
-	libbonobo-2.0 >= libbonobo_minimum_version
-	libbonoboui-2.0 >= libbonoboui_minimum_version
-	libglade-2.0 >= libglade_minimum_version
-	libgnomecanvas-2.0 >= libgnomecanvas_minimum_version
-	libgnomeui-2.0 >= libgnomeui_minimum_version
-	libxml-2.0 >= libxml_minimum_version
-	shared-mime-info >= shared_mime_info_minimum_version
-	gnome-desktop-2.0 >= gnome_desktop_minimum_version])
+	 gtk+-2.0 >= gtk_minimum_version
+	 gconf-2.0 >= gconf_minimum_version
+	 libbonobo-2.0 >= libbonobo_minimum_version
+	 libglade-2.0 >= libglade_minimum_version
+	 libgnomecanvas-2.0 >= libgnomecanvas_minimum_version
+	 libgnomeui-2.0 >= libgnomeui_minimum_version
+	 libxml-2.0 >= libxml_minimum_version
+	 shared-mime-info >= shared_mime_info_minimum_version
+	 gnome-desktop-2.0 >= gnome_desktop_minimum_version])
 AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
 PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
 	[libebook-$EDS_PACKAGE >= eds_minimum_version
-	libecal-$EDS_PACKAGE >= eds_minimum_version
-	libedataserver-$EDS_PACKAGE >= eds_minimum_version
-	libedataserverui-$EDS_PACKAGE >= eds_minimum_version
-	libegroupwise-$EDS_PACKAGE >= eds_minimum_version
-	libebackend-$EDS_PACKAGE >= eds_minimum_version
-	libgdata-$EDS_PACKAGE >= eds_minimum_version
-	libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
+	 libecal-$EDS_PACKAGE >= eds_minimum_version
+	 libedataserver-$EDS_PACKAGE >= eds_minimum_version
+	 libedataserverui-$EDS_PACKAGE >= eds_minimum_version
+	 libegroupwise-$EDS_PACKAGE >= eds_minimum_version
+	 libebackend-$EDS_PACKAGE >= eds_minimum_version
+	 libgdata-$EDS_PACKAGE >= eds_minimum_version
+	 libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
 
+dnl ******************************
+dnl Canberra / Canberra-GTK Sound
+dnl ******************************
+PKG_CHECK_MODULES([CANBERRA],[libcanberra-gtk])
+AC_SUBST(CANBERRA_CFLAGS)
+AC_SUBST(CANBERRA_LIBS)
 
 dnl ******************
-dnl User documentation
+dnl User Documentation
 dnl ******************
 AC_MSG_CHECKING([whether to build user documentation])
 AC_ARG_WITH([help],
@@ -319,6 +349,7 @@ if test "$have_iconv" = no; then
 fi
 AC_SUBST(ICONV_LIBS)
 
+save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -I$srcdir"
 
 AC_MSG_CHECKING([preferred charset name formats for system iconv])
@@ -356,15 +387,19 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 CFLAGS="$save_CFLAGS"
 LIBS="$save_LIBS"
 
+dnl ***********
 dnl alloca()
+dnl ***********
 AC_FUNC_ALLOCA
 
+dnl **************
 dnl waitpid() etc
+dnl **************
 AC_HEADER_SYS_WAIT
 
-dnl
+dnl ***************
 dnl Purify support
-dnl
+dnl ***************
 EVO_PURIFY_SUPPORT
 
 dnl **************
@@ -519,19 +554,19 @@ AC_CHECK_HEADER([sys/mount.h],
 AC_CHECK_FUNCS(statfs)
 
 dnl **************************************************
-dnl * Gnome Icon Theme
+dnl Gnome Icon Theme
 dnl **************************************************
 PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version])
 
 dnl **************************************************
-dnl * Accessibility support
+dnl Accessibility support
 dnl **************************************************
 PKG_CHECK_MODULES([A11Y], [atk])
 AC_SUBST(A11Y_CFLAGS)
 AC_SUBST(A11Y_LIBS)
 
 dnl **************************************************
-dnl * XF86 multimedia keys support
+dnl XF86 multimedia keys support
 dnl **************************************************
 have_xfree=no
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
@@ -548,40 +583,40 @@ dnl **************************************************
 dnl LDAP support.
 dnl **************************************************
 if test "$os_win32" != yes; then
-EVO_LDAP_CHECK(no)
-case $with_openldap in
-no)
-	msg_ldap=no
-	;;
-*)
-	case $with_static_ldap in
-	yes)
-		msg_ldap="yes (static)"
+	EVO_LDAP_CHECK(no)
+	case $with_openldap in
+	no)
+		msg_ldap=no
 		;;
 	*)
-		msg_ldap="yes (dynamic)"
+		case $with_static_ldap in
+		yes)
+			msg_ldap="yes (static)"
 		;;
+		*)
+			msg_ldap="yes (dynamic)"
+			;;
+		esac
 	esac
-esac
 
-SAVE_CFLAGS="$CFLAGS"
-SAVE_LIBS="$LIBS"
-LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED"
-CFLAGS="$CFLAGS $LDAP_CFLAGS"
-LIBS="$LIBS $LDAP_LIBS"
-AC_CHECK_FUNCS(ldap_ntlm_bind)
-CFLAGS="$SAVE_CFLAGS"
-LIBS="$SAVE_LIBS"
-
-else dnl Win32
-LDAP_CFLAGS="-DLDAP_DEPRECATED"
-LDAP_LIBS="-lwldap32"
-AC_SUBST(LDAP_CFLAGS)
-AC_SUBST(LDAP_LIBS)
-AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-AM_CONDITIONAL(ENABLE_LDAP, true)
-msg_ldap="yes"
-fi dnl Win32
+	SAVE_CFLAGS="$CFLAGS"
+	SAVE_LIBS="$LIBS"
+	LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED"
+	CFLAGS="$CFLAGS $LDAP_CFLAGS"
+	LIBS="$LIBS $LDAP_LIBS"
+	AC_CHECK_FUNCS(ldap_ntlm_bind)
+	CFLAGS="$SAVE_CFLAGS"
+	LIBS="$SAVE_LIBS"
+dnl Win32 support
+else
+	LDAP_CFLAGS="-DLDAP_DEPRECATED"
+	LDAP_LIBS="-lwldap32"
+	AC_SUBST(LDAP_CFLAGS)
+	AC_SUBST(LDAP_LIBS)
+	AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
+	AM_CONDITIONAL(ENABLE_LDAP, true)
+	msg_ldap="yes"
+fi
 
 dnl **************************************************
 dnl SunLDAP support, but if OpenLDAP support, skip check SunLDAP.
@@ -625,7 +660,7 @@ AM_CONDITIONAL(ENABLE_NNTP, [test x$enable_nntp = xyes])
 AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is free'ed properly])
 
 dnl **************************************************
-dnl * Posix thread support
+dnl Posix thread support
 dnl **************************************************
 
 dnl GLIB_CONFIG=${GLIB_CONFIG-glib-config}
@@ -650,17 +685,19 @@ AC_SUBST(THREADS_CFLAGS)
 AC_DEFINE(ENABLE_THREADS,1,[Required])
 
 
-dnl *********
-dnl Libraries
-dnl *********
-
+dnl ************
+dnl regex check
+dnl ************
 AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
 			[REGEX_LIBS=-lregex
 			AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
 			[AC_MSG_ERROR([No regex library found])])])
 AC_SUBST(REGEX_LIBS)
 
+dnl *************************
+dnl GTKHTML check
 dnl XXX Drop the version from the package name?
+dnl *************************
 PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-3.14 >= libgtkhtml_minimum_version])
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
@@ -759,29 +796,32 @@ AC_ARG_WITH([krb4-includes],
 	[Location of Kerberos 4 headers]),
 	[with_krb4_includes=$withval],[with_krb4_includes=""])
 
+dnl ************
+dnl Kerberos 5
+dnl ************
 msg_krb5="no"
 if test "x${with_krb5}" != "xno"; then
-	LDFLAGS_save="$LDFLAGS"
+	LIBS_save="$LIBS"
 
 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
 	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
 	sunlibs="-lkrb5 -lgss"
 	AC_CACHE_CHECK([for Kerberos 5], [ac_cv_lib_kerberos5],
 	[
-		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
-		AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context,])],
+		LIBS="$LIBS -L$with_krb5_libs $mitlibs"
+		AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],
 		[ac_cv_lib_kerberos5="$mitlibs"],
 		[
-			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
+			LIBS="$LIBS_save -L$with_krb5_libs $heimlibs"
 			AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],
 			[ac_cv_lib_kerberos5="$heimlibs"],
 			[
-				LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs"
+				LIBS="$LIBS_save -L$with_krb5_libs $sunlibs"
 				AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],
 				[ac_cv_lib_kerberos5="$sunlibs"], [ac_cv_lib_kerberos5="no"])
 			])
 		])
-		LDFLAGS="$LDFLAGS_save"
+		LIBS="$LIBS_save"
 	])
 	if test "$ac_cv_lib_kerberos5" != "no"; then
 		AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
@@ -832,38 +872,40 @@ AC_CHECK_HEADER([com_err.h],
 		#endif
 	]])
 
+dnl ***********
+dnl Kerberos 4
+dnl ***********
 msg_krb4="no"
 if test "x${with_krb4}" != "xno"; then
-	LDFLAGS_save="$LDFLAGS"
+	LIBS_save="$LIBS"
 	AC_CACHE_CHECK([for Kerberos 4], [ac_cv_lib_kerberos4],
 	[
 		ac_cv_lib_kerberos4="no"
-
 		mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
 		dnl Look for MIT krb5 compat krb4
-		LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs"
+		LIBS="$LIBS_save -L$with_krb4_libs $mitcompatlibs"
 		AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
 		[ac_cv_lib_kerberos4="$mitcompatlibs"])
 
 		if test "$ac_cv_lib_kerberos4" = "no"; then
 			dnl Look for KTH krb4
-			LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
+			LIBS="$LIBS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
 			AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
 			[ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken"])
 		fi
 		if test "$ac_cv_lib_kerberos4" = "no"; then
 			dnl Look for old MIT krb4
-			LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb"
+			LIBS="$LIBS_save -L$with_krb4_libs -lkrb"
 			AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
 			[ac_cv_lib_kerberos4="-lkrb"],
 			[
-				LDFLAGS="$LDFLAGS -ldes"
+				LIBS="$LIBS_save -ldes"
 				AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
 				[ac_cv_lib_kerberos4="-lkrb -ldes"])
 			])
 		fi
 	])
-	LDFLAGS="$LDFLAGS_save"
+	LIBS="$LIBS_save"
 	if test "$ac_cv_lib_kerberos4" != "no"; then
 		AC_DEFINE(HAVE_KRB4,1,[Define if you have Krb4])
 		msg_krb4="yes"
@@ -899,10 +941,10 @@ AC_SUBST(KRB5_LIBS)
 AC_SUBST(KRB4_CFLAGS)
 AC_SUBST(KRB4_LIBS)
 
+dnl ******************************
 dnl Mono hooks
-dnl This should just define mono CFLAGS etc here, it is used later to
-dnl turn on the mono plugin or not.
-
+dnl This should just define mono CFLAGS etc here, it is used later to turn on the mono plugin or not.
+dnl ******************************
 MONO_CFLAGS=
 MONO_LIBS=
 AC_ARG_ENABLE([mono],
@@ -912,15 +954,17 @@ AC_ARG_ENABLE([mono],
 if test "x${enable_mono}" = "xyes"; then
 	PKG_CHECK_MODULES([MONO], ["mono"])
 	AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
-	MONO_PLUGIN="mono"
 fi
 AC_SUBST(MONO_CFLAGS)
 AC_SUBST(MONO_LIBS)
 
+AM_CONDITIONAL(ENABLE_MONO, [test "x$enable_mono" = "xyes"])
+
+dnl ******************************
 dnl Python hooks
-dnl This should just define python CFLAGS etc here, it is used later to
-dnl turn on the python plugin or not.
+dnl This should just define python CFLAGS etc here, it is used later to turn on the python plugin or not.
 dnl (Thanks to Pidgin)
+dnl ******************************
 
 AC_ARG_ENABLE([python],
 	AS_HELP_STRING([--enable-python],
@@ -939,23 +983,23 @@ if test "x${enable_python}" = "xyes"; then
 		changequote([, ])dnl
 
 		if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then
-		   	PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
+			PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
 			PY_INCLUDES="-I$PY_PREFIX/include/python$PY_VERSION"
 			AC_MSG_RESULT([ok])
 			python_package="python-devel"
-			PYTHON_PLUGIN="python"
 		else
 			AC_MSG_ERROR([Can't find Python.h])
 			PY_LIBS=""
 			PY_INCLUDES=""
 			python_package=""
-			PYTHON_PLUGIN=""
 		fi
 	fi
 	AC_SUBST(PY_LIBS)
 	AC_SUBST(PY_INCLUDES)
 fi
 
+AM_CONDITIONAL(ENABLE_PYTHON, [test "x$enable_python" = "xyes"])
+
 
 dnl ********************************************************************************
 dnl security extension support (SSL and S/MIME)
@@ -1091,22 +1135,22 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 
 			AC_CACHE_CHECK([for Mozilla nspr libraries], [ac_cv_moz_nspr_libs],
 			[
-		       		LIBS_save="$LIBS"
+				LIBS_save="$LIBS"
 				CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"
 
 				if test "x${with_nspr_libs}" != "x"; then
-		       			LIBS="$nsprlibs"
-		       			LDFLAGS="$LDFLAGS -L$with_nspr_libs"
+					LIBS="$nsprlibs"
+					LDFLAGS="$LDFLAGS -L$with_nspr_libs"
 				else
-		       			LIBS="$nsprlibs"
-		       			LDFLAGS="$LDFLAGS"
+					LIBS="$nsprlibs"
+					LDFLAGS="$LDFLAGS"
 				fi
 
 				AC_LINK_IFELSE([AC_LANG_CALL([], [PR_Init])],
 				[ac_cv_moz_nspr_libs="yes"], [ac_cv_moz_nspr_libs="no"])
 				CFLAGS="$CFLAGS_save"
 				LDFLAGS="$LDFLAGS_save"
-	 			LIBS="$LIBS_save"
+				LIBS="$LIBS_save"
 			])
 			if test "x$ac_cv_moz_nspr_libs" != "xno"; then
 				have_nspr_libs="yes"
@@ -1160,7 +1204,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 			LDFLAGS_save="$LDFLAGS"
 
 			if test "$enable_nss" = "static"; then
-		    		if test -z "${with_nss_libs}"; then
+				if test -z "${with_nss_libs}"; then
 					AC_MSG_ERROR([Static linkage requested, but path to nss libraries not set.]
 					[Please specify the path to libnss3.a]
 					[Example: --with-nspr-libs=/usr/lib/mozilla])
@@ -1173,14 +1217,14 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 					esac
 				fi
 			else
-		 		nsslibs="-lssl3 -lsmime3 -lnss3"
+				nsslibs="-lssl3 -lsmime3 -lnss3"
 			fi
 
 			AC_CACHE_CHECK([for Mozilla nss libraries], [ac_cv_moz_nss_libs],
 			[
-	 			LIBS_save="$LIBS"
+				LIBS_save="$LIBS"
 				LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
-		      		LIBS="$nsslibs $nsprlibs"
+				LIBS="$nsslibs $nsprlibs"
 				AC_LINK_IFELSE([AC_LANG_CALL([], [NSS_Init])],
 				[ac_cv_moz_nss_libs="yes"], [ac_cv_moz_nss_libs="no"])
 				if test "$ac_cv_moz_nss_libs" = no; then
@@ -1190,7 +1234,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 					[ac_cv_moz_nss_libs="yes"], [ac_cv_moz_nss_libs="no"])
 				fi
 				LDFLAGS="$LDFLAGS_save"
-	 			LIBS="$LIBS_save"
+				LIBS="$LIBS_save"
 			])
 			if test "$ac_cv_moz_nss_libs" != no; then
 				AC_DEFINE(HAVE_NSS)
@@ -1198,7 +1242,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 				AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"$with_nss_libs", [Define to the full path of mozilla nss library])
 				if test "$enable_nss" = "static"; then
 					msg_ssl="yes (Mozilla NSS:static)"
-		 		else
+				else
 					msg_ssl="yes (Mozilla NSS)"
 				fi
 				dnl static_nss
@@ -1334,7 +1378,9 @@ AC_COMPILE_IFELSE([
 
 CFLAGS="$evolution_save_cflags"
 
-
+dnl *************************
+dnl Orbit / Bonobo
+dnl *************************
 AM_PATH_ORBIT2(2.9.8)
 
 AC_MSG_CHECKING([for CORBA include paths])
@@ -1342,22 +1388,21 @@ IDL_INCLUDES="-I "`${PKG_CONFIG} --variable=idldir libbonobo-2.0`" -I "`${PKG_CO
 AC_MSG_RESULT([$IDL_INCLUDES])
 AC_SUBST(IDL_INCLUDES)
 
+dnl *****************************************************************
 dnl Utility macro to set compiler flags for a specific lib.
 dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS)
+dnl *****************************************************************
 AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
 	PKG_CHECK_MODULES([$1], [$2])
-	$1_CFLAGS="[$]$1_CFLAGS \$(WERROR) $3"
+	$1_CFLAGS="[$]$1_CFLAGS $3"
 	$1_LIBS="[$]$1_LIBS $4"
 ])
 
-dnl --- Required version numbers
-
-BONOBOUI_REQUIRED=libbonoboui_minimum_version
-AC_SUBST(BONOBOUI_REQUIRED)
+dnl ********************************
+dnl Flags to get all the GNOME stuff
+dnl ********************************
 
-dnl --- Flags to get all the GNOME stuff
-
-FULL_GNOME_DEPS="libbonoboui-2.0 gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0"
+FULL_GNOME_DEPS="gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0"
 
 PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"])
 if test "x$HAVE_HAL" = "xyes"; then
@@ -1369,6 +1414,9 @@ else
 	IPOD_SYNC=""
 fi
 
+dnl ******************************
+dnl TNEF implementation
+dnl ******************************
 AC_MSG_CHECKING([for yTNEF])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 	[[
@@ -1401,7 +1449,9 @@ else
 fi
 AC_SUBST(TNEF_CFLAGS)
 
+dnl ******************************
 dnl Check for dbus-glib-1 and dbus
+dnl ******************************
 AC_ARG_ENABLE([dbus],
 	[AS_HELP_STRING([--enable-dbus],
 	[enable DBUS support (default=yes)])],
@@ -1427,7 +1477,9 @@ else
 fi
 AM_CONDITIONAL([DBUS_SUPPORT], [test "$DBUS_SUPPORT" = yes])
 
+dnl ******************************
 dnl Check for NetworkManager
+dnl ******************************
 AC_ARG_ENABLE([nm],
 	[AS_HELP_STRING([--enable-nm],
 	[enable NetworkManager support (default=yes)])],
@@ -1448,8 +1500,9 @@ fi
 
 AM_CONDITIONAL([NM_SUPPORT], [test "$NM_SUPPORT" = yes])
 
-dnl --- Flags for the various libraries we build
-
+dnl ******************************
+dnl Camel Flags
+dnl ******************************
 EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
@@ -1467,16 +1520,16 @@ else
 	fi
 fi
 
-EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, 	$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS)
+dnl ******************************
+dnl CERT_UI Flags
+dnl ******************************
+EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS)
 AC_SUBST(CERT_UI_CFLAGS)
 AC_SUBST(CERT_UI_LIBS)
 
-EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0)
-AC_SUBST(E_NAME_CFLAGS)
-AC_SUBST(E_NAME_LIBS)
-
-dnl If Gtk/Gdk is built against X11, e-util uses some
-dnl X11-specific code so link with X11.
+dnl ******************************
+dnl If Gtk/Gdk is built against X11, e-util uses some X11-specific code so link with X11.
+dnl ******************************
 if test "x$GDK_BACKEND_X11" = "xyes"; then
 	E_UTIL_X11_CFLAGS="$X_CFLAGS"
 	E_UTIL_X11_LIBS="$X_LIBS"
@@ -1484,36 +1537,56 @@ else
 	E_UTIL_X11_CFLAGS=""
 	E_UTIL_X11_LIBS=""
 fi
-EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS)
+
+dnl ************
+dnl E_UTIL Flags
+dnl ************
+EVO_SET_COMPILE_FLAGS(E_UTIL, libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS)
 AC_SUBST(E_UTIL_CFLAGS)
 AC_SUBST(E_UTIL_LIBS)
 
+E_UTIL_LIBS="$E_UTIL_LIBS $MATH_LIB"
+
+dnl **************
+dnl TZDIALOG Flags
+dnl **************
 EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS)
 AC_SUBST(TZDIALOG_CFLAGS)
 AC_SUBST(TZDIALOG_LIBS)
 
-EVO_SET_COMPILE_FLAGS(E_WIDGETS, libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE)
+dnl ***************
+dnl E_WIDGETS Flags
+dnl ***************
+EVO_SET_COMPILE_FLAGS(E_WIDGETS, gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE gtkhtml-editor)
 AC_SUBST(E_WIDGETS_CFLAGS)
 AC_SUBST(E_WIDGETS_LIBS)
 
-EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE)
+dnl ***************
+dnl IMPORTERS Flags
+dnl ***************
+EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE)
 AC_SUBST(IMPORTERS_CFLAGS)
 AC_SUBST(IMPORTERS_LIBS)
 
+dnl ***************
+dnl LIBFILTER Flags
+dnl ***************
 EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE)
 AC_SUBST(LIBFILTER_CFLAGS)
 AC_SUBST(LIBFILTER_LIBS)
 
-dnl --- evolution (shell) flags
-EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE)
+dnl ***********
+dnl Shell Flags
+dnl ***********
+EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 gnome-desktop-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE)
 
 AC_SUBST(SHELL_CFLAGS)
 AC_SUBST(SHELL_LIBS)
 
-dnl --- evolution-addressbook flags
-
-EVOLUTION_ADDRESSBOOK_DEPS="libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE gtkhtml-editor"
-
+dnl *****************
+dnl Addressbook Flags
+dnl *****************
+EVOLUTION_ADDRESSBOOK_DEPS="libglade-2.0 libgnomeui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE gtkhtml-editor unique-1.0"
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
@@ -1524,6 +1597,9 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
 fi
 
+dnl ***************
+dnl Libnotify Flags
+dnl ***************
 LIBNOTIFY_CFLAGS=
 LIBNOTIFY_LIBS=
 PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= libnotify_minimum_version], [HAVE_LIBNOTIFY="yes"], [HAVE_LIBNOTIFY="no"])
@@ -1536,12 +1612,14 @@ fi
 AC_SUBST(LIBNOTIFY_CFLAGS)
 AC_SUBST(LIBNOTIFY_LIBS)
 
-dnl --- evolution-calendar flags
+dnl **************
+dnl Calendar Flags
+dnl **************
 EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= 2.3.0)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE unique-1.0)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
@@ -1551,14 +1629,16 @@ AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 fi
 
-dnl --- evolution-mail flags
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE)
+dnl **********
+dnl Mail Flags
+dnl **********
+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE unique-1.0)
 AC_SUBST(EVOLUTION_MAIL_CFLAGS)
 AC_SUBST(EVOLUTION_MAIL_LIBS)
 
-dnl -- evolution-data-server IDL and version
-
+dnl ***************************
+dnl Evolution-Data-Server Flags
+dnl ***************************
 AC_DEFINE(DATASERVER_API_VERSION, "1.2", evolution-data-server API version)
 AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`${PKG_CONFIG} --modversion evolution-data-server-1.2`", evolution-data-server version)
 
@@ -1574,19 +1654,26 @@ else
 	AC_MSG_ERROR([no])
 fi
 
-dnl --- evolution-test flags
-
-EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnomeui-2.0 libbonoboui-2.0)
+dnl **********
+dnl Test Flags
+dnl **********
+EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, gtk+-2.0 gconf-2.0 libxml-2.0 unique-1.0)
 AC_SUBST(EVOLUTION_TEST_CFLAGS)
 AC_SUBST(EVOLUTION_TEST_LIBS)
 
+dnl *****************
+dnl EggSMClient Flags
+dnl *****************
+EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, gtk+-2.0)
+AC_SUBST(EGG_SMCLIENT_CFLAGS)
+AC_SUBST(EGG_SMCLIENT_LIBS)
+
 dnl *******************
 dnl Special directories
 dnl *******************
 
-dnl --- If you add something here, consider whether or not you also
-dnl --- need to add it to one or more .pc.in files (for Connector,
-dnl --- etc)
+dnl If you add something here, consider whether or not you also need to add it to one or more .pc.in
+dnl files (for Connector, etc)
 
 privlibdir='${libdir}'/evolution/$BASE_VERSION
 AC_SUBST(privlibdir)
@@ -1603,6 +1690,9 @@ AC_SUBST(privincludedir)
 componentdir="$privlibdir/components"
 AC_SUBST(componentdir)
 
+moduledir="$privlibdir/modules"
+AC_SUBST(moduledir)
+
 idldir='${datadir}'/idl/evolution-$BASE_VERSION
 AC_SUBST(idldir)
 
@@ -1702,20 +1792,32 @@ AC_ARG_ENABLE([plugins],
 	[enable_plugins="$enableval"],[enable_plugins=all])
 
 dnl Add any new plugins here
-plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"
+plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup publish-calendar caldav imap-features google-account-setup webdav-account-setup"
 
-plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN "
-all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
+plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN"
+all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations"
 
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline"
+plugins_standard_always="bbdb subject-thread save-calendar mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates pst-import vcard-inline"
 
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
-plugins_experimental_always="face folder-unsubscribe external-editor hula-account-setup"
-plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN"
+plugins_experimental_always="face external-editor hula-account-setup"
+plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
 
+dnl Temporary KILL-BONOBO hack
+enable_plugins="attachment-reminder addressbook-file audio-inline backup-restore bbdb bogo-junk-plugin caldav calendar-file calendar-http calendar-weather default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features itip-formatter mail-notification mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
+
+dnl PLUGINS NOT BUILDING YET
+dnl ------------------------
+dnl exchange-operations
+dnl groupwise-features
+dnl ipod-sync
+dnl mailing-list-actions
+dnl publish-calendar
+dnl save-calendar
+
 case x"$enable_plugins" in
 xno)
 	plugins_enabled=""
@@ -1739,6 +1841,9 @@ xexperimental)
 	;;
 esac
 
+dnl ******************************
+dnl Profiling support
+dnl ******************************
 AC_ARG_ENABLE([profiling],
 	AS_HELP_STRING([--enable-profiling],
 	[Enable profiling plugin.]),
@@ -1752,17 +1857,6 @@ x | xyes)
 	;;
 esac
 
-if test "x${enable_mono}" = "xyes"; then
-	plugins_enabled="$plugins_enabled mono"
-	msg_plugins="$msg_plugins (and mono)"
-fi
-
-
-if test "x${enable_python}" = "xyes"; then
-	plugins_enabled="$plugins_enabled python"
-	msg_plugins="$msg_plugins (and python)"
-fi
-
 AC_SUBST(plugins_enabled)
 AC_SUBST(all_plugins_base)
 AC_SUBST(all_plugins_standard)
@@ -1791,7 +1885,7 @@ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
 		dnl **************************************************
 		dnl * Exchange Operations plugin
 		dnl **************************************************
-		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE)
+		EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE)
 		AC_SUBST(CAMEL_EXCHANGE_CFLAGS)
 		AC_SUBST(CAMEL_EXCHANGE_LIBS)
 	else
@@ -1874,15 +1968,9 @@ AC_CONFIG_FILES([ po/Makefile.in
 Makefile
 win32/Makefile
 a11y/Makefile
-a11y/addressbook/Makefile
-a11y/calendar/Makefile
-a11y/widgets/Makefile
-a11y/e-table/Makefile
-a11y/e-text/Makefile
 addressbook/Makefile
 addressbook/conduit/Makefile
 addressbook/gui/Makefile
-addressbook/gui/component/Makefile
 addressbook/gui/contact-editor/Makefile
 addressbook/gui/contact-list-editor/Makefile
 addressbook/gui/merging/Makefile
@@ -1895,7 +1983,11 @@ addressbook/util/Makefile
 art/Makefile
 data/Makefile
 data/icons/Makefile
+doc/Makefile
+doc/reference/Makefile
+doc/reference/shell/Makefile
 e-util/Makefile
+em-format/Makefile
 filter/Makefile
 help/Makefile
 help/quickref/Makefile
@@ -1941,6 +2033,7 @@ calendar/gui/Makefile
 calendar/gui/alarm-notify/Makefile
 calendar/gui/dialogs/Makefile
 composer/Makefile
+m4/Makefile
 mail/Makefile
 mail/default/Makefile
 mail/default/C/Makefile
@@ -1964,6 +2057,13 @@ mail/default/sr@latin/Makefile
 mail/default/sv/Makefile
 mail/default/hu/Makefile
 mail/importers/Makefile
+modules/Makefile
+modules/addressbook/Makefile
+modules/calendar/Makefile
+modules/mail/Makefile
+modules/plugin-lib/Makefile
+modules/plugin-mono/Makefile
+modules/plugin-python/Makefile
 plugins/Makefile
 plugins/addressbook-file/Makefile
 plugins/attachment-reminder/Makefile
@@ -1975,14 +2075,12 @@ plugins/caldav/Makefile
 plugins/calendar-file/Makefile
 plugins/calendar-http/Makefile
 plugins/calendar-weather/Makefile
-plugins/copy-tool/Makefile
 plugins/default-mailer/Makefile
 plugins/default-source/Makefile
 plugins/email-custom-header/Makefile
 plugins/exchange-operations/Makefile
 plugins/external-editor/Makefile
 plugins/face/Makefile
-plugins/folder-unsubscribe/Makefile
 plugins/google-account-setup/Makefile
 plugins/groupwise-account-setup/Makefile
 plugins/groupwise-features/Makefile
@@ -1990,27 +2088,24 @@ plugins/hula-account-setup/Makefile
 plugins/imap-features/Makefile
 plugins/ipod-sync/Makefile
 plugins/itip-formatter/Makefile
-plugins/mail-account-disable/Makefile
 plugins/mail-notification/Makefile
 plugins/mail-to-task/Makefile
 plugins/mailing-list-actions/Makefile
 plugins/mark-all-read/Makefile
-plugins/mono/Makefile
 plugins/plugin-manager/Makefile
 plugins/prefer-plain/Makefile
 plugins/profiler/Makefile
 plugins/pst-import/Makefile
 plugins/publish-calendar/Makefile
-plugins/python/Makefile
 plugins/sa-junk-plugin/Makefile
 plugins/save-calendar/Makefile
-plugins/select-one-source/Makefile
 plugins/startup-wizard/Makefile
 plugins/subject-thread/Makefile
 plugins/templates/Makefile
 plugins/tnef-attachments/Makefile
 plugins/vcard-inline/Makefile
 plugins/webdav-account-setup/Makefile
+smclient/Makefile
 smime/Makefile
 smime/lib/Makefile
 smime/gui/Makefile