diff --git configure.ac configure.ac
index a4b4fdd..607d9bb 100644
--- configure.ac
+++ configure.ac
@@ -122,7 +122,7 @@ AC_SUBST(PERL)
 
 case $YACC in
 *yacc*)
-	AC_MSG_ERROR(You need bison to build Evolution)
+	AC_MSG_ERROR([You need bison to build Evolution])
 	;;
 esac
 AC_HEADER_STDC
@@ -234,7 +234,7 @@ AC_ARG_WITH([help],
 	[Build user documentation [default=yes]])],
 	[with_help="$withval"],[with_help="yes"])
 AM_CONDITIONAL(WITH_HELP, test "x$with_help" != "xno")
-AC_MSG_RESULT($with_help)
+AC_MSG_RESULT([$with_help])
 
 dnl ******************************
 dnl iconv checking
@@ -323,14 +323,14 @@ AC_SUBST(ICONV_LIBS)
 
 CFLAGS="$CFLAGS -I$srcdir"
 
-AC_MSG_CHECKING(preferred charset name formats for system iconv)
+AC_MSG_CHECKING([preferred charset name formats for system iconv])
 AC_TRY_RUN([
 #define CONFIGURE_IN
 #include "iconv-detect.c"
 ],[
-        AC_MSG_RESULT(found)
+        AC_MSG_RESULT([found])
 ],[
-	AC_MSG_RESULT(not found)
+	AC_MSG_RESULT([not found])
 	AC_WARN([
 	*** The iconv-detect program was unable to determine the
 	*** preferred charset name formats recognized by your
@@ -346,7 +346,7 @@ AC_TRY_RUN([
 		echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h
 		echo '#define ICONV_10646 "UCS-4BE"' >>iconv-detect.h
 	else
-		AC_MSG_RESULT(unknown)
+		AC_MSG_RESULT([unknown])
 		AC_WARN([
 	*** We can't determine the preferred charset name formats
 	*** recognized by your iconv library. You are
@@ -367,18 +367,18 @@ AC_CHECK_HEADERS(sys/wait.h)
 
 if test x$os_win32 != xyes; then
 	dnl check for socklen_t (in Unix98)
-	AC_MSG_CHECKING(for socklen_t)
+	AC_MSG_CHECKING([for socklen_t])
 	AC_TRY_COMPILE([#include <sys/types.h>
 	#include <sys/socket.h>
 	socklen_t x;
-	],[],[AC_MSG_RESULT(yes)],[
+	],[],[AC_MSG_RESULT([yes])],[
 	AC_TRY_COMPILE([#include <sys/types.h>
 	#include <sys/socket.h>
 	int accept (int, struct sockaddr *, size_t *);
 	],[],[
-	AC_MSG_RESULT(size_t)
+	AC_MSG_RESULT([size_t])
 	AC_DEFINE(socklen_t,size_t,[Define to appropriate type if socklen_t is not defined])], [
-	AC_MSG_RESULT(int)
+	AC_MSG_RESULT([int])
 	AC_DEFINE(socklen_t,int)])])
 fi
 
@@ -558,7 +558,7 @@ AC_COMPILE_IFELSE([
 	],
 	have_xfree=yes
 )
-AC_MSG_CHECKING(for X11 XFree86 headers)
+AC_MSG_CHECKING([for X11 XFree86 headers])
 AC_MSG_RESULT([$have_xfree])
 if test x"$have_xfree" = "xyes" ; then
 	AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h])
@@ -757,7 +757,7 @@ if test "x$enable_pilot_conduits" = "xyes"; then
 	LDFLAGS="$LDFLAGS_save"
 
 	if test "$ac_cv_pilot_link_utf8" = no; then
-		AC_MSG_ERROR(evolution requires pilot-link to have working UTF-8 conversion routines)
+		AC_MSG_ERROR([evolution requires pilot-link to have working UTF-8 conversion routines])
 	fi
 fi
 AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, [test x$enable_pilot_conduits = xyes])
@@ -864,8 +864,8 @@ if test "x${with_krb5}" != "xno"; then
 		KRB5_LIBS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
 	fi
 else
-	AC_MSG_CHECKING(for Kerberos 5)
-	AC_MSG_RESULT($with_krb5)
+	AC_MSG_CHECKING([for Kerberos 5])
+	AC_MSG_RESULT([$with_krb5])
 fi
 
 AC_CHECK_HEADER([et/com_err.h],[AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have et/comm_err.h])])
@@ -923,8 +923,8 @@ if test "x${with_krb4}" != "xno"; then
 		CFLAGS="$CFLAGS_save"
 	fi
 else
-	AC_MSG_CHECKING(for Kerberos 4)
-	AC_MSG_RESULT(${with_krb4})
+	AC_MSG_CHECKING([for Kerberos 4])
+	AC_MSG_RESULT([${with_krb4}])
 fi
 
 AC_SUBST(KRB5_CFLAGS)
@@ -963,7 +963,7 @@ AC_ARG_ENABLE([python],
 if test "x${enable_python}" = "xyes"; then
 	AC_PATH_PROG(pythonpath, python)
 	if test "_$pythonpath" != _ ; then
-	   	AC_MSG_CHECKING(for python compile flags)
+		AC_MSG_CHECKING([for python compile flags])
 		PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`
 		PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`
 		changequote(<<, >>)dnl
@@ -974,7 +974,7 @@ if test "x${enable_python}" = "xyes"; then
 		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_INCLUDES="-I$PY_PREFIX/include/python$PY_VERSION"
-			AC_MSG_RESULT(ok)
+			AC_MSG_RESULT([ok])
 			python_package="python-devel"
 			PYTHON_PLUGIN="python"
 		else
@@ -1037,21 +1037,21 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 	fi
 
 	if test "x${check_manually}" = "xno"; then
-		AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)
+		AC_MSG_CHECKING([Mozilla NSPR pkg-config module name])
 		mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr seamonkey-nspr"
 		for pc in $mozilla_nspr_pcs; do
 			if $PKG_CONFIG --exists $pc; then
-				AC_MSG_RESULT($pc)
+				AC_MSG_RESULT([$pc])
 				mozilla_nspr=$pc
 				break;
 			fi
 		done
 
-		AC_MSG_CHECKING(Mozilla NSS pkg-config module name)
+		AC_MSG_CHECKING([Mozilla NSS pkg-config module name])
 		mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss seamonkey-nss"
 		for pc in $mozilla_nss_pcs; do
 			if $PKG_CONFIG --exists $pc; then
-				AC_MSG_RESULT($pc)
+				AC_MSG_RESULT([$pc])
 				mozilla_nss=$pc
 				break;
 			fi
@@ -1083,8 +1083,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 		if test "x${with_nspr_includes}" != "xno"; then
 			CPPFLAGS_save="$CPPFLAGS"
 
-			AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes)
-			AC_MSG_RESULT("")
+			AC_MSG_CHECKING([for Mozilla nspr4 includes in $with_nspr_includes])
+			AC_MSG_RESULT([""])
 
 			CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"
 			AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ])
