Mercurial > dovecot > core-2.2

changeset 18690:a2c3a0f671a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: Use consistent quotation for AC_DEFINEs as per autoconf recommendations. Also fix one minor typo.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 14 May 2015 12:36:38 +0300
parents a0dd9dad3b8c
children d09429bdb340
files configure.ac
diffstat 1 files changed, 138 insertions(+), 139 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu May 14 13:33:59 2015 +0300
+++ b/configure.ac	Thu May 14 12:36:38 2015 +0300
@@ -37,14 +37,14 @@
 AC_ARG_ENABLE(devel-checks,
 AS_HELP_STRING([--enable-devel-checks], [Enable some extra expensive checks for developers]),
 	if test x$enableval = xyes; then
-		AC_DEFINE(DEBUG,, Build with extra debugging checks)
+		AC_DEFINE(DEBUG,, [Build with extra debugging checks])
 		want_devel_checks=yes
 	fi)
 
 AC_ARG_ENABLE(asserts,
 AS_HELP_STRING([--enable-asserts], [Enable asserts (default)]),
 	if test x$enableval = xno; then
-		AC_DEFINE(DISABLE_ASSERTS,, Disable asserts)
+		AC_DEFINE(DISABLE_ASSERTS,, [Disable asserts])
 	fi)
 
 AC_ARG_WITH(shared-libs,
@@ -267,7 +267,7 @@
 ], [])
 if test "$systemdsystemunitdir" != ""; then
         AC_SUBST(systemdsystemunitdir)
-        AC_DEFINE(HAVE_SYSTEMD,, Define if you want to use systemd socket activation)
+        AC_DEFINE(HAVE_SYSTEMD,, [Define if you want to use systemd socket activation])
 fi
 AM_CONDITIONAL(HAVE_SYSTEMD, test "$systemdsystemunitdir" != "")
 
@@ -318,9 +318,9 @@
 AC_PROG_LIBTOOL
 AM_ICONV
 
-AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME", Dovecot name)
-AC_DEFINE_UNQUOTED(DOVECOT_STRING, "$PACKAGE_STRING", Dovecot string)
-AC_DEFINE_UNQUOTED(DOVECOT_VERSION, "$PACKAGE_VERSION", Dovecot version)
+AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME", [Dovecot name])
+AC_DEFINE_UNQUOTED(DOVECOT_STRING, "$PACKAGE_STRING", [Dovecot string])
+AC_DEFINE_UNQUOTED(DOVECOT_VERSION, "$PACKAGE_VERSION", [Dovecot version])
 
 AC_DEFINE([DOVECOT_VERSION_MAJOR], regexp(AC_PACKAGE_VERSION, [^\([0-9]+\)\.\([0-9]+\)], [\1]), [Dovecot major version])
 AC_DEFINE([DOVECOT_VERSION_MINOR], regexp(AC_PACKAGE_VERSION, [^\([0-9]+\)\.\([0-9]+\)], [\2]), [Dovecot minor version])
@@ -395,12 +395,12 @@
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(inet_addr, nsl)
 AC_SEARCH_LIBS(fdatasync, rt, [
-  AC_DEFINE(HAVE_FDATASYNC,, Define if you have fdatasync())
+  AC_DEFINE(HAVE_FDATASYNC,, [Define if you have fdatasync()])
 ])
 
 if test $want_libcap != no; then
   AC_CHECK_LIB(cap, cap_init, [
-    AC_DEFINE(HAVE_LIBCAP,, libcap is installed for cap_init())
+    AC_DEFINE(HAVE_LIBCAP,, [libcap is installed for cap_init()])
     LIBCAP="-lcap"
     AC_SUBST(LIBCAP)
   ], [
@@ -429,7 +429,7 @@
       ])
     ])
     if test $i_cv_have_libwrap = yes; then
-      AC_DEFINE(HAVE_LIBWRAP,, Define if you have libwrap)
+      AC_DEFINE(HAVE_LIBWRAP,, [Define if you have libwrap])
       LIBWRAP_LIBS=-lwrap
       AC_SUBST(LIBWRAP_LIBS)
       have_libwrap=yes
@@ -447,7 +447,7 @@
 fi
 AM_CONDITIONAL(TCPWRAPPERS, test "$have_libwrap" = "yes")
 
-AC_DEFINE(PACKAGE_WEBPAGE, "http://www.dovecot.org/", Support URL)
+AC_DEFINE(PACKAGE_WEBPAGE, "http://www.dovecot.org/", [Support URL])
 
 dnl * after -lsocket and -lnsl tests, inet_aton() may be in them
 AC_CHECK_FUNCS(fcntl flock lockf inet_aton sigaction getpagesize madvise \
@@ -464,7 +464,7 @@
 ])
 
 AC_SEARCH_LIBS(clock_gettime, rt, [
-  AC_DEFINE(HAVE_CLOCK_GETTIME,, Define if you have the clock_gettime function)
+  AC_DEFINE(HAVE_CLOCK_GETTIME,, [Define if you have the clock_gettime function])
 ])
 
 AC_CACHE_CHECK([for typeof],i_cv_have_typeof,[
@@ -479,7 +479,7 @@
   ])
 ])
 if test $i_cv_have_typeof = yes; then
-  AC_DEFINE(HAVE_TYPEOF,, Define if you have typeof())
+  AC_DEFINE(HAVE_TYPEOF,, [Define if you have typeof()])
 fi
 
 dnl strtoimax and strtoumax are macros in HP-UX, so inttypes.h must be included
@@ -496,7 +496,7 @@
   ])
 ])
 if test $i_cv_have_strtoimax = yes; then
-  AC_DEFINE(HAVE_STRTOIMAX,, Define if you have strtoimax function)
+  AC_DEFINE(HAVE_STRTOIMAX,, [Define if you have strtoimax function])
 fi
 
 AC_CACHE_CHECK([for strtoumax],i_cv_have_strtoumax,[
@@ -511,7 +511,7 @@
   ])
 ])
 if test $i_cv_have_strtoumax = yes; then
-  AC_DEFINE(HAVE_STRTOUMAX,, Define if you have strtoumax function)
+  AC_DEFINE(HAVE_STRTOUMAX,, [Define if you have strtoumax function])
 fi
 
 dnl * I/O loop function
@@ -533,7 +533,7 @@
     ])
   ])
   if test $i_cv_epoll_works = yes; then
-    AC_DEFINE(IOLOOP_EPOLL,, Implement I/O loop with Linux 2.6 epoll())
+    AC_DEFINE(IOLOOP_EPOLL,, [Implement I/O loop with Linux 2.6 epoll()])
     have_ioloop=yes
     ioloop=epoll
   else
@@ -555,14 +555,14 @@
 
 if test "$ioloop" = "best" || test "$ioloop" = "poll"; then
   AC_CHECK_FUNC(poll, [
-    AC_DEFINE(IOLOOP_POLL,, Implement I/O loop with poll())
+    AC_DEFINE(IOLOOP_POLL,, [Implement I/O loop with poll()])
     ioloop=poll
     have_ioloop=yes
   ])
 fi
 
 if test "$have_ioloop" = "no"; then
-  AC_DEFINE(IOLOOP_SELECT,, Implement I/O loop with select())
+  AC_DEFINE(IOLOOP_SELECT,, [Implement I/O loop with select()])
   ioloop="select"
 fi
 
