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

[cgrzemba at users.sourceforge.net]

Revision: 25378
          http://sourceforge.net/p/gar/code/25378
Author:   cgrzemba
Date:     2015-11-12 15:47:59 +0000 (Thu, 12 Nov 2015)
Log Message:
-----------
389-adminutil/trunk: set LDAPAPI

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

Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	2015-11-12 15:45:05 UTC (rev 25377)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2015-11-12 15:47:59 UTC (rev 25378)
@@ -25,6 +25,9 @@
 BUILD_DEPS += CSWnspr-dev
 BUILD_DEPS += CSWlibnss3-dev
 
+# LDAPAPI=mozldap
+LDAPAPI=openldap
+
 PACKAGES += CSWlibadminutil0
 CATALOGNAME_CSWlibadminutil0 = libadminutil0
 SPKG_DESC_CSWlibadminutil0 += $(DESCRIPTION), libadminutil
@@ -34,11 +37,8 @@
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssl3
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc54
-RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicui18n52
-RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWlibadminutil0_sparc += CSWlibicudata52
-RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(GARCH))
+RUNTIME_DEP_PKGS_CSWlibadminutil0_openldap += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += $(RUNTIME_DEP_PKGS_CSWlibadminutil0_$(LDAPAPI))
 
 PACKAGES += CSWlibadmsslutil0
 CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0
@@ -49,12 +49,8 @@
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssl3
-RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicuuc52
-RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicui18n52
-RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWlibadmsslutil0_sparc += CSWlibicudata52
-RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(GARCH))
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0_openldap += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += $(RUNTIME_DEP_PKGS_CSWlibadmsslutil0_$(LDAPAPI))
 
 PACKAGES += CSW389-adminutil-dev
 CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev
@@ -68,9 +64,6 @@
 TEST_SCRIPTS = 
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
 
-# LDAPAPI=mozldap
-LDAPAPI=openldap
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_mozldap += --with-ldapsdk-inc=$(includedir)/dirsrv 
 CONFIGURE_ARGS_mozldap += --with-ldapsdk-lib=$(libdir)

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