[csw-devel] SF.net SVN: gar:[16141] csw/mgar/pkg/openldap/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 16141
          http://gar.svn.sourceforge.net/gar/?rev=16141&view=rev
Author:   dmichelsen
Date:     2011-11-08 13:41:39 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
openldap/trunk: Enable TCP Wrappers for both 32/64 bit, update dependencies

Modified Paths:
--------------
    csw/mgar/pkg/openldap/trunk/Makefile

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2011-11-08 13:39:54 UTC (rev 16140)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2011-11-08 13:41:39 UTC (rev 16141)
@@ -47,7 +47,8 @@
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1
 RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2
-RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicu46
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1
 OBSOLETED_BY_CSWopenldap += CSWoldap
 CATALOGNAME_CSWoldap = openldap_stub
@@ -134,12 +135,17 @@
 NODIRPATHS = --docdir
 
 BUILD64 = 1
+
+# This takes some more work, the sbin/ files should be linked to libexec but the linklevel is not deep enough
+# ISAEXEC = 1
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-crypt
 CONFIGURE_ARGS += --enable-lmpasswd
 CONFIGURE_ARGS += --enable-modules
 CONFIGURE_ARGS += --enable-rlookups
 CONFIGURE_ARGS += --enable-slp
+CONFIGURE_ARGS += --enable-wrappers
 CONFIGURE_ARGS += --enable-backends=mod
 CONFIGURE_ARGS += --enable-overlays=mod
 
@@ -154,9 +160,6 @@
 #   http://www.openldap.org/its/index.cgi?findid=7071
 CONFIGURE_ARGS += ac_cv_lib_net_main=no
 
-# Disable TCPwrappers in 64 bit until the libraries are available
-#   <http://opencsw.org/mantis/view.php?id=3748>
-CONFIGURE_ARGS_32 = --enable-wrappers
 # spasswd requires Cyrus SASL
 CONFIGURE_ARGS_32 += --enable-spasswd
 
@@ -171,6 +174,7 @@
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
+# The testsuite takes a couple of hours
 SKIPTEST ?= 1
 
 # Perl backend is built, although it has been told not to.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.