@@ -575,7 +575,7 @@
     have_notify=inotify
     notify=inotify
     AC_MSG_RESULT("yes")
-    AC_DEFINE(IOLOOP_NOTIFY_INOTIFY,, Use Linux inotify)
+    AC_DEFINE(IOLOOP_NOTIFY_INOTIFY,, [Use Linux inotify])
   else
     AC_MSG_RESULT("no")
     if test "$notify" = "inotify"; then
@@ -592,8 +592,7 @@
     have_notify=kqueue
     notify=kqueue
     AC_MSG_RESULT("yes")
-    AC_DEFINE(IOLOOP_NOTIFY_KQUEUE,,
-      Use BSD kqueue directory changes notificaton)
+    AC_DEFINE(IOLOOP_NOTIFY_KQUEUE,, [Use BSD kqueue directory changes notificaton])
   else 
     AC_MSG_RESULT("no")
     if test "$notify" = "kqueue" ; then
@@ -621,7 +620,7 @@
     ])
   ])
   if test $i_cv_have_dnotify = yes; then
-    AC_DEFINE(IOLOOP_NOTIFY_DNOTIFY,, Use Linux dnotify)
+    AC_DEFINE(IOLOOP_NOTIFY_DNOTIFY,, [Use Linux dnotify])
     have_notify=dnotify
     notify=dnotify
   else
@@ -632,7 +631,7 @@
 fi
 
 if test "$have_notify" = "none"; then
-  AC_DEFINE(IOLOOP_NOTIFY_NONE,, No special notify support)
+  AC_DEFINE(IOLOOP_NOTIFY_NONE,, [No special notify support])
 fi
 
 AC_CACHE_CHECK([whether we have glibc],i_cv_have_glibc,[
@@ -648,7 +647,7 @@
   ])
 ])
 if test "$i_cv_have_glibc" = "yes"; then
-  AC_DEFINE(PREAD_WRAPPERS,, Define if pread/pwrite needs _XOPEN_SOURCE 500)
+  AC_DEFINE(PREAD_WRAPPERS,, [Define if pread/pwrite needs _XOPEN_SOURCE 500])
 fi
 
 dnl * Old glibcs have broken posix_fallocate(). Make sure not to use it.
@@ -681,7 +680,7 @@
   ])
 ])
 if test $i_cv_posix_fallocate_works = yes; then
-  AC_DEFINE(HAVE_POSIX_FALLOCATE,, Define if you have a working posix_fallocate())
+  AC_DEFINE(HAVE_POSIX_FALLOCATE,, [Define if you have a working posix_fallocate()])
 fi
 
 dnl * OS specific options
@@ -692,10 +691,10 @@
 		# for getting fd_send/fd_recv working:
 		LDFLAGS="$LDFLAGS -Wl,+b,:"
 		LIBS="-lxnet $LIBS"
-		AC_DEFINE(PREAD_BROKEN,, Defint if pread/pwrite implementation is broken)
+		AC_DEFINE(PREAD_BROKEN,, [Define if pread/pwrite implementation is broken])
 		;;
 	linux*|darwin*)
-		AC_DEFINE(PROCTITLE_HACK,, Define if process title can be changed by modifying argv)
+		AC_DEFINE(PROCTITLE_HACK,, [Define if process title can be changed by modifying argv])
 		;;
 	*)
 		;;
@@ -832,7 +831,7 @@
 
 AC_CHECK_TYPE(uoff_t, [
   have_uoff_t=yes
-  AC_DEFINE(HAVE_UOFF_T,, Define if you have a native uoff_t type)
+  AC_DEFINE(HAVE_UOFF_T,, [Define if you have a native uoff_t type])
 ], [
   have_uoff_t=no
 ])
@@ -843,7 +842,7 @@
     offt_max=INT_MAX
     uofft_fmt="u"
     if test "$have_uoff_t" != "yes"; then
-      AC_DEFINE(UOFF_T_INT,, Define if off_t is int)
+      AC_DEFINE(UOFF_T_INT,, [Define if off_t is int])
     fi
     offt_bits=`expr 8 \* $ac_cv_sizeof_int`
     ;;
@@ -851,7 +850,7 @@
     offt_max=LONG_MAX
     uofft_fmt="lu"
     if test "$have_uoff_t" != "yes"; then
-      AC_DEFINE(UOFF_T_LONG,, Define if off_t is long)
+      AC_DEFINE(UOFF_T_LONG,, [Define if off_t is long])
     fi
     offt_bits=`expr 8 \* $ac_cv_sizeof_long`
     ;;
@@ -859,7 +858,7 @@
     offt_max=LLONG_MAX
     uofft_fmt="llu"
     if test "$have_uoff_t" != "yes"; then
-      AC_DEFINE(UOFF_T_LONG_LONG,, Define if off_t is long long)
+      AC_DEFINE(UOFF_T_LONG_LONG,, [Define if off_t is long long])
     fi
     offt_bits=`expr 8 \* $ac_cv_sizeof_long_long`
     ;;
@@ -875,7 +874,7 @@
   struct dirent d;
   d.d_type = DT_DIR;
 ]])],[
-  AC_DEFINE(HAVE_DIRENT_D_TYPE,, Define if you have struct dirent->d_type)
+  AC_DEFINE(HAVE_DIRENT_D_TYPE,, [Define if you have struct dirent->d_type])
 ],[])
 
 dnl * Do we have OFF_T_MAX?
@@ -887,10 +886,10 @@
 ]])],[
   :
 ],[
-  AC_DEFINE_UNQUOTED(OFF_T_MAX, $offt_max, Maximum value of off_t)
+  AC_DEFINE_UNQUOTED(OFF_T_MAX, $offt_max, [Maximum value of off_t])
 ])
 
-AC_DEFINE_UNQUOTED(PRIuUOFF_T, "$uofft_fmt", printf() format for uoff_t)
+AC_DEFINE_UNQUOTED(PRIuUOFF_T, "$uofft_fmt", [printf() format for uoff_t])
 
 dnl * make sure size_t isn't signed. we'd probably work fine with it, but
 dnl * it's more likely vulnerable to buffer overflows. Anyway, C99 specifies
@@ -938,14 +937,14 @@
     sizet_fmt="u"
 
     if test "$typeof_size_t" = ""; then
