Forward-port ChangeLog entries written for release branch

[users/jgh/exim.git] / src / OS / Makefile-CYGWIN

diff --git a/src/OS/Makefile-CYGWIN b/src/OS/Makefile-CYGWIN
index 52dd68456aaa8fde40c7f08e72ee9e64a176002e..006e9feff3e8826423791ee9007311d2ac5ce845 100644 (file)
--- a/src/OS/Makefile-CYGWIN
+++ b/src/OS/Makefile-CYGWIN
@@ -1,11 +1,11 @@
-# $Cambridge: exim/src/OS/Makefile-CYGWIN,v 1.2 2004/11/10 10:36:48 ph10 Exp $
-

 # OS-specific file for Cygwin.
 
 # This file provided by Pierre A. Humblet <Pierre.Humblet@ieee.org>
 
 # OS-specific file for Cygwin.
 
 # This file provided by Pierre A. Humblet <Pierre.Humblet@ieee.org>
 

+HAVE_IPV6 = yes

 HAVE_ICONV = yes
 HAVE_ICONV = yes

-CFLAGS= -g -Wall -O2
+# Use c99 to have %z 
+CFLAGS= -g -Wall -std=c99 -U __STRICT_ANSI__

 LIBS= -lcrypt -lresolv
 LIBS_EXIM= -liconv
 EXIWHAT_PS_ARG=-as
 LIBS= -lcrypt -lresolv
 LIBS_EXIM= -liconv
 EXIWHAT_PS_ARG=-as


@@ -26,7 +26,7 @@ LIBS_EXIM +=../Local/exim_res.o
 
 
 ##################################################
 
 
 ##################################################

-# The following is normaly set in local/Makefile.
+# The following is normally set in local/Makefile.

 # Makefile.cygwin provides defaults with which the
 # precompiled version is built
 ##################################################
 # Makefile.cygwin provides defaults with which the
 # precompiled version is built
 ##################################################


@@ -65,9 +65,6 @@ SUPPORT_MBX=yes
 LOOKUP_DBM=yes
 LOOKUP_LSEARCH=yes
 
 LOOKUP_DBM=yes
 LOOKUP_LSEARCH=yes
 

-LDAP_LIB_TYPE=OPENLDAP2
-LIBS_EXIM +=-lldap
-

 # LOOKUP_CDB=yes
 LOOKUP_DNSDB=yes
 LOOKUP_DSEARCH=yes
 # LOOKUP_CDB=yes
 LOOKUP_DNSDB=yes
 LOOKUP_DSEARCH=yes


@@ -80,8 +77,14 @@ LOOKUP_PASSWD=yes
 # LOOKUP_PGSQL=yes
 # LOOKUP_WHOSON=yes
 
 # LOOKUP_PGSQL=yes
 # LOOKUP_WHOSON=yes
 

-# It is important to define this variable but its value is always overridden
-CONFIGURE_OWNER=544
+LDAP_LIB_TYPE=OPENLDAP2
+LOOKUP_LIBS=-lldap -llber
+
+WITH_CONTENT_SCAN=yes
+
+# It is important to define these variables but the values are always overridden
+CONFIGURE_OWNER=18
+CONFIGURE_GROUP=544

 
 EXICYCLOG_MAX=10
 
 
 EXICYCLOG_MAX=10
 


@@ -96,21 +99,15 @@ ZCAT_COMMAND=/usr/bin/zcat
 SUPPORT_PAM=yes
 CFLAGS += -DINCLUDE_PAM -I ../pam -I ../../pam
 
 SUPPORT_PAM=yes
 CFLAGS += -DINCLUDE_PAM -I ../pam -I ../../pam
 

-APPENDFILE_MODE       = 0644     # default if no ntsec
-APPENDFILE_DIRECTORY_MODE = 0777
-APPENDFILE_LOCKFILE_MODE = 0666
-EXIMDB_DIRECTORY_MODE    = 0777
+# All modes are in octal and must start with 0
+EXIMDB_DIRECTORY_MODE    = 01777

 EXIMDB_MODE              = 0666
 EXIMDB_LOCKFILE_MODE     = 0666
 EXIMDB_MODE              = 0666
 EXIMDB_LOCKFILE_MODE     = 0666

-INPUT_DIRECTORY_MODE  = 0777
-LOG_DIRECTORY_MODE    = 0777
+INPUT_DIRECTORY_MODE  = 01777
+LOG_DIRECTORY_MODE    = 01777

 LOG_MODE              = 0666
 LOG_MODE              = 0666

-MSGLOG_DIRECTORY_MODE = 0777
-SPOOL_DIRECTORY_MODE  = 0777
-SPOOL_MODE            = 0666
-
-# PERL_CC=gcc -g -O2 -I ../minires
-# PERL_CCOPTS= -dD -save-temps -I ../minires
-# PERL_LIBS = /usr/lib/perl5/5.6.1/cygwin-multi/auto/DynaLoader/DynaLoader.a -L/usr/lib/perl5/5.6.1/cygwin-multi/CORE -llibperl5_6_1
+MSGLOG_DIRECTORY_MODE = 01777
+SPOOL_DIRECTORY_MODE  = 01777
+SPOOL_MODE            = 0600

 
 # End
 
 # End