@@ -1095,8 +1095,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 				MANUAL_NSPR_CFLAGS="-I$with_nspr_includes"
 			fi
 		else
-			AC_MSG_CHECKING(for Mozilla nspr4 includes)
-			AC_MSG_RESULT(no)
+			AC_MSG_CHECKING([for Mozilla nspr4 includes])
+			AC_MSG_RESULT([no])
 		fi
 
 		have_nspr_libs="no"
@@ -1107,10 +1107,10 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 			if test "$enable_nss" = "static"; then
 				if test -z "${with_nspr_libs}"; then
 					AC_MSG_ERROR([Static linkage requested, but path to nspr libraries not set.]
-[Please specify the path to libnspr4.a]
-[Example: --with-nspr-libs=/usr/lib])
-       				else
-	       				nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+					[Please specify the path to libnspr4.a]
+					[Example: --with-nspr-libs=/usr/lib])
+				else
+					nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
 				fi
 			else
 				nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
@@ -1141,15 +1141,15 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 				MANUAL_NSPR_CLFAGS=""
 			fi
 		else
-			AC_MSG_CHECKING(for Mozilla nspr4 libraries)
-			AC_MSG_RESULT(no)
+			AC_MSG_CHECKING([for Mozilla nspr4 libraries])
+			AC_MSG_RESULT([no])
 		fi
 
 		if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
 			CPPFLAGS_save="$CPPFLAGS"
 