-      AC_DEFINE(size_t, unsigned int, Define to 'unsigned int' if you don't have it)
-      AC_DEFINE(ssize_t, int, Define to 'int' if you don't have it)
+      AC_DEFINE(size_t, unsigned int, [Define to 'unsigned int' if you don't have it])
+      AC_DEFINE(ssize_t, int, [Define to 'int' if you don't have it])
     fi
     ;;
 esac
 
-AC_DEFINE_UNQUOTED(SSIZE_T_MAX, $ssizet_max, Maximum value of ssize_t)
-AC_DEFINE_UNQUOTED(PRIuSIZE_T, "$sizet_fmt", printf() format for size_t)
+AC_DEFINE_UNQUOTED(SSIZE_T_MAX, $ssizet_max, [Maximum value of ssize_t])
+AC_DEFINE_UNQUOTED(PRIuSIZE_T, "$sizet_fmt", [printf() format for size_t])
 
 AC_DEFUN([AC_CHECKTYPE2], [
   AC_MSG_CHECKING([for $1])
@@ -964,27 +963,27 @@
 
 AC_CHECKTYPE2(uintmax_t, [$stdint_include])
 if test $i_cv_type_uintmax_t = yes; then
-  AC_DEFINE(HAVE_UINTMAX_T,, Define if you have uintmax_t (C99 type))
+  AC_DEFINE(HAVE_UINTMAX_T,, [Define if you have uintmax_t (C99 type)])
 fi
 
 dnl use separate check, eg. Solaris 8 has uintmax_t but not uint_fast32_t
 AC_CHECKTYPE2(uint_fast32_t, [$stdint_include])
 if test $i_cv_type_uint_fast32_t = yes; then
-  AC_DEFINE(HAVE_UINT_FAST32_T,, Define if you have uint_fast32_t (C99 type))
+  AC_DEFINE(HAVE_UINT_FAST32_T,, [Define if you have uint_fast32_t (C99 type)])
 fi
 
 AC_CHECKTYPE2(socklen_t, [#include <sys/socket.h>])
 if test $i_cv_type_socklen_t = yes; then
-  AC_DEFINE(HAVE_SOCKLEN_T,, Define to 'int' if you don't have socklen_t)
+  AC_DEFINE(HAVE_SOCKLEN_T,, [Define to 'int' if you don't have socklen_t])
 fi
 
-AC_DEFINE_UNQUOTED(MEM_ALIGN_SIZE, $mem_align, Required memory alignment)
+AC_DEFINE_UNQUOTED(MEM_ALIGN_SIZE, $mem_align, [Required memory alignment])
 
 dnl * find random source
 AC_MSG_CHECKING([for /dev/urandom])
 if test -c /dev/urandom || test -s /dev/urandom; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(DEV_URANDOM_PATH, "/dev/urandom", Path to /dev/urandom)
+  AC_DEFINE(DEV_URANDOM_PATH, "/dev/urandom", [Path to /dev/urandom])
   have_random_source=yes
 else
   AC_MSG_RESULT(no)
@@ -992,7 +991,7 @@
 
 if test "$have_random_source" != "yes"; then
   AC_CHECK_HEADER(openssl/rand.h, [
-    AC_DEFINE(HAVE_OPENSSL_RAND_H,, Define if you have openssl/rand.h)
+    AC_DEFINE(HAVE_OPENSSL_RAND_H,, [Define if you have openssl/rand.h])
     LIBS="$LIBS -lcrypto"
   ])
 fi
@@ -1006,7 +1005,7 @@
 [i_cv_field_tm_gmtoff=yes],
 [i_cv_field_tm_gmtoff=no])])
 if test $i_cv_field_tm_gmtoff = yes; then
-	AC_DEFINE(HAVE_TM_GMTOFF,, Define if you have struct tm->tm_gmtoff)
+	AC_DEFINE(HAVE_TM_GMTOFF,, [Define if you have struct tm->tm_gmtoff])
 fi
 AC_MSG_RESULT($i_cv_field_tm_gmtoff)
 
@@ -1049,7 +1048,7 @@
     i_cv_gmtime_max_time_t=31
   ],[])
 ])
-AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, $i_cv_gmtime_max_time_t, max. time_t bits gmtime() can handle)
+AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, $i_cv_gmtime_max_time_t, [max. time_t bits gmtime() can handle])
 
 AC_CACHE_CHECK([whether time_t is signed],i_cv_signed_time_t,[
   AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -1065,7 +1064,7 @@
   ])
 ])
 if test $i_cv_signed_time_t = yes; then
-  AC_DEFINE(TIME_T_SIGNED,, Define if your time_t is signed)
+  AC_DEFINE(TIME_T_SIGNED,, [Define if your time_t is signed])
 fi
 
 dnl Our implementation of AC_C_FLEXIBLE_ARRAY_MEMBER.
@@ -1090,7 +1089,7 @@
 else
   flexible_value=1
 fi
-AC_DEFINE_UNQUOTED(FLEXIBLE_ARRAY_MEMBER, $flexible_value, How to define flexible array members in structs)
+AC_DEFINE_UNQUOTED(FLEXIBLE_ARRAY_MEMBER, $flexible_value, [How to define flexible array members in structs])
 
 dnl * do we have struct iovec
 AC_MSG_CHECKING([for struct iovec])
@@ -1104,7 +1103,7 @@
 [i_cv_struct_iovec=no])])
 
 if test $i_cv_struct_iovec = yes; then
-	AC_DEFINE(HAVE_STRUCT_IOVEC,, Define if you have struct iovec)
+	AC_DEFINE(HAVE_STRUCT_IOVEC,, [Define if you have struct iovec])
 fi
 AC_MSG_RESULT($i_cv_struct_iovec)
 
@@ -1122,7 +1121,7 @@
   ])
 ])
 if test $i_cv_dev_t_struct = yes; then
-  AC_DEFINE(DEV_T_STRUCT,, Define if your dev_t is a structure instead of integer type)
+  AC_DEFINE(DEV_T_STRUCT,, [Define if your dev_t is a structure instead of integer type])
 fi
 
 dnl * Do we have RLIMIT_AS?
@@ -1142,7 +1141,7 @@
 ])
 
 if test $i_cv_have_rlimit_as = yes; then
-  AC_DEFINE(HAVE_RLIMIT_AS,, Define if you have RLIMIT_AS for setrlimit())
+  AC_DEFINE(HAVE_RLIMIT_AS,, [Define if you have RLIMIT_AS for setrlimit()])
 fi
 
 dnl * Do we have RLIMIT_NPROC?
@@ -1162,7 +1161,7 @@
 ])
 
 if test $i_cv_have_rlimit_nproc = yes; then
-  AC_DEFINE(HAVE_RLIMIT_NPROC,, Define if you have RLIMIT_NPROC for setrlimit())
+  AC_DEFINE(HAVE_RLIMIT_NPROC,, [Define if you have RLIMIT_NPROC for setrlimit()])
 fi
 
 dnl * Do we have RLIMIT_CORE?
@@ -1182,7 +1181,7 @@
 ])
 
 if test $i_cv_have_rlimit_core = yes; then
-  AC_DEFINE(HAVE_RLIMIT_CORE,, Define if you have RLIMIT_CORE for getrlimit())
+  AC_DEFINE(HAVE_RLIMIT_CORE,, [Define if you have RLIMIT_CORE for getrlimit()])
 fi
 
 AC_CACHE_CHECK([whether PR_SET_DUMPABLE exists],i_cv_have_pr_set_dumpable,[
@@ -1197,7 +1196,7 @@
   ])
 ])
 if test $i_cv_have_pr_set_dumpable = yes; then
-  AC_DEFINE(HAVE_PR_SET_DUMPABLE,, Define if you have prctl(PR_SET_DUMPABLE))
+  AC_DEFINE(HAVE_PR_SET_DUMPABLE,, [Define if you have prctl(PR_SET_DUMPABLE)])
 fi
 
 dnl * Linux compatible mremap()
@@ -1215,7 +1214,7 @@
   ])
 ])
 if test $i_cv_have_linux_mremap = yes; then
-  AC_DEFINE(HAVE_LINUX_MREMAP,, Define if you have Linux-compatible mremap())
+  AC_DEFINE(HAVE_LINUX_MREMAP,, [Define if you have Linux-compatible mremap()])
 fi
 
 dnl * If mmap() plays nicely with write()
