summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-06-18 21:48:42 +0000
committerRoy Marples <uberlord@gentoo.org>2006-06-18 21:48:42 +0000
commitbb833778754959d41f5c8951b88078ed68a7f7f1 (patch)
treed417d53aa0c383db560f3e1e2939e3903a1f35ab /net-mail/dovecot
parentAdded patch to fix continuing from resume-position. (diff)
downloadgentoo-2-bb833778754959d41f5c8951b88078ed68a7f7f1.tar.gz
gentoo-2-bb833778754959d41f5c8951b88078ed68a7f7f1.tar.bz2
gentoo-2-bb833778754959d41f5c8951b88078ed68a7f7f1.zip
Update configure patch with final upstream version
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'net-mail/dovecot')
-rw-r--r--net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch19
1 files changed, 15 insertions, 4 deletions
diff --git a/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch b/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch
index 02b4f7a43502..67626a48ff94 100644
--- a/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch
+++ b/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch
@@ -3,8 +3,8 @@ This should solve the issue of inotify.h being present but the kernel
and/or glibc does not support it.
--- configure.in 2006-06-13 12:24:58.000000000 +0100
-+++ configure.in 2006-06-15 14:46:05.620287008 +0100
-@@ -364,29 +364,39 @@
++++ configure.in 2006-06-18 02:34:41.000000000 +0100
+@@ -364,29 +371,39 @@
dnl * I/O loop function
have_ioloop=no
@@ -18,7 +18,7 @@ and/or glibc does not support it.
+ #include <sys/epoll.h>
+ #include <errno.h>
+
-+ #include <asm/unistd.h>
++ #include <linux/unistd.h>
+
+ _syscall1 (int, epoll_create, int, size)
+
@@ -61,7 +61,7 @@ and/or glibc does not support it.
fi
if test "$ioloop" = "" || test "$ioloop" = "poll"; then
-@@ -404,69 +414,83 @@
+@@ -404,69 +421,94 @@
have_notify=none
@@ -85,6 +85,7 @@ and/or glibc does not support it.
- ])
-elif test "$notify" = "inotify"; then
+if test "$notify" = "" || test "$notify" = "inotify" ; then
++ AC_MSG_CHECKING([if we can use inotify])
dnl * inotify?
- AC_TRY_COMPILE([
+ AC_TRY_RUN([
@@ -135,16 +136,20 @@ and/or glibc does not support it.
have_notify=inotify
+ notify=inotify
AC_DEFINE(IOLOOP_NOTIFY_INOTIFY,, Use Linux inotify)
++ AC_MSG_RESULT("yes")
], [
- AC_MSG_ERROR([inotify requested but not available, check for existence of <sys/inotify.h>])
++ AC_MSG_RESULT("no")
+ if test "$notify" = "inotify"; then
+ AC_MSG_WARN([inotify requested but not available])
++ notify=""
+ fi
])
-elif test "$notify" = "kqueue"; then
+fi
+
+if test "$notify" = "" || test "$notify" = "kqueue"; then
++ AC_MSG_CHECKING([if we can use BSD kqueue() notify])
dnl * BSD kqueue() notify
- if test "$ac_cv_func_kqueue" != yes ; then
- AC_MSG_WARN([kqueue notify requested but kqueue() is not available])
@@ -156,11 +161,14 @@ and/or glibc does not support it.
+ if test "$ac_cv_func_kqueue" == yes && test "$ac_cv_func_kevent" == yes ; then
have_notify=kqueue
+ notify=kqueue
++ AC_MSG_RESULT("yes")
AC_DEFINE(IOLOOP_NOTIFY_KQUEUE,,
Use BSD kqueue directory changes notificaton)
+ else
++ AC_MSG_RESULT("no")
+ if test "$notfify" = "kqueue" ; then
+ AC_MSG_WARN([kqueue notify requested but kqueue() is not available])
++ notify=""
+ fi
fi
-else
@@ -168,6 +176,7 @@ and/or glibc does not support it.
+fi
+
+if test "$notify" = "" || test "$notify" = "dnotify"; then
++ AC_MSG_CHECKING([if we can use dnotify])
+ dnl * dnotify?
+ AC_TRY_COMPILE([
+ #define _GNU_SOURCE
@@ -178,10 +187,12 @@ and/or glibc does not support it.
+ fcntl(0, F_SETSIG, SIGRTMIN);
+ fcntl(0, F_NOTIFY, DN_CREATE | DN_DELETE | DN_RENAME | DN_MULTISHOT);
+ ], [
++ AC_MSG_RESULT("yes")
+ AC_DEFINE(IOLOOP_NOTIFY_DNOTIFY,, Use Linux dnotify)
+ have_notify=dnotify
+ notify=dnotify
+ ], [
++ AC_MSG_RESULT("no")
+ if test "$notify" = "dnotify"; then
+ AC_MSG_WARN([dnotify requested but not available])
+ fi