Merge branch 'master' into transp_logging_1031

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

diff --git a/src/OS/Makefile-CYGWIN b/src/OS/Makefile-CYGWIN
index e9b7a9ee7b8e25949804d28b3603e2113cc728ba..774fa4f337503e1019c825b8ac87fe054f9ad499 100644 (file)
--- a/src/OS/Makefile-CYGWIN
+++ b/src/OS/Makefile-CYGWIN
@@ -1,5 +1,3 @@
-# $Cambridge: exim/src/OS/Makefile-CYGWIN,v 1.1 2004/10/06 15:07:39 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>


@@ -67,8 +65,8 @@ LOOKUP_LSEARCH=yes
 
 # LOOKUP_CDB=yes
 LOOKUP_DNSDB=yes
 
 # LOOKUP_CDB=yes
 LOOKUP_DNSDB=yes

-# LOOKUP_DSEARCH=yes
-# LOOKUP_LDAP=yes
+LOOKUP_DSEARCH=yes
+LOOKUP_LDAP=yes

 # LOOKUP_MYSQL=yes
 # LOOKUP_NIS=yes
 # LOOKUP_NISPLUS=yes
 # LOOKUP_MYSQL=yes
 # LOOKUP_NIS=yes
 # LOOKUP_NISPLUS=yes


@@ -77,8 +75,15 @@ 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_OLD_DEMIME=yes
+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
 


@@ -106,8 +111,4 @@ MSGLOG_DIRECTORY_MODE = 0777
 SPOOL_DIRECTORY_MODE  = 0777
 SPOOL_MODE            = 0666
 
 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
-

 # End
 # End