add ability to build from open source components

4 files changed, 55 insertions, 34 deletions

diff --git a/ldap/Makefile b/ldap/Makefile
index 9328b632..a81c4481 100644
--- a/ldap/Makefile
+++ b/ldap/Makefile
@@ -29,6 +29,7 @@ ldapprogs:
 ifneq ($(ARCH), WINNT) 
 	cd systools; $(MAKE) $(MFLAGS) all
 	# new unix installer
+ifeq ($(USE_SETUPSDK), 1)
 	cd cm/newinst; $(MAKE) $(MFLAGS) all
 ifeq ($(USE_64),1)
 	# In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts
@@ -36,10 +37,13 @@ ifeq ($(USE_64),1)
 	# to see them in the 64-bit output directory. So, here we copy them over.
 	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/ns-update $(LDAP_ADMIN_BIN_RELDIR)
 	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/uninstall $(LDAP_ADMIN_BIN_RELDIR)
-endif
-else
+endif # USE_64
+endif # USE_SETUPSDK
+else # not WINNT
+ifeq ($(USE_SETUPSDK), 1)
 	cd cm/newinstnt; $(MAKE) $(MFLAGS) all
-endif
+endif # USE_SETUPSDK
+endif # WINNT
 	cd admin; $(MAKE) $(MFLAGS) all
 
 ldapdocs:
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index b78bd1f2..0bde63e7 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -21,11 +21,10 @@ SCRIPTSDIR=$(LDAP_BASE_RELDIR)/admin/scripts
 
 include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
-ifndef LDAP_USE_OLD_DB
-include $(BUILD_ROOT)/ns_usedb.mk
-endif
 
+ifeq ($(USE_ADMINSERVER), 1)
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
+endif
 
 INCLUDES += -I$(LDAP_SRC)/admin/include
 
@@ -36,15 +35,21 @@ EXTRALDFLAGS += $(SSLLIBFLAG)
 endif
 
 ifeq ($(BUILD_DLL), yes)
-DYNAMIC_DEPLIBS=$(LDAP_ADMLIB) $(LDAP_COMMON_LIBS_DEP) $(ADMINUTIL)
+DYNAMIC_DEPLIBS=$(LDAP_ADMLIB) $(LDAP_COMMON_LIBS_DEP)
+ifeq ($(USE_ADMINSERVER), 1)
+  DYNAMIC_DEPLIBS += $(ADMINUTIL)
+endif
 DYNAMIC_DEPLINK=$(DYNAMIC_DEPLIBS)
 else
 DYNAMIC_DEPLIBS=$(LDAP_COMMON_LIBS_DEP)
 DYNAMIC_DEPLINK=$(LDAP_ADMLIB) $(LDAP_COMMON_LIBS)
 endif
 
-EXTRA_LIBS_DEP += $(NSPR_DEP) $(LDAPSDK_DEP) $(ADMINUTIL_DEP) $(ICU_DEP)
-
+EXTRA_LIBS_DEP += $(NSPR_DEP) $(LDAPSDK_DEP)
+ifeq ($(USE_ADMINSERVER), 1)
+  EXTRA_LIBS_DEP += $(ADMINUTIL_DEP)
+endif
+EXTRA_LIBS_DEP += $(ICU_DEP)
 # we don't want to build with warnings-as-errors for the admin/ stuff, because
 # it's got crappy C++ code which is LITTERED with warnings, most of which we
 # can't fix because it comes from files in dist/, etc.
@@ -53,8 +58,15 @@ CFLAGS := $(subst -Werror,,$(CFLAGS))
 endif
 
 OLD_EXTRA_LIBS := $(EXTRA_LIBS)
-EXTRA_LIBS = $(DYNAMIC_DEPLINK) $(ADMINUTIL_LINK) $(LDAP_NOSSL_LINK) \
-	$(SECURITYLINK) $(NSPRLINK) $(SETUPSDK_S_LINK) $(ICULINK) $(OLD_EXTRA_LIBS)
+EXTRA_LIBS = $(DYNAMIC_DEPLINK) $(LDAP_NOSSL_LINK)
+ifeq ($(USE_ADMINSERVER), 1)
+  EXTRA_LIBS += $(ADMINUTIL_LINK)
+endif
+EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK)
+ifeq ($(USE_SETUPSDK), 1)
+  EXTRA_LIBS += $(SETUPSDK_S_LINK)
+endif
+EXTRA_LIBS += $(ICULINK) $(OLD_EXTRA_LIBS)
 
 # these are the libraries to use when building the installer for the open source version
 OPENSOURCE_LIBS = $(LDAP_ADMLIB) $(LDAP_NOSSL_LINK) $(SECURITYLINK) $(NSPRLINK)
