dovecot-2.2: configure: Use consistent quotation for AC_DEFINEs ...
dovecot at dovecot.org
dovecot at dovecot.org
Thu May 14 10:40:22 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/a2c3a0f671a6
changeset: 18690:a2c3a0f671a6
user: Matti Hamalainen <ccr at tnsp.org>
date: Thu May 14 12:36:38 2015 +0300
description:
configure: Use consistent quotation for AC_DEFINEs as per autoconf recommendations.
Also fix one minor typo.
diffstat:
configure.ac | 277 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 138 insertions(+), 139 deletions(-)
diffs (truncated from 1078 to 300 lines):
diff -r a0dd9dad3b8c -r a2c3a0f671a6 configure.ac
--- 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)
More information about the dovecot-cvs
mailing list