[Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.6, 1.7 ux-config.cc, 1.8, 1.9

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/cm/newinst

Modified Files:
	Makefile ux-config.cc 
Log Message:
Bug(s) fixed: 167453
Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin 
Server open source candidate (using Apache, modules, etc), and the new 
adminutil and setuputil components.  The code has been changed to 
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) 
and new versions of these components (7.1) and new /s/b/c disk layout 
where applicable.  We don't really get very much from the admin server 
anymore, just the admin and base packages.  All of the other setup stuff 
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	19 Apr 2005 22:07:20 -0000	1.6
+++ Makefile	2 Sep 2005 20:40:54 -0000	1.7
@@ -57,8 +57,8 @@
 include $(LDAP_SRC)/nsldap.mk
 
 test:
-	echo $(SETUPSDK_VERSION)
-	echo $(SETUPSDK_RELEASE)
+	echo $(SETUPUTIL_VERSION)
+	echo $(SETUPUTIL_RELEASE)
 
 # MODULE_CFLAGS = -DUSE_ADMSERV
 
@@ -98,12 +98,12 @@
 INFO= $(OBJDIR)/$(DIR)
 
 # Source for staged installation utilities
-INCDIR=$(SETUPSDK_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
+INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
 
 # ADM_VERSDIR = admserv40
 # ADM_RELDATE = 19980112
 
-all: $(OBJDEST) $(BINDEST) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP)  $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall
+all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP)  $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall
 # removed ns-keygen from build - it was only used for Dir Lite
 # $(BINDEST)/ns-keygen 
 ifeq ($(ARCH), BSDI)
@@ -172,7 +172,7 @@
 
 $(BINDEST)/ns-config: $(OBJS1) $(OBJS2)
 	$(PURIFY) $(CXX) $(SHARED_FLAG) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
-		-o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPSDKLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
+		-o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
 	       $(EXTRA_LIBS) $(CURSES)
 
 ifeq ($(ARCH), WINNT)
@@ -191,5 +191,5 @@
 
 ns-config-gt: $(OBJS1GT)
 	$(PURIFY) $(CXX) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
-		-o ns-config-gt $(OBJS1GT) $(SETUPSDKLINK) $(LIBLDAP) \
+		-o ns-config-gt $(OBJS1GT) $(SETUPUTILLINK) $(LIBLDAP) \
 		$(EXTRA_LIBS) $(CURSES)


Index: ux-config.cc
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-config.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ux-config.cc	19 Apr 2005 22:07:21 -0000	1.8
+++ ux-config.cc	2 Sep 2005 20:40:54 -0000	1.9
@@ -206,11 +206,6 @@
 
    if (installMode() != Silent)
    {
-/* richm 20011005 - we can't do this until we get setupsdk46 - if ever
-      if (iDSISolaris)
-         Dialog::initDisplay("Directory", (const char *) NULL, "Configuration");
-      else
-*/
 	 Dialog::initDisplay("Directory");
    }