-			AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)
-			AC_MSG_RESULT("")
+			AC_MSG_CHECKING([for Mozilla nss3 includes in $with_nss_includes])
+			AC_MSG_RESULT([""])
 
 			if test "x${with_nspr_includes}" != "x"; then
 				CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
@@ -1171,8 +1171,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 				MANUAL_NSPR_LIBS=""
 			fi
 		else
-			AC_MSG_CHECKING(for Mozilla nss3 includes)
-			AC_MSG_RESULT(no)
+			AC_MSG_CHECKING([for Mozilla nss3 includes])
+			AC_MSG_RESULT([no])
 		fi
 
 		if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
@@ -1181,8 +1181,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 			if test "$enable_nss" = "static"; 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])
+					[Please specify the path to libnss3.a]
+					[Example: --with-nspr-libs=/usr/lib/mozilla])
 				else
 					nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a"
 					case "$host" in
@@ -1229,8 +1229,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 				MANUAL_NSPR_LIBS=""
 			fi
 		else
-			AC_MSG_CHECKING(for Mozilla nss libraries)
-			AC_MSG_RESULT(no)
+			AC_MSG_CHECKING([for Mozilla nss libraries])
+			AC_MSG_RESULT([no])
 		fi
 
 		MANUAL_NSS_CFLAGS="$MANUAL_NSPR_CFLAGS $MANUAL_NSS_CFLAGS"
@@ -1248,12 +1248,12 @@ AC_SUBST(MANUAL_NSS_LIBS)
 dnl **************************************************
 dnl Check if we should build the weather calendar plugin
 dnl **************************************************
-AC_MSG_CHECKING(if we should build the weather calendar plugin)
+AC_MSG_CHECKING([if we should build the weather calendar plugin])
 AC_ARG_WITH([weather],
 	[AS_HELP_STRING([--with-weather],
 	[Build the weather calendar setup plugin (default=yes)])],
 	[use_gweather=$withval],[use_gweather=yes])
-AC_MSG_RESULT($use_gweather)
+AC_MSG_RESULT([$use_gweather])
 
 if test $use_gweather = yes; then
 	PKG_CHECK_MODULES([LIBGWEATHER],
@@ -1424,9 +1424,9 @@ CFLAGS="$evolution_save_cflags"
 
 AM_PATH_ORBIT2(2.9.8)
 
-AC_MSG_CHECKING(for CORBA include paths)
+AC_MSG_CHECKING([for CORBA include paths])
 IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0`" -I "`pkg-config --variable=idldir evolution-data-server-1.2`
-AC_MSG_RESULT($IDL_INCLUDES)
+AC_MSG_RESULT([$IDL_INCLUDES])
 AC_SUBST(IDL_INCLUDES)
 
 dnl Utility macro to set compiler flags for a specific lib.
@@ -1479,7 +1479,7 @@ else
 		TNEF_ATTACHMENTS="tnef-attachments"
 		TNEF_CFLAGS="-DHAVE_LIBYTNEF_YTNEF_H"
 	else
-		AC_MSG_RESULT(no)
+		AC_MSG_RESULT([no])
 		TNEF_ATTACHMENTS=""
 		TNEF_CFLAGS=""
 	fi
@@ -1622,13 +1622,13 @@ AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`pkg-config --modversion evolution-data-
 DATASERVER_EXEC_VERSION=`pkg-config --variable=execversion evolution-data-server-1.2`
 AC_SUBST(DATASERVER_EXEC_VERSION)
 
-AC_MSG_CHECKING(for evolution-data-server IDL)
+AC_MSG_CHECKING([for evolution-data-server IDL])
 DATASERVER_IDL=`pkg-config --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl
 if test -f "$DATASERVER_IDL"; then
-	AC_MSG_RESULT($DATASERVER_IDL)
-	 AC_SUBST(DATASERVER_IDL)
+	AC_MSG_RESULT([$DATASERVER_IDL])
+	AC_SUBST(DATASERVER_IDL)
 else
-	AC_MSG_ERROR(no)
+	AC_MSG_ERROR([no])
 fi
 
 dnl --- evolution-test flags