Stop compiling/packaging presence plugin and its clients "ldaptags" and "online" from DS7.1.

Makefile

@@ -214,9 +214,9 @@ endif
 
 buildDirectoryClients: $(ANT_DEP) java_platform_check
 ifeq ($(BUILD_JAVA_CODE),1)
-	cd ldap/clients; $(MAKE) $(MFLAGS)
+	cd ldap/clients; $(MAKE) $(MFLAGS) dsmlgw
 endif
-	cd ldap/clients/dsgw; $(MAKE) $(MFLAGS)
+	cd ldap/clients; $(MAKE) $(MFLAGS) dsgw
 
 $(OBJDIR):
 	if test ! -d $(OBJDIR); then mkdir -p $(OBJDIR); fi;

ldap/clients/Makefile

@@ -19,10 +19,18 @@ MCOM_ROOT=../../..
 include ../../nsconfig.mk
 include ../../ldap/javarules.mk
 
-all:
+all: ldaptags online dsgw dsmlgw
+
+ldaptags:
 	cd ldaptags; $(MAKE)
+
+online:
 	cd online; $(MAKE)
-#	cd dsgw; $(MAKE)
+
+dsgw:
+	cd dsgw; $(MAKE)
+
+dsmlgw:
 	cd dsmlgw; $(MAKE)
 
 clean: 

ldap/cm/Makefile

@@ -416,7 +416,9 @@ endif
 	$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH)
 
 # Images for IM Presence plugin
+ifdef BUILD_PRESENCE
 	$(INSTALL) -m 644 $(MCOM_DRIVE)$(MCOM_ROOT)/ldapserver/ldap/servers/plugins/presence/images/*.gif $(RELDIR)/bin/slapd/install/presence
+endif
 
 # docs
 	if [ -d $(OBJDIR)/manual/slapd ] ; \

ldap/servers/plugins/Makefile

@@ -19,7 +19,7 @@ NSPR20=true	# probably should be defined somewhere else (not sure where)
 include $(MCOM_ROOT)/ldapserver/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
-all: _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _presence _views 
+all: _referint _collation _syntaxes _passthru _utils _uiduniq _roles _acl _replication _cos _pwdstorage _rever _chainingdb _distrib _retrocl _statechange _http _views 
 
 _utils:
 	cd shared; $(MAKE) $(MFLAGS) all
@@ -71,6 +71,7 @@ _retrocl:
 _http:
 	cd http; $(MAKE) $(MFLAGS) all
 
+# Note: stops building/packaging presence from 7.1
 _presence:
 	cd presence; $(MAKE) $(MFLAGS) all
 
@@ -94,8 +95,8 @@ clean:
 	cd distrib; $(MAKE) $(MFLAGS) clean
 	cd retrocl; $(MAKE) $(MFLAGS) clean
 	cd statechange; $(MAKE) $(MFLAGS) clean
-	cd presence; $(MAKE) $(MFLAGS) clean
 	cd http; $(MAKE) $(MFLAGS) clean
 	cd views; $(MAKE) $(MFLAGS) clean
+	#cd presence; $(MAKE) $(MFLAGS) clean
 
 veryclean:	clean