@@ -146,7 +158,9 @@ SECURE_BINS=
 SECLIB=$(LIBSECURITY)
 endif
 
-ADMIN_DLLGLUEOBJ=$(BUILD_ROOT)/built/$(ARCH)-$(SECURITY)-$(DEBUG)-admin/admin-lib/dllglue.o
+ifeq ($(USE_ADMINSERVER), 1)
+  ADMIN_DLLGLUEOBJ=$(BUILD_ROOT)/built/$(ARCH)-$(SECURITY)-$(DEBUG)-admin/admin-lib/dllglue.o
+endif
 
 ifeq ($(ARCH),AIX)
 DLLGLUEOBJ=
@@ -156,29 +170,27 @@ endif
 $(OBJDEST)/key.res: key.rc
 	$(RC) $(OFFLAG)$(OBJDEST)/key.res ey.rc
 
-OLD_PROGS	= ds_pcontrol   ds_impldif    \
-	ds_backldif      ds_backdb      ds_restdb \
-	 ds_monitor ds_conf ds_rmldif  \
-	commit index   ds_acccon ds_perf ds_dbconf ds_conf_check \
-	ds_net ds_ldap ds_pwconf ds_inconf ds_grplst ds_grpcrt \
-	ds_version ds_client ds_secpref ds_secact instindex \
-	ds_reploc ds_repinit ldif2replica ds_addldif ds_ldif2ldap clpstat \
-	ds_sscfg ds_attr_manage ds_oc_view ds_oc_create ds_schema_update \
-	ds_replov ds_pw ds_snmpconf  
-
-PROGS	= start   restart  shutdown   ds_ldif2db \
+PROGS = ds_newinst
+ifeq ($(USE_ADMINSERVER), 1)
+PROGS += start   restart  shutdown   ds_ldif2db \
 	ds_db2ldif   ds_db2bak   ds_listdb  \
-	ds_bak2db ds_rmdb ds_create ds_newinst \
+	ds_bak2db ds_rmdb ds_create \
 	ds_remove ds_snmpctrl vlvindex addindex
+endif
 
 ifeq ($(ARCH), WINNT)
 SERVER_PROGS = namegen latest_file
 endif
 
+ifeq ($(USE_ADMINSERVER), 1)
 OBJECTS= init_ds_env.o
+endif
 
 ifeq ($(ARCH), WINNT)
-OBJECTS += namegen.o latest_file.o ds_remove_uninst.o
+OBJECTS += namegen.o latest_file.o
+ifeq ($(USE_SETUPSDK), 1)
+  OBJECTS += ds_remove_uninst.o
+endif
 endif
 
 ifeq ($(ARCH), WINNT)
@@ -212,9 +224,6 @@ $(SCRIPTSDIR):
 
 .PHONY: installPerlFiles
 
-#NSSetupSDK:
-#	$(MAKE) -f NSSetupSDK_Base.mk $(MFLAGS) all
-
 clean:
 	-@echo $(BINS)
 	-$(RM) $(BINS)