@@ -1345,7 +1344,7 @@
 esac
 
 if test $i_cv_fd_passing = buggy_cmsg_macros; then
-  AC_DEFINE(BUGGY_CMSG_MACROS,, Define if you have buggy CMSG macros)
+  AC_DEFINE(BUGGY_CMSG_MACROS,, [Define if you have buggy CMSG macros])
 fi
 if test $i_cv_fd_passing = no; then
   AC_ERROR([fd passing is required for Dovecot to work])
@@ -1354,7 +1353,7 @@
 dnl * Solaris compatible sendfile()
 AC_CHECK_LIB(sendfile, sendfile, [
   LIBS="$LIBS -lsendfile"
-  AC_DEFINE(HAVE_SOLARIS_SENDFILE,, Define if you have Solaris-compatible sendfile())
+  AC_DEFINE(HAVE_SOLARIS_SENDFILE,, [Define if you have Solaris-compatible sendfile()])
 ], [
   dnl * Linux compatible sendfile() - don't check if Solaris one was found.
   dnl * This seems to pass with Solaris for some reason..
@@ -1373,7 +1372,7 @@
     ])
   ])
   if test $i_cv_have_linux_sendfile = yes; then
-    AC_DEFINE(HAVE_LINUX_SENDFILE,, Define if you have Linux-compatible sendfile())
+    AC_DEFINE(HAVE_LINUX_SENDFILE,, [Define if you have Linux-compatible sendfile()])
   fi
 
   dnl * FreeBSD compatible sendfile()
@@ -1392,7 +1391,7 @@
     ])
   ])
   if test $i_cv_have_freebsd_sendfile = yes; then
-    AC_DEFINE(HAVE_FREEBSD_SENDFILE,, Define if you have FreeBSD-compatible sendfile())
+    AC_DEFINE(HAVE_FREEBSD_SENDFILE,, [Define if you have FreeBSD-compatible sendfile()])
   fi
 ])
 
@@ -1408,7 +1407,7 @@
   ])
 ])
 if test $i_cv_unsetenv_ret_int = yes; then
-  AC_DEFINE(UNSETENV_RET_INT,, Define if unsetenv() returns int)
+  AC_DEFINE(UNSETENV_RET_INT,, [Define if unsetenv() returns int])
 fi
 
 dnl * Check for crypt() if unistd.h compiles with _XOPEN_SOURCE + _XPG6
@@ -1430,7 +1429,7 @@
   ])
 ])
 if test $i_cv_use_xpg6_crypt = yes; then
-  AC_DEFINE(CRYPT_USE_XPG6,, Define if _XPG6 macro is needed for crypt())
+  AC_DEFINE(CRYPT_USE_XPG6,, [Define if _XPG6 macro is needed for crypt()])
 fi
 
 AC_CACHE_CHECK([if struct stat has st_?tim timespec fields],i_cv_have_st_tim_timespec,[
@@ -1450,7 +1449,7 @@
   ])
 ])
 if test $i_cv_have_st_tim_timespec = yes; then
-  AC_DEFINE(HAVE_STAT_XTIM,, Define if you have st_?tim timespec fields in struct stat)
+  AC_DEFINE(HAVE_STAT_XTIM,, [Define if you have st_?tim timespec fields in struct stat])
 fi
 
 AC_CACHE_CHECK([if struct stat has st_?timespec fields],i_cv_have_st_timespec,[
@@ -1470,7 +1469,7 @@
   ])
 ])
 if test $i_cv_have_st_timespec = yes; then
-  AC_DEFINE(HAVE_STAT_XTIMESPEC,, Define if you have st_?timespec fields in struct stat)
+  AC_DEFINE(HAVE_STAT_XTIMESPEC,, [Define if you have st_?timespec fields in struct stat])
 fi
 
 dnl * Check if statvfs() can be used to find out block device for files
@@ -1490,7 +1489,7 @@
   ])
 ])
 if test $i_cv_have_statvfs_f_mntfromname = yes; then
-  AC_DEFINE(HAVE_STATVFS_MNTFROMNAME,, Define if you have statvfs.f_mntfromname)
+  AC_DEFINE(HAVE_STATVFS_MNTFROMNAME,, [Define if you have statvfs.f_mntfromname])
 fi
 
 dnl * Check if statfs() can be used to find out block device for files
@@ -1510,7 +1509,7 @@
   ])
 ])
 if test $i_cv_have_statfs_f_mntfromname = yes; then
-  AC_DEFINE(HAVE_STATFS_MNTFROMNAME,, Define if you have statfs.f_mntfromname)
+  AC_DEFINE(HAVE_STATFS_MNTFROMNAME,, [Define if you have statfs.f_mntfromname])
 fi
 
 dnl * Check if we have struct dqblk.dqb_curblocks
@@ -1528,7 +1527,7 @@
   ])
 ])
 if test $i_cv_have_dqblk_dqb_curblocks = yes; then
-  AC_DEFINE(HAVE_STRUCT_DQBLK_CURBLOCKS,, Define if struct sqblk.dqb_curblocks exists)
+  AC_DEFINE(HAVE_STRUCT_DQBLK_CURBLOCKS,, [Define if struct sqblk.dqb_curblocks exists])
 fi
 
 dnl * Check if we have struct dqblk.dqb_curspace
@@ -1546,7 +1545,7 @@
   ])
 ])
 if test $i_cv_have_dqblk_dqb_curspace = yes; then
-  AC_DEFINE(HAVE_STRUCT_DQBLK_CURSPACE,, Define if struct sqblk.dqb_curspace exists)
+  AC_DEFINE(HAVE_STRUCT_DQBLK_CURSPACE,, [Define if struct sqblk.dqb_curspace exists])
 fi
 
 dnl * Check if we have Q_QUOTACTL ioctl (Solaris)
@@ -1565,7 +1564,7 @@
 ])
 
 if test $i_cv_have_ioctl_q_quotactl = yes; then
-  AC_DEFINE(HAVE_Q_QUOTACTL,, Define if Q_QUOTACTL exists)
+  AC_DEFINE(HAVE_Q_QUOTACTL,, [Define if Q_QUOTACTL exists])
 fi
 
 dnl ***
@@ -1593,7 +1592,7 @@
   [i_cv_c99_vsnprintf=no])
 ])
 if test $i_cv_c99_vsnprintf = no; then
-  AC_DEFINE(HAVE_OLD_VSNPRINTF,, Define if you don't have C99 compatible vsnprintf() call)
+  AC_DEFINE(HAVE_OLD_VSNPRINTF,, [Define if you don't have C99 compatible vsnprintf() call])
 fi
 
 dnl ***
@@ -1706,7 +1705,7 @@
   ]])],[
     size=`cat conftestval`
     rm -f conftestval
-    AC_DEFINE_UNQUOTED(STATIC_MTAB_SIZE,$size, reasonable mntctl buffer size)
+    AC_DEFINE_UNQUOTED(STATIC_MTAB_SIZE,$size, [reasonable mntctl buffer size])
     AC_MSG_RESULT($size)
   ],[
     AC_MSG_RESULT(default)
@@ -1744,14 +1743,14 @@
     ], -lcrypto $DLLIB)
   fi
   if test "$have_openssl" = "yes"; then
