aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@helixcode.com>2000-11-29 06:58:58 +0800
committerJP Rosevear <jpr@src.gnome.org>2000-11-29 06:58:58 +0800
commite365109fdc5f0fb5c2929c7fa14720fbcc86ad37 (patch)
treeadba723835412f0622ea2b12a1e7521189533dd1
parent06a83735415c1cd4e037839ce352e7d2d074be37 (diff)
downloadgsoc2013-evolution-e365109fdc5f0fb5c2929c7fa14720fbcc86ad37.tar
gsoc2013-evolution-e365109fdc5f0fb5c2929c7fa14720fbcc86ad37.tar.gz
gsoc2013-evolution-e365109fdc5f0fb5c2929c7fa14720fbcc86ad37.tar.bz2
gsoc2013-evolution-e365109fdc5f0fb5c2929c7fa14720fbcc86ad37.tar.lz
gsoc2013-evolution-e365109fdc5f0fb5c2929c7fa14720fbcc86ad37.tar.xz
gsoc2013-evolution-e365109fdc5f0fb5c2929c7fa14720fbcc86ad37.tar.zst
gsoc2013-evolution-e365109fdc5f0fb5c2929c7fa14720fbcc86ad37.zip
Add USE_FLOCK, USE_FCNTL, USE_FLOCK
2000-11-28 JP Rosevear <jpr@helixcode.com> * acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK * configure.in: Auto* magic for various camel locking types 2000-11-28 JP Rosevear <jpr@helixcode.com> * camel-lock.c: No longer hard code the enabled lock types svn path=/trunk/; revision=6703
-rw-r--r--ChangeLog6
-rw-r--r--acconfig.h3
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/camel-lock.c5
-rw-r--r--configure.in31
5 files changed, 43 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a6859f0c7..4d01e05124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-28 JP Rosevear <jpr@helixcode.com>
+
+ * acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK
+
+ * configure.in: Auto* magic for various camel locking types
+
2000-11-28 Not Zed <NotZed@HelixCode.com>
* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile
diff --git a/acconfig.h b/acconfig.h
index 7e9b142643..cfe10e3083 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -22,6 +22,9 @@
#undef PGP5_PATH
#undef PGP_PATH
#undef USING_GNOME_PRINT_0_20
+#undef USE_DOT
+#undef USE_FCNTL
+#undef USE_FLOCK
#undef NEED_KRB_SENDAUTH_PROTO
#undef HAVE_ISBLANK
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 430cfc7c99..1d3c75262b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-28 JP Rosevear <jpr@helixcode.com>
+
+ * camel-lock.c: No longer hard code the enabled lock types
+
2000-11-28 Dan Winship <danw@helixcode.com>
* camel-remote-store.c (remote_recv_line): Don't set exception to
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index ab70cfd891..8b9b159001 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -22,11 +22,6 @@
#include <config.h>
-/* need configure checks or some configurable thingy here */
-#define USE_DOT
-#define USE_FCNTL
-#define USE_FLOCK
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/configure.in b/configure.in
index 2065ce0cfa..4e616ee2b9 100644
--- a/configure.in
+++ b/configure.in
@@ -187,6 +187,33 @@ AC_SUBST(THREADS_LIBS)
AC_SUBST(THREADS_CFLAGS)
dnl **************************************************
+dnl * File locking
+dnl **************************************************
+
+AC_ARG_ENABLE(dot-locking,
+[ --enable-dot-locking=[yes/no] Enable support for locking mail files with dot locking],,enable_dot_locking=yes)
+if test "x$enable_dot_locking" = "xyes"; then
+ AC_DEFINE(USE_DOT)
+ msg_dot=Yes
+else
+ msg_dot=No
+fi
+
+AC_ARG_ENABLE(file-locking,
+[ --enable-file-locking=[fcntl/flock/no] Enable support for locking mail files with file locking],,enable_file_locking=fcntl)
+if test "x$enable_file_locking" = "xfcntl"; then
+ AC_DEFINE(USE_FCNTL)
+ msg_file=fcntl
+else
+ if test "x$enable_file_locking" = "xflock"; then
+ AC_DEFINE(USE_FLOCK)
+ msg_file=flock
+ else
+ msg_file=No
+ fi
+fi
+
+dnl **************************************************
dnl * Print check
dnl **************************************************
AC_MSG_CHECKING(for GnomePrint libraries version either 0.20 or later)
@@ -710,6 +737,8 @@ echo "
LDAP support: $msg_ldap
Pilot conduits: $msg_pilot
Kerberos 4/5: $msg_krb4/$msg_krb5
- Use movemail: $with_movemail
+ Use movemail: $with_movemail
+ Dot Locking: $msg_dot
+ File Locking: $msg_file
Crypto support: $msg_crypto
"