[186642] Directory Server Makefile updates for Internal build (Comment #6)

1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file

1 files changed, 8 insertions, 8 deletions

diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
index ceb4ac29..71e1788a 100644
--- a/ldap/servers/slapd/Makefile
+++ b/ldap/servers/slapd/Makefile
@@ -91,12 +91,12 @@ endif
 endif
 
 ifeq ($(ARCH), HPUX)
-ifeq ($(OS_TEST),ia64)
-LDAP_DONT_USE_SMARTHEAP=1
-ifeq ($(DEBUG), optimize)
-CFLAGS+=+O3
-endif
-endif
+  ifeq ($(NSOS_TEST1),ia64)
+    LDAP_DONT_USE_SMARTHEAP=1
+    ifeq ($(DEBUG), optimize)
+      CFLAGS+=+O3
+    endif
+  endif
 endif
 
 # Don't use smartheap for debug builds
@@ -200,12 +200,12 @@ ifeq ($(ARCH), HPUX)
   ifeq ($(DEBUG), full)
     ifeq ($(USE_64), 1)
       EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-      ifneq ($(OS_TEST), ia64)
+      ifneq ($(NSOS_TEST1), ia64)
         EXTRA_LIBS += /opt/langtools/lib/pa20_64/end.o
       endif
     else
       EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-      ifneq ($(OS_TEST), ia64)
+      ifneq ($(NSOS_TEST1), ia64)
         EXTRA_LIBS += /opt/langtools/lib/end.o
       endif
     endif #USE_64