-    AC_DEFINE(HAVE_OPENSSL,, Build with OpenSSL support)
+    AC_DEFINE(HAVE_OPENSSL,, [Build with OpenSSL support])
     have_ssl="yes (OpenSSL)"
 
     AC_CHECK_LIB(ssl, SSL_get_current_compression, [
-      AC_DEFINE(HAVE_SSL_COMPRESSION,, Build with OpenSSL compression)
+      AC_DEFINE(HAVE_SSL_COMPRESSION,, [Build with OpenSSL compression])
     ],, $SSL_LIBS)
     AC_CHECK_LIB(ssl, SSL_get_servername, [
-      AC_DEFINE(HAVE_SSL_GET_SERVERNAME,, Build with TLS hostname support)
+      AC_DEFINE(HAVE_SSL_GET_SERVERNAME,, [Build with TLS hostname support])
     ],, $SSL_LIBS)
   fi
 fi
@@ -1760,7 +1759,7 @@
 if test $want_gnutls != no && test $have_ssl = no; then
   AC_CHECK_LIB(gnutls, gnutls_global_init, [
     AC_CHECK_HEADER(gnutls/gnutls.h, [
-      AC_DEFINE(HAVE_GNUTLS,, Build with GNUTLS support)
+      AC_DEFINE(HAVE_GNUTLS,, [Build with GNUTLS support])
       SSL_LIBS="-lgnutls -lgcrypt"
       AC_SUBST(SSL_LIBS)
       have_ssl="yes (GNUTLS)"
@@ -1778,7 +1777,7 @@
 fi
 
 if test "$have_ssl" != "no"; then
-	AC_DEFINE(HAVE_SSL,, Build with SSL/TLS support)
+	AC_DEFINE(HAVE_SSL,, [Build with SSL/TLS support])
 fi
 
 dnl **
@@ -1788,7 +1787,7 @@
 if test $want_gc != no; then
   AC_CHECK_LIB(gc, GC_malloc, [
     AC_CHECK_HEADERS(gc/gc.h gc.h)
-    AC_DEFINE(USE_GC,, Define if you want to use Boehm GC)
+    AC_DEFINE(USE_GC,, [Define if you want to use Boehm GC])
     LIBS="$LIBS -lgc"
   ], [
     if test $want_gc = yes; then
@@ -1810,15 +1809,15 @@
 userdb="$userdb static"
 
 if test $want_prefetch_userdb != no; then
-        AC_DEFINE(USERDB_PREFETCH,, Build with prefetch userdb support)
+        AC_DEFINE(USERDB_PREFETCH,, [Build with prefetch userdb support])
 	userdb="$userdb prefetch"
 else
 	not_userdb="$not_userdb prefetch"
 fi
 
 if test $want_passwd != no; then
-        AC_DEFINE(USERDB_PASSWD,, Build with passwd support)
-        AC_DEFINE(PASSDB_PASSWD,, Build with passwd support)
+        AC_DEFINE(USERDB_PASSWD,, [Build with passwd support])
+        AC_DEFINE(PASSDB_PASSWD,, [Build with passwd support])
 	userdb="$userdb passwd"
 	passdb="$passdb passwd"
 else
@@ -1827,8 +1826,8 @@
 fi
 
 if test $want_passwd_file != no; then
-        AC_DEFINE(USERDB_PASSWD_FILE,, Build with passwd-file support)
-        AC_DEFINE(PASSDB_PASSWD_FILE,, Build with passwd-file support)
+        AC_DEFINE(USERDB_PASSWD_FILE,, [Build with passwd-file support])
+        AC_DEFINE(PASSDB_PASSWD_FILE,, [Build with passwd-file support])
 	userdb="$userdb passwd-file"
 	passdb="$passdb passwd-file"
 else
@@ -1840,7 +1839,7 @@
 if test $want_shadow != no; then
   AC_CHECK_FUNC(getspnam, [
     AC_CHECK_HEADER(shadow.h, [
-      AC_DEFINE(PASSDB_SHADOW,, Build with shadow support)
+      AC_DEFINE(PASSDB_SHADOW,, [Build with shadow support])
       have_shadow=yes
     ], [
       if test $want_shadow = yes; then
@@ -1864,13 +1863,13 @@
 		have_pam=no
 		AC_CHECK_HEADER(security/pam_appl.h, [
 			AC_DEFINE(HAVE_SECURITY_PAM_APPL_H,,
-				  Define if you have security/pam_appl.h)
+				  [Define if you have security/pam_appl.h])
 			have_pam=yes
 		])
 
 		AC_CHECK_HEADER(pam/pam_appl.h, [
 			AC_DEFINE(HAVE_PAM_PAM_APPL_H,,
-				  Define if you have pam/pam_appl.h)
+				  [Define if you have pam/pam_appl.h])
 			have_pam=yes
 		])
 	], [
@@ -1882,11 +1881,11 @@
 
 if test "$have_pam" = "yes"; then
   AUTH_LIBS="$AUTH_LIBS -lpam"
-  AC_DEFINE(PASSDB_PAM,, Build with PAM support)
+  AC_DEFINE(PASSDB_PAM,, [Build with PAM support])
   passdb="$passdb pam"
 
   AC_CHECK_LIB(pam, pam_setcred, [
-    AC_DEFINE(HAVE_PAM_SETCRED,, Define if you have pam_setcred())
+    AC_DEFINE(HAVE_PAM_SETCRED,, [Define if you have pam_setcred()])
   ])
 elif test $want_pam = yes; then
   AC_ERROR([Can't build with PAM support: pam_appl.h not found])
@@ -1895,8 +1894,8 @@
 fi
 
 if test $want_checkpassword != no; then
-        AC_DEFINE(PASSDB_CHECKPASSWORD,, Build with checkpassword passdb support)
-        AC_DEFINE(USERDB_CHECKPASSWORD,, Build with checkpassword userdb support)
+        AC_DEFINE(PASSDB_CHECKPASSWORD,, [Build with checkpassword passdb support])
+        AC_DEFINE(USERDB_CHECKPASSWORD,, [Build with checkpassword userdb support])
 	passdb="$passdb checkpassword"
 	userdb="$userdb checkpassword"
 else
@@ -1907,7 +1906,7 @@
 have_bsdauth=no
 if test $want_bsdauth != no; then
 	AC_CHECK_FUNC(auth_userokay, [
-		AC_DEFINE(PASSDB_BSDAUTH,, Build with BSD authentication support)
+		AC_DEFINE(PASSDB_BSDAUTH,, [Build with BSD authentication support])
 		have_bsdauth=yes
 	], [
 	  if test $want_bsdauth = yes; then
@@ -1949,22 +1948,22 @@
 			old_CFLAGS=$CFLAGS
 			CFLAGS="$CFLAGS $KRB5_CFLAGS"
 			AC_CHECK_HEADER([gssapi/gssapi.h], [
-				AC_DEFINE(HAVE_GSSAPI_GSSAPI_H,, GSSAPI headers in gssapi/gssapi.h)
+				AC_DEFINE(HAVE_GSSAPI_GSSAPI_H,, [GSSAPI headers in gssapi/gssapi.h])
 				have_gssapi=yes
 			])
 			AC_CHECK_HEADER([gssapi.h], [
-				AC_DEFINE(HAVE_GSSAPI_H,, GSSAPI headers in gssapi.h)
+				AC_DEFINE(HAVE_GSSAPI_H,, [GSSAPI headers in gssapi.h])
 				have_gssapi=yes
 			])
 			if test $have_gssapi != no; then
 				if test $want_gssapi = plugin; then
 					have_gssapi=plugin
 				fi
-				AC_DEFINE(HAVE_GSSAPI,, Build with GSSAPI support)
+				AC_DEFINE(HAVE_GSSAPI,, [Build with GSSAPI support])
 				AC_CHECK_HEADERS(gssapi/gssapi_ext.h gssapi_krb5.h gssapi/gssapi_krb5.h)
 				AC_CHECK_LIB(gss, __gss_userok, [
 					AC_DEFINE(HAVE___GSS_USEROK,,
-						Define if you have __gss_userok())
+						[Define if you have __gss_userok()])
 					KRB5_LIBS="$KRB5_LIBS -lgss"
 				],, $KRB5_LIBS)
 
@@ -2006,14 +2005,14 @@
 				  ])
 				])
 				if test "$i_cv_gssapi_spnego" = "yes"; then
-				  AC_DEFINE(HAVE_GSSAPI_SPNEGO,, GSSAPI supports SPNEGO)
+				  AC_DEFINE(HAVE_GSSAPI_SPNEGO,, [GSSAPI supports SPNEGO])
 				fi
 				LIBS=$old_LIBS
 
 				if test $want_gssapi != plugin; then
 				  AUTH_LIBS="$AUTH_LIBS $KRB5_LIBS"
 				  AUTH_CFLAGS="$AUTH_CFLAGS $KRB5_CFLAGS"
-				  AC_DEFINE(BUILTIN_GSSAPI,, GSSAPI support is built in)
+				  AC_DEFINE(BUILTIN_GSSAPI,, [GSSAPI support is built in])
 				else
 				  have_gssapi_plugin=yes
 				fi
@@ -2035,7 +2034,7 @@
 have_sia=no
 if test $want_sia != no; then
 	AC_CHECK_FUNC(sia_validate_user, [
-		AC_DEFINE(PASSDB_SIA,, Build with Tru64 SIA support)
+		AC_DEFINE(PASSDB_SIA,, [Build with Tru64 SIA support])
 		AUTH_LIBS="$AUTH_LIBS -depth_ring_search"
 		have_sia=yes
 	], [
@@ -2056,10 +2055,10 @@
 	AC_CHECK_LIB(ldap, ldap_init, [
 		AC_CHECK_HEADER(ldap.h, [
 			AC_CHECK_LIB(ldap, ldap_initialize, [
-				AC_DEFINE(LDAP_HAVE_INITIALIZE,, Define if you have ldap_initialize)
+				AC_DEFINE(LDAP_HAVE_INITIALIZE,, [Define if you have ldap_initialize])
 			])
 			AC_CHECK_LIB(ldap, ldap_start_tls_s, [
-				AC_DEFINE(LDAP_HAVE_START_TLS_S,, Define if you have ldap_start_tls_s)
+				AC_DEFINE(LDAP_HAVE_START_TLS_S,, [Define if you have ldap_start_tls_s])
 			])
 			LDAP_LIBS="-lldap"
 			AC_CHECK_LIB(ldap, ber_free, [
@@ -2073,11 +2072,11 @@
 			AC_SUBST(LDAP_LIBS)
 			if test $want_ldap != plugin; then
 				AUTH_LIBS="$AUTH_LIBS $LDAP_LIBS"
-		        	AC_DEFINE(BUILTIN_LDAP,, LDAP support is built in)
+		        	AC_DEFINE(BUILTIN_LDAP,, [LDAP support is built in])
 			fi
 
-        		AC_DEFINE(USERDB_LDAP,, Build with LDAP support)
-		        AC_DEFINE(PASSDB_LDAP,, Build with LDAP support)
+        		AC_DEFINE(USERDB_LDAP,, [Build with LDAP support])
+		        AC_DEFINE(PASSDB_LDAP,, [Build with LDAP support])
 			AC_CHECK_HEADERS(sasl.h sasl/sasl.h)
 			have_ldap=yes
 		], [
@@ -2127,7 +2126,7 @@
     AC_CHECK_HEADER(db.h, [
       DICT_LIBS="$DICT_LIBS -ldb"
       dict_drivers="$dict_drivers db"
-      AC_DEFINE(BUILD_DB,, Build with Berkeley DB support)
+      AC_DEFINE(BUILD_DB,, [Build with Berkeley DB support])
     ], [
       if test $want_db = yes; then
         AC_ERROR([Can't build with db support: db.h not found])
@@ -2145,7 +2144,7 @@
     AC_CHECK_HEADER(cdb.h, [
       DICT_LIBS="$DICT_LIBS -lcdb"
       dict_drivers="$dict_drivers cdb"
-      AC_DEFINE(BUILD_CDB,, Build with CDB support)
+      AC_DEFINE(BUILD_CDB,, [Build with CDB support])
     ], [
       if test $want_cdb = yes; then
         AC_ERROR([Can't build with CDB support: cdb.h not found])
@@ -2188,7 +2187,7 @@
 
   AC_CHECK_LIB(pq, PQconnectdb, [
 	  AC_CHECK_LIB(pq, PQescapeStringConn, [
-		  AC_DEFINE(HAVE_PQESCAPE_STRING_CONN,, Define if libpq has PQescapeStringConn function)
+		  AC_DEFINE(HAVE_PQESCAPE_STRING_CONN,, [Define if libpq has PQescapeStringConn function])
 	  ])
 	  old_CPPFLAGS=$CPPFLAGS
 	  if test "$PGSQL_INCLUDE" != ""; then
@@ -2202,7 +2201,7 @@
 			  PGSQL_LIBS="$PGSQL_LIBS -L$PGSQL_LIBDIR"
 		  fi
 		  PGSQL_LIBS="$PGSQL_LIBS -lpq"
-		  AC_DEFINE(HAVE_PGSQL,, Build with PostgreSQL support)
+		  AC_DEFINE(HAVE_PGSQL,, [Build with PostgreSQL support])
 		  found_sql_drivers="$found_sql_drivers pgsql"
 	  ], [
 	    if test $want_pgsql = yes; then
@@ -2259,7 +2258,7 @@
 			fi
 
 			AC_CHECK_LIB(mysqlclient, mysql_ssl_set, [
-				AC_DEFINE(HAVE_MYSQL_SSL,, Define if your MySQL library has SSL functions)
+				AC_DEFINE(HAVE_MYSQL_SSL,, [Define if your MySQL library has SSL functions])
 				if test "x$have_openssl" = "yes"; then
 				  ssl_define="#define HAVE_OPENSSL"
 				else
@@ -2271,7 +2270,7 @@
 				], [
 				  mysql_set_ssl(0, 0, 0, 0, 0, 0);
 				], [
-					AC_DEFINE(HAVE_MYSQL_SSL_CIPHER,, Define if your MySQL library supports setting cipher)
+					AC_DEFINE(HAVE_MYSQL_SSL_CIPHER,, [Define if your MySQL library supports setting cipher])
 
 					AC_TRY_COMPILE([
 					  $ssl_define
@@ -2279,13 +2278,13 @@
 					], [
 					  int i = MYSQL_OPT_SSL_VERIFY_SERVER_CERT;
 					], [
-						AC_DEFINE(HAVE_MYSQL_SSL_VERIFY_SERVER_CERT,, Define if your MySQL library supports verifying the name in the SSL certificate)
+						AC_DEFINE(HAVE_MYSQL_SSL_VERIFY_SERVER_CERT,, [Define if your MySQL library supports verifying the name in the SSL certificate])
 					])
 				])
 			])
 			
 			have_mysql=yes
-			AC_DEFINE(HAVE_MYSQL,, Build with MySQL support)
+			AC_DEFINE(HAVE_MYSQL,, [Build with MySQL support])
 			found_sql_drivers="$found_sql_drivers mysql"
 		], [
 		  if test $want_mysql = yes; then
@@ -2311,7 +2310,7 @@
 		AC_CHECK_HEADER(sqlite3.h, [
 			SQLITE_LIBS="$SQLITE_LIBS -lsqlite3"
 
-			AC_DEFINE(HAVE_SQLITE,, Build with SQLite3 support)
+			AC_DEFINE(HAVE_SQLITE,, [Build with SQLite3 support])
 			found_sql_drivers="$found_sql_drivers sqlite"
 		], [
 		  if test $want_sqlite = yes; then
@@ -2330,7 +2329,7 @@
 		AC_CHECK_HEADER(cassandra.h, [
 			CASSANDRA_LIBS="$CASSANDRA_LIBS -lcassandra"
 
-			AC_DEFINE(HAVE_CASSANDRA,, Build with Cassandra support)
+			AC_DEFINE(HAVE_CASSANDRA,, [Build with Cassandra support])
 			found_sql_drivers="$found_sql_drivers cassandra"
 		], [
 		  if test $want_cassandra = yes; then
@@ -2348,7 +2347,7 @@
 if test "$want_sql" != "plugin"; then
 	SQL_LIBS="$MYSQL_LIBS $PGSQL_LIBS $SQLITE_LIBS $CASSANDRA_LIBS"
 else
-	AC_DEFINE(SQL_DRIVER_PLUGINS,, Build SQL drivers as plugins)
+	AC_DEFINE(SQL_DRIVER_PLUGINS,, [Build SQL drivers as plugins])
 fi
 sql_drivers=
 not_sql_drivers=
@@ -2356,8 +2355,8 @@
 if test "$found_sql_drivers" != "" || test "$want_sql" != "no"; then
 	sql_drivers="$found_sql_drivers"
 
-	AC_DEFINE(PASSDB_SQL,, Build with SQL support)
-	AC_DEFINE(USERDB_SQL,, Build with SQL support)
+	AC_DEFINE(PASSDB_SQL,, [Build with SQL support])
+	AC_DEFINE(USERDB_SQL,, [Build with SQL support])
 	AUTH_LIBS="$AUTH_LIBS $SQL_LIBS"
 	passdb="$passdb sql"
 	userdb="$userdb sql"
@@ -2378,8 +2377,8 @@
 	if test -f $vpop_etc/lib_deps; then
 		AUTH_CFLAGS="$AUTH_CFLAGS `cat $vpop_etc/inc_deps` $CFLAGS"
 		AUTH_LIBS="$AUTH_LIBS `cat $vpop_etc/lib_deps`"
-		AC_DEFINE(USERDB_VPOPMAIL,, Build with vpopmail support)
-		AC_DEFINE(PASSDB_VPOPMAIL,, Build with vpopmail support)
+		AC_DEFINE(USERDB_VPOPMAIL,, [Build with vpopmail support])
+		AC_DEFINE(PASSDB_VPOPMAIL,, [Build with vpopmail support])
 		AC_MSG_RESULT(found)
 		have_vpopmail=yes
 	else
@@ -2409,7 +2408,7 @@
 AC_SUBST(CRYPT_LIBS)
 
 if test $have_modules = yes; then
-  AC_DEFINE(HAVE_MODULES,, Define if you have dynamic module support)
+  AC_DEFINE(HAVE_MODULES,, [Define if you have dynamic module support])
   AC_SUBST(MODULE_LIBS)
 
   # shrext_cmds comes from libtool.m4
@@ -2418,7 +2417,7 @@
     # too old libtool?
     MODULE_SUFFIX=.so
   fi
-  AC_DEFINE_UNQUOTED(MODULE_SUFFIX,"$MODULE_SUFFIX",Dynamic module suffix)
+  AC_DEFINE_UNQUOTED(MODULE_SUFFIX,"$MODULE_SUFFIX", [Dynamic module suffix])
   AC_SUBST(MODULE_SUFFIX)
 fi
 
@@ -2441,7 +2440,7 @@
       ])
     ])
     if test $i_cv_have_nss = yes; then
-      AC_DEFINE(USERDB_NSS,, Build with NSS module support)
+      AC_DEFINE(USERDB_NSS,, [Build with NSS module support])
       have_nss=yes
     else
       if test $want_nss = yes; then
@@ -2493,7 +2492,7 @@
   ])
 ])
 if test $i_cv_have___big_endian__ = yes; then
-  AC_DEFINE(WORDS_BIGENDIAN, __BIG_ENDIAN__, Define if your CPU is big endian)
+  AC_DEFINE(WORDS_BIGENDIAN, __BIG_ENDIAN__, [Define if your CPU is big endian])
 else
   AC_C_BIGENDIAN
 fi
@@ -2515,7 +2514,7 @@
 [i_cv_type_in6_addr=yes],
 [i_cv_type_in6_addr=no])])
 if test $i_cv_type_in6_addr = yes; then
-	AC_DEFINE(HAVE_IPV6,, Build with IPv6 support)
+	AC_DEFINE(HAVE_IPV6,, [Build with IPv6 support])
 	have_ipv6=yes
 fi
 AC_MSG_RESULT($i_cv_type_in6_addr)
@@ -2563,7 +2562,7 @@
 AC_SUBST(LINKED_STORAGE_LIBS)
 AC_SUBST(LINKED_STORAGE_LDADD)
 AC_SUBST(mailbox_list_drivers)
-AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", List of compiled in mail storages)
+AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", [List of compiled in mail storages])
 
 if test $have_sdbox = yes; then
   # create alias for sdbox
@@ -2615,16 +2614,16 @@
 build_cassandra=no
 for driver in $sql_drivers; do
   if test "$driver" = "pgsql"; then
-    AC_DEFINE(BUILD_PGSQL,, Built-in PostgreSQL support)
+    AC_DEFINE(BUILD_PGSQL,, [Built-in PostgreSQL support])
     build_pgsql=yes
   elif test "$driver" = "mysql"; then
-    AC_DEFINE(BUILD_MYSQL,, Built-in MySQL support)
+    AC_DEFINE(BUILD_MYSQL,, [Built-in MySQL support])
     build_mysql=yes
   elif test "$driver" = "sqlite"; then
-    AC_DEFINE(BUILD_SQLITE,, Built-in SQLite support)
+    AC_DEFINE(BUILD_SQLITE,, [Built-in SQLite support])
     build_sqlite=yes
   elif test "$driver" = "cassandra"; then
-    AC_DEFINE(BUILD_CASSANDRA,, Built-in Cassandra support)
+    AC_DEFINE(BUILD_CASSANDRA,, [Built-in Cassandra support])
     build_cassandra=yes
   fi
 done
@@ -2657,7 +2656,7 @@
   AC_CHECK_HEADER(zlib.h, [
     have_zlib=yes
     have_compress_lib=yes
-    AC_DEFINE(HAVE_ZLIB,, Define if you have zlib library)
+    AC_DEFINE(HAVE_ZLIB,, [Define if you have zlib library])
     COMPRESS_LIBS="$COMPRESS_LIBS -lz"
   ], [
     if test "$want_zlib" = "yes"; then
@@ -2671,7 +2670,7 @@
     AC_CHECK_LIB(bz2, BZ2_bzdopen, [
       have_bzlib=yes
       have_compress_lib=yes
-      AC_DEFINE(HAVE_BZLIB,, Define if you have bzlib library)
+      AC_DEFINE(HAVE_BZLIB,, [Define if you have bzlib library])
       COMPRESS_LIBS="$COMPRESS_LIBS -lbz2"
     ], [
       if test "$want_bzlib" = "yes"; then
@@ -2690,7 +2689,7 @@
     AC_CHECK_LIB(lzma, lzma_stream_decoder, [
       have_lzma=yes
       have_compress_lib=yes
-      AC_DEFINE(HAVE_LZMA,, Define if you have lzma library)
+      AC_DEFINE(HAVE_LZMA,, [Define if you have lzma library])
       COMPRESS_LIBS="$COMPRESS_LIBS -llzma"
     ], [
       if test "$want_lzma" = "yes"; then
@@ -2710,7 +2709,7 @@
     AC_CHECK_LIB(lz4, LZ4_compress, [
       have_lz4=yes
       have_compress_lib=yes
-      AC_DEFINE(HAVE_LZ4,, Define if you have lz4 library)
+      AC_DEFINE(HAVE_LZ4,, [Define if you have lz4 library])
       COMPRESS_LIBS="$COMPRESS_LIBS -llz4"
     ], [
       if test "$want_lz4" = "yes"; then
@@ -2735,14 +2734,14 @@
 
 have_rquota=no
 if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
-  AC_DEFINE(HAVE_RQUOTA,, Define if you wish to retrieve quota of NFS mounted mailboxes)
+  AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
   have_rquota=yes
 fi
 AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
 
 QUOTA_LIBS=""
 AC_SEARCH_LIBS(quota_open, quota, [
-  AC_DEFINE(HAVE_QUOTA_OPEN,, Define if you have quota_open())
+  AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()])
   QUOTA_LIBS="-lquota"
 ])
 AC_SUBST(QUOTA_LIBS)
@@ -2788,7 +2787,7 @@
 if test $want_stemmer != no; then
   AC_CHECK_LIB(stemmer, sb_stemmer_new, [
     have_fts_stemmer=yes
-    AC_DEFINE(HAVE_FTS_STEMMER,, Define if you want stemming support for FTS)
+    AC_DEFINE(HAVE_FTS_STEMMER,, [Define if you want stemming support for FTS])
   ], [
     if test $want_stemmer = yes; then
       AC_ERROR([Can't build with stemmer support: libstemmer not found])
@@ -2801,7 +2800,7 @@
   if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists libexttextcat 2>/dev/null; then
     PKG_CHECK_MODULES(LIBEXTTEXTCAT, libexttextcat)
     TEXTCAT_DATADIR=`$PKG_CONFIG --variable=pkgdatadir libexttextcat`
-    AC_DEFINE(HAVE_FTS_EXTTEXTCAT,, Define if you want exttextcat support for FTS)
+    AC_DEFINE(HAVE_FTS_EXTTEXTCAT,, [Define if you want exttextcat support for FTS])
     have_fts_exttextcat=yes
     # Debian Wheezy workaround - LIBEXTTEXTCAT_CFLAGS include path is wrong:
     AC_CHECK_HEADERS(libexttextcat/textcat.h)
@@ -2810,7 +2809,7 @@
       have_fts_exttextcat=yes
       AC_CHECK_HEADERS(libexttextcat/textcat.h)
       LIBEXTTEXTCAT_LIBS=-lexttextcat
-      AC_DEFINE(HAVE_FTS_EXTTEXTCAT,, Define if you want exttextcat support for FTS)
+      AC_DEFINE(HAVE_FTS_EXTTEXTCAT,, [Define if you want exttextcat support for FTS])
       TEXTCAT_DATADIR="/usr/share/libexttextcat"
       AC_SUBST(LIBEXTTEXTCAT_LIBS)
     ], [
@@ -2825,8 +2824,8 @@
     fi
   fi
   if test "$have_fts_exttextcat" = yes || test "$have_fts_textcat" = yes; then
-    AC_DEFINE(HAVE_FTS_TEXTCAT,, Define if you want textcat support for FTS)
-    AC_DEFINE_UNQUOTED(TEXTCAT_DATADIR, "$TEXTCAT_DATADIR", Points to textcat pkgdatadir containing the language files)
+    AC_DEFINE(HAVE_FTS_TEXTCAT,, [Define if you want textcat support for FTS])
+    AC_DEFINE_UNQUOTED(TEXTCAT_DATADIR, "$TEXTCAT_DATADIR", [Points to textcat pkgdatadir containing the language files])
   fi
 fi
 AM_CONDITIONAL(BUILD_FTS_TEXTCAT, test "$have_fts_textcat" = "yes")
@@ -2836,7 +2835,7 @@
   if test "$PKG_CONFIG" != "" && $PKG_CONFIG --exists icu-i18n 2>/dev/null; then
     PKG_CHECK_MODULES(LIBICU, icu-i18n)
     have_icu=yes
-    AC_DEFINE(HAVE_LIBICU,, Define if you want ICU normalization support for FTS)
+    AC_DEFINE(HAVE_LIBICU,, [Define if you want ICU normalization support for FTS])
   elif test "$want_icu" = "yes"; then
     AC_ERROR([Can't build with libicu support: libicu-i18n not found])
   fi
@@ -2868,8 +2867,8 @@
 dnl happy, because otherwise BIS server disables push email.
 capability_banner="IMAP4rev1 LITERAL+ SASL-IR LOGIN-REFERRALS ID ENABLE IDLE"
 capability="$capability_banner SORT SORT=DISPLAY THREAD=REFERENCES THREAD=REFS THREAD=ORDEREDSUBJECT MULTIAPPEND URL-PARTIAL CATENATE UNSELECT CHILDREN NAMESPACE UIDPLUS LIST-EXTENDED I18NLEVEL=1 CONDSTORE QRESYNC ESEARCH ESORT SEARCHRES WITHIN CONTEXT=SEARCH LIST-STATUS BINARY MOVE"
-AC_DEFINE_UNQUOTED(CAPABILITY_STRING, "$capability", IMAP capabilities)
-AC_DEFINE_UNQUOTED(CAPABILITY_BANNER_STRING, "$capability_banner", IMAP capabilities advertised in banner) 
+AC_DEFINE_UNQUOTED(CAPABILITY_STRING, "$capability", [IMAP capabilities])
+AC_DEFINE_UNQUOTED(CAPABILITY_BANNER_STRING, "$capability_banner", [IMAP capabilities advertised in banner])
 
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
 NOPLUGIN_LDFLAGS="-no-undefined"