Fix 142883 - need option to build with Forte/Workshop 6 compiler

on Solaris 5.6.
	Added support for SOLARIS_USE_FORTE6=1 gmake option.

directory/Makefile

@@ -51,6 +51,8 @@ all:	FORCE
 	@echo "   USE_64=1		for building 64 bit versions"
 	@echo "   BUILD_CLU=1		build command line utilities"
 	@echo "   COMPS_FROM_OBJDIR=1	use components from ../dist/$(OBJDIR_NAME)"
+	@echo "   SOLARIS_USE_FORTE6=1	use Sun Workshop 6/Forte compiler on SunOS 5.6"
+
 	@echo "   VENDOR_NAME=string	SDK vendor name (default $(DEFAULT_VENDOR_NAME))"
 	@echo "   VENDOR_VERSION=#	vendor specific version number * 100 (default $(DEFAULT_VENDOR_VERSION))"
 	@echo 

directory/c-sdk/build.mk

@@ -455,7 +455,10 @@ endif
 endif
 
 
-PERL ?= perl
+ifndef PERL
+PERL = perl
+endif
+
 #
 # shared library symbol export definitions
 #

directory/c-sdk/ldap/clients/tools/Makefile.client

@@ -211,18 +211,19 @@ EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) \
 		$(LIBNLS_LIBDIR)/$(NSSB_LIBNAME)
 else
 ifeq ($(OS_ARCH), SunOS)
-OS_VERS		:= $(shell uname -r)
-ifeq ($(OS_VERS),5.6)
-EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) -lC \
-		$(LIBNLS_LIBDIR)/$(NSJPN_LIBNAME) \
-	        $(LIBNLS_LIBDIR)/$(NSCCK_LIBNAME) \
-		$(LIBNLS_LIBDIR)/$(NSSB_LIBNAME)
+ifdef SOLARIS_USE_FORTE6
+SOLARIS_CXX_LIB=Crun
 else
-EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) -lCrun \
+ifeq ($(OS_RELEASE),5.6)
+SOLARIS_CXX_LIB=C
+else
+SOLARIS_CXX_LIB=Crun
+endif
+endif
+EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) -l$(SOLARIS_CXX_LIB) \
 		$(LIBNLS_LIBDIR)/$(NSJPN_LIBNAME) \
 	        $(LIBNLS_LIBDIR)/$(NSCCK_LIBNAME) \
 		$(LIBNLS_LIBDIR)/$(NSSB_LIBNAME)
-endif
 else
 endif
 EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) \

directory/c-sdk/ldap/clients/tools/Makefile.in

@@ -209,18 +209,19 @@ EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) \
 		$(LIBNLS_LIBDIR)/$(NSSB_LIBNAME)
 else
 ifeq ($(OS_ARCH), SunOS)
-OS_VERS		:= $(shell uname -r)
-ifeq ($(OS_VERS),5.6)
-EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) -lC \
-		$(LIBNLS_LIBDIR)/$(NSJPN_LIBNAME) \
-	        $(LIBNLS_LIBDIR)/$(NSCCK_LIBNAME) \
-		$(LIBNLS_LIBDIR)/$(NSSB_LIBNAME)
+ifdef SOLARIS_USE_FORTE6
+SOLARIS_CXX_LIB=Crun
 else
-EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) -lCrun \
+ifeq ($(OS_RELEASE),5.6)
+SOLARIS_CXX_LIB=C
+else
+SOLARIS_CXX_LIB=Crun
+endif
+endif
+EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) -l$(SOLARIS_CXX_LIB) \
 		$(LIBNLS_LIBDIR)/$(NSJPN_LIBNAME) \
 	        $(LIBNLS_LIBDIR)/$(NSCCK_LIBNAME) \
 		$(LIBNLS_LIBDIR)/$(NSSB_LIBNAME)
-endif
 else
 endif
 EXTRA_LIBS +=   $(LIBNLS_LIBDIR)/$(NSCNV_LIBNAME) \