SF.net SVN: gar:[25377] csw/mgar/pkg/389-admin/trunk/Makefile

[cgrzemba at users.sourceforge.net]

Revision: 25377
          http://sourceforge.net/p/gar/code/25377
Author:   cgrzemba
Date:     2015-11-12 15:45:05 +0000 (Thu, 12 Nov 2015)
Log Message:
-----------
389-admin/trunk: switch ldap API

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2015-11-12 15:02:23 UTC (rev 25376)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2015-11-12 15:45:05 UTC (rev 25377)
@@ -26,14 +26,19 @@
 LICENSE = LICENSE
 
 # GARFLAVOR=DBG
-LDAP_API=mozldap
-# LDAP_API=openldap
+# LDAP_API=mozldap
+LDAP_API=openldap
 
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
 PATCHFILES += 0004-change-include-preferences-in-Makefile.am.patch
 PATCHFILES += 0005-ctime_r-params-viewdata.c.patch
 
+PRESERVECONF += $(sysconfdir)/dirsrv/admin/httpd.conf
+PRESERVECONF += $(sysconfdir)/dirsrv/admin/console.conf
+PRESERVECONF += $(sysconfdir)/dirsrv/admin/local.conf
+PRESERVECONF += $(sysconfdir)/dirsrv/admin/adm.conf
+
 BUILD_DEP_PKGS += CSWnspr-dev
 BUILD_DEP_PKGS += CSWlibnss-dev
 BUILD_DEP_PKGS += CSW389-adminutil-dev
@@ -115,7 +120,7 @@
 CONFIGURE_ARGS_64 += --with-apxs=/opt/csw/bin/$(BUILD_ISAS)/apxs
 CONFIGURE_ARGS_32 += --with-httpd=/opt/csw/sbin/httpd
 CONFIGURE_ARGS_32 += --with-modnss-lib=/opt/csw/lib/apache2/modules
-CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd -D 64bit
+CONFIGURE_ARGS_64 += --with-httpd=/opt/csw/sbin/$(BUILD_ISAS)/httpd
 CONFIGURE_ARGS_64 += --with-modnss-lib=/opt/csw/lib/$(BUILD_ISAS)/apache2/modules
 CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/sbin
 # CONFIGURE_ARGS += --with-adminutil=/opt/csw

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