[Dovecot] 1.0-test51
Matthias Andree
matthias.andree at gmx.de
Fri Oct 22 14:07:21 EEST 2004
Timo Sirainen <tss at iki.fi> writes:
> http://dovecot.org/test/
>
> This release is built with autoconf 2.59 and libtool 1.9. We'll see how
> it works out :) The required changes were done by Matthias Andree.
I have some minor cleanups (1.0-test51 doesn't appear to be in CVS, I
hope the other patches apply fine)
- the configure.in cleanups were auto-generated by "autoupdate"
* perhaps omit this patch and run "autoupdate" instead.
- the lib.h patch fixes VPATH builds
* i. e.: mkdir build ; cd build ; ../configure -C && make
- the Makefile.am patch fixes automake warnings and "does the right thing"
Index: src/lib/lib.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib/lib.h,v
retrieving revision 1.15
diff -u -r1.15 lib.h
--- src/lib/lib.h 11 Sep 2004 17:24:50 -0000 1.15
+++ src/lib/lib.h 22 Oct 2004 11:04:27 -0000
@@ -3,7 +3,7 @@
/* default lib includes */
#ifdef HAVE_CONFIG_H
-# include "../../config.h"
+# include "config.h"
#endif
/* default system includes - keep these at minimum.. */
Index: src/lib-storage/register/Makefile.am
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/register/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- src/lib-storage/register/Makefile.am 20 Oct 2004 23:06:04 -0000 1.3
+++ src/lib-storage/register/Makefile.am 22 Oct 2004 11:04:28 -0000
@@ -25,7 +25,4 @@
libstorage_register_a_SOURCES = \
mail-storage-register.c
-DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-distclean-generic:
- rm -f Makefile mail-storage-register.c
+DISTCLEANFILES = mail-storage-register.c
Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.190
diff -u -r1.190 configure.in
--- configure.in 20 Oct 2004 23:05:53 -0000 1.190
+++ configure.in 22 Oct 2004 11:04:27 -0000
@@ -1,4 +1,4 @@
-AC_INIT(dovecot, 1.0-test50, [dovecot at dovecot.org])
+AC_INIT([dovecot],[1.0-test50],[dovecot at dovecot.org])
AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADERS([config.h])
@@ -288,27 +288,27 @@
fi
dnl * dnotify?
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#define _GNU_SOURCE
#include <fcntl.h>
#include <signal.h>
#include <unistd.h>
-], [
+]], [[
fcntl(0, F_SETSIG, SIGRTMIN);
fcntl(0, F_NOTIFY, DN_CREATE | DN_DELETE | DN_RENAME | DN_MULTISHOT);
-], [
+]])],[
AC_DEFINE(IOLOOP_NOTIFY_DNOTIFY,, Use Linux dnotify)
-], [
+],[
AC_DEFINE(IOLOOP_NOTIFY_NONE,, No special notify support)
])
dnl * GLIBC?
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <stdlib.h>
#ifdef __GLIBC__
we have glibc
#endif
-],,, [
+]], [[]])],[],[
AC_DEFINE(PREAD_WRAPPERS,, Define if pread/pwrite needs _XOPEN_SOURCE 500)
])
@@ -704,22 +704,22 @@
dnl * Linux compatible mremap()
AC_MSG_CHECKING([Linux compatible mremap()])
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <unistd.h>
#define __USE_GNU
#include <sys/mman.h>
-], [
+]], [[
mremap(0, 0, 0, MREMAP_MAYMOVE);
-], [
+]])],[
AC_DEFINE(HAVE_LINUX_MREMAP,, Define if you have Linux-compatible mremap())
AC_MSG_RESULT(yes)
-], [
+],[
AC_MSG_RESULT(no)
])
dnl * If mmap() plays nicely with write()
AC_MSG_CHECKING([whether shared mmaps get updated by write()s])
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -749,12 +749,12 @@
return strcmp(mem, "3") == 0 ? 0 : 1;
}
-], [
+]])],[
AC_MSG_RESULT(yes)
-], [
+],[
AC_MSG_RESULT(no)
AC_DEFINE(MMAP_CONFLICTS_WRITE,, [Define if shared mmaps don't get updated by write()s])
-])
+],[])
dnl * see if fd passing works
AC_MSG_CHECKING([whether fd passing works])
@@ -765,7 +765,7 @@
CFLAGS="$CFLAGS -DBUGGY_CMSG_MACROS"
fi
- AC_TRY_RUN([
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
@@ -799,20 +799,20 @@
return st.st_ino == st2.st_ino ? 0 : 1;
}
}
- ], [
+ ]])],[
CFLAGS=$old_cflags
if test $i = 2; then
AC_DEFINE(BUGGY_CMSG_MACROS,, Define if you have buggy CMSG macros)
fi
AC_MSG_RESULT(yes)
break
- ], [
+ ],[
dnl no, try with BUGGY_CMSG_MACROS
CFLAGS=$old_cflags
if test $i = 2; then
AC_MSG_RESULT(no)
fi
- ])
+ ],[])
done
dnl * Solaris compatible sendfile()
@@ -823,33 +823,33 @@
dnl * Linux compatible sendfile() - don't check if Solaris one was found.
dnl * This seems to pass with Solaris for some reason..
AC_MSG_CHECKING([Linux compatible sendfile()])
- AC_TRY_LINK([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#undef _FILE_OFFSET_BITS
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/sendfile.h>
- ], [
+ ]], [[
sendfile(0, 0, (void *) 0, 0);
- ], [
+ ]])],[
AC_DEFINE(HAVE_LINUX_SENDFILE,, Define if you have Linux-compatible sendfile())
AC_MSG_RESULT(yes)
- ], [
+ ],[
AC_MSG_RESULT(no)
])
dnl * FreeBSD compatible sendfile()
AC_MSG_CHECKING([FreeBSD compatible sendfile()])
- AC_TRY_LINK([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/uio.h>
- ], [
+ ]], [[
struct sf_hdtr hdtr;
sendfile(0, 0, 0, 0, &hdtr, (void *) 0, 0);
- ], [
+ ]])],[
AC_DEFINE(HAVE_FREEBSD_SENDFILE,, Define if you have FreeBSD-compatible sendfile())
AC_MSG_RESULT(yes)
- ], [
+ ],[
AC_MSG_RESULT(no)
])
])
@@ -1173,14 +1173,14 @@
else
ssl_define=""
fi
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
$ssl_define
#include <mysql.h>
- ], [
+ ]], [[
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,, Build with MySQL support)
--
Matthias Andree
More information about the dovecot
mailing list