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 8bf51216c87b984c1172277c44aeb7f8b2b2ac2f..774fa4f337503e1019c825b8ac87fe054f9ad499 100644 (file)
--- a/src/OS/Makefile-CYGWIN
+++ b/src/OS/Makefile-CYGWIN
@@ -1,12 +1,10 @@
-# $Cambridge: exim/src/OS/Makefile-CYGWIN,v 1.3 2005/05/23 16:58:55 fanf2 Exp $
-
 # OS-specific file for Cygwin.
 
 # This file provided by Pierre A. Humblet <Pierre.Humblet@ieee.org>
 
 HAVE_ICONV = yes
 CFLAGS= -g -Wall -O2
-LIBS= -lcrypt -lresolv -lm
+LIBS= -lcrypt -lresolv
 LIBS_EXIM= -liconv
 EXIWHAT_PS_ARG=-as
 EXIWHAT_KILL_SIGNAL=-USR1
@@ -65,9 +63,6 @@ SUPPORT_MBX=yes
 LOOKUP_DBM=yes
 LOOKUP_LSEARCH=yes
 
-LDAP_LIB_TYPE=OPENLDAP2
-LIBS_EXIM +=-lldap
-
 # LOOKUP_CDB=yes
 LOOKUP_DNSDB=yes
 LOOKUP_DSEARCH=yes
@@ -80,8 +75,15 @@ LOOKUP_PASSWD=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
 
@@ -109,8 +111,4 @@ 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
-
 # End