@@ -236,13 +245,13 @@ $(BINDIR)/ds_newinst:	$(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
     $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o
 	$(LINK_EXE_NOLIBSOBJS) $(SHARED) $(EXTRALDFLAGS) \
 	$(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
-    $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o $(OPENSOURCE_LIBS)
+    $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o $(EXTRA_LIBS)
 
 $(BINDIR)/ds_newinst.exe:	$(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
     $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o
 	$(LINK_EXE) $(NT_NOLIBS) $(OBJDEST)/ds_newinst.o $(OBJDEST)/cfg_sspt.o \
     $(OBJDEST)/create_instance.o $(OBJDEST)/script-gen.o \
-		$(LIBNT) $(OPENSOURCE_LIBS)
+		$(LIBNT) $(NSPRLINK) $(EXTRA_LIBS) $(DB_LIB)
 # linking this file causes a .exp and a .lib file to be generated which don't seem
 # to be required while running, so I get rid of them
 	$(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@)
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 9c4fdc7f..288e7cf3 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -27,7 +27,6 @@ ADMSERV_DEPS = 1
 include $(BUILD_ROOT)/nsconfig.mk
 include $(BUILD_ROOT)/ldap/nsldap.mk
 include $(BUILD_ROOT)/ldap/javarules.mk
-include $(BUILD_ROOT)/ns_usedb.mk
 include $(BUILD_ROOT)/ns_usesh.mk
 
 NSDISTMODE = copy
@@ -279,6 +278,7 @@ endif
 	done
 
 # install the DSMLGW into the client directory
+ifeq ($(USE_DSMLGW), 1)
 	$(MKDIR) $(RELDIR)/clients/dsmlgw
 	$(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/*  $(RELDIR)/clients/dsmlgw/
 
@@ -295,7 +295,7 @@ endif
 	$(INSTALL) -m 644 $(NSDIST)/classes/saaj.jar  $(RELDIR)/clients/dsmlgw/WEB-INF/lib
 	$(INSTALL) -m 644 $(NSDIST)/classes/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
 	$(INSTALL) -m 644 $(NSDIST)/classes/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
-
+endif # USE_DSMLGW
 
 # PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install
 # with the other component files that we don't necessarily pick up from the admin server build
@@ -320,6 +320,7 @@ endif
 #	fi
 
 ### Package up the orgchart ###
+ifeq ($(USE_ORGCHART), 1)
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.gif $(RELDIR)/clients/orgchart/html
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.html $(RELDIR)/clients/orgchart/html
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/orgchart/*.css $(RELDIR)/clients/orgchart/html
@@ -335,6 +336,7 @@ else
 	chmod 755 $(RELDIR)/clients/orgchart/bin/org
 	chmod 755 $(RELDIR)/clients/orgchart/bin/myorg
 endif
+endif # USE_ORGCHART
 ### end orgchart package ###
 
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/schema/*.ldif $(RELDIR)/bin/slapd/install/schema
@@ -366,8 +368,8 @@ endif
 
 # the plugin API
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin.h $(RELDIR)/plugins/slapd/slapi/include
-	$(INSTALL) -m 644 $(NSPR_BUILD_DIR)/include/*.h $(RELDIR)/plugins/slapd/slapi/include
-	$(INSTALL) -m 644 $(NSPR_BUILD_DIR)/include/obsolete/*.h $(RELDIR)/plugins/slapd/slapi/include/obsolete
+	$(INSTALL) -m 644 $(NSPR_INCDIR)/*.h $(RELDIR)/plugins/slapd/slapi/include
+	$(INSTALL) -m 644 $(NSPR_INCDIR)/obsolete/*.h $(RELDIR)/plugins/slapd/slapi/include/obsolete
 	$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/servers/slapd/slapi-plugin-compat4.h $(RELDIR)/plugins/slapd/slapi/include
 #	if [ -f $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/docs/plugin/README ] ; \
 #	then $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/docs/plugin/README $(RELDIR)/plugins/slapd ; \
@@ -406,11 +408,15 @@ endif
 
 # install the ds jar file in the <server root>/$(DS_JAR_DEST_PATH) directory
 # also install the other jar files we use
+ifeq ($(USE_CONSOLE), 1)
 	$(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
 	$(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
+endif
+ifeq ($(USE_JAVATOOLS), 1)
 	$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
 	$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
 	$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+endif
 
 # Images for IM Presence plugin
 ifdef BUILD_PRESENCE
diff --git a/ldap/servers/Makefile b/ldap/servers/Makefile
index 01b2797c..a0666859 100644
--- a/ldap/servers/Makefile
+++ b/ldap/servers/Makefile
@@ -48,7 +48,9 @@ _plugins:
 	cd plugins; $(MAKE) $(MFLAGS) all
 
 _snmp:
+ifdef still_waiting_for_net_snmp
 	cd snmp; $(MAKE) $(MFLAGS) all
+endif
 
 _slapdtools:
 	cd slapd/tools; $(MAKE) $(MFLAGS) all