[Fedora-directory-commits] adminserver buildpaths.mk, 1.10, 1.11 components.mk, 1.54, 1.55 internal_buildpaths.mk, 1.5, 1.6 nsconfig.mk, 1.32, 1.33

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544/adminserver

Modified Files:
	buildpaths.mk components.mk internal_buildpaths.mk nsconfig.mk 
Log Message:
Now that the LDAP C SDK is linked with SASL by default, other executables
that link with the LDAP C SDK also require linking with SASL.  The ones
in the directory server were already done, but we were missing the
setuputil executables setup and uninstall, and the setup and CGI executables
in the adminserver.
These changes add SASL_LINK to the link line for those executables.



Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildpaths.mk	23 May 2006 22:13:36 -0000	1.10
+++ buildpaths.mk	13 Oct 2006 22:59:03 -0000	1.11
@@ -98,3 +98,6 @@
 JSS_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/jss
 
 ONLINEHELP_SOURCE_DIR = $(BUILD_ROOT)/../onlinehelp
+
+SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20/built
+#SASL_BUILD_DIR = $(BUILD_ROOT)/../sasl


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- components.mk	9 Oct 2006 15:21:09 -0000	1.54
+++ components.mk	13 Oct 2006 22:59:03 -0000	1.55
@@ -331,6 +331,33 @@
 	@if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ;
fi
 endif
 
+ifndef SASL_SOURCE_ROOT
+ifndef SASL_VERSDIR
+  SASL_VERSDIR=cyrus
+endif
+ifndef SASL_RELDATE
+  SASL_RELDATE=v2.1.20.2
+endif
+
+ifneq ($(ARCH), Linux)
+SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
+SASL_DEP = $(SASL_INCLUDE)/sasl.h
+ifndef SASL_PULL_METHOD
+SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
+endif
+
+$(SASL_DEP): $(NSCP_DISTDIR_FULL_RTL)
+ifdef COMPONENT_DEPS
+	$(FTP_PULL) -method $(SASL_PULL_METHOD) \
+		-objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \
+		-files include,lib
+endif
+	-@if [ ! -f $@ ] ; \
+	then echo "Error: could not get component SASL file $@" ; \
+	fi
+endif # not Linux
+endif # SASL_SOURCE_ROOT
+
 ###############################################################
 # LDAP java classes 
 ##############################################################


Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/internal_buildpaths.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- internal_buildpaths.mk	21 Mar 2006 19:48:49 -0000	1.5
+++ internal_buildpaths.mk	13 Oct 2006 22:59:03 -0000	1.6
@@ -101,6 +101,11 @@
 SETUPUTIL_BUILD_DIR = $(NSCP_COMPDIR)/setuputil/$(NSOBJDIR_NAME)
 endif # SETUPUTIL_SOURCE_ROOT
 
+#SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20
+ifndef SASL_SOURCE_ROOT
+SASL_BUILD_DIR = $(NSCP_COMPDIR)/sasl
+endif # SASL_SOURCE_ROOT
+
 ifndef JSS_SOURCE_DIR
 JSS_BUILD_DIR = $(NSCP_COMPDIR)/jss/$(NSOBJDIR_NAME)
 endif


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nsconfig.mk	9 Oct 2006 15:21:09 -0000	1.32
+++ nsconfig.mk	13 Oct 2006 22:59:03 -0000	1.33
@@ -894,6 +894,57 @@
 MOD_RESTARTD = $(addprefix $(MOD_RESTARTD_LIBPATH)/, $(MOD_REATARTD_LIBNAME))
 MOD_NSS = $(addprefix $(MOD_NSS_LIBPATH)/, $(MOD_NSS_LIBNAME))
 
+### The LDAP C SDK is now compiled with SASL support - this means
+### that we will get undefined symbols when we link against the
+### static LDAP libraries - we have to link with SASL to 
+### resolve those symbols
+ifeq ($(ARCH), Linux)
+  ifeq ($(BUILD_ARCH), RHEL3)
+    SASL_LIBPATH = /usr/kerberos/lib
+    SASL_LINK = -L$(SASL_LIBPATH)
+  else
+# use default linker path
+    SASL_LINK = 
+  endif
+  SASL_INCDIR = /usr/include/sasl
+else
+  ifdef SASL_SOURCE_ROOT
+    SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
+    SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl
+  else
+    SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
+    SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl
+  endif
+  SASL_LINK = -L$(SASL_LIBPATH)
+endif
+SASL_INCLUDE = $(SASL_INCDIR)
+
+ifeq ($(ARCH), WINNT)
+  SASL_LIB_ROOT_NAME = sasl
+  SASL_LINK = /LIBPATH:$(SASL_LIBPATH) lib$(SASL_LIB_ROOT_NAME).lib
+  SASL_LIBS =
lib$(SASL_LIB_ROOT_NAME).lib,lib$(SASL_LIB_ROOT_NAME).dll,saslDIGESTMD5.dll
+else
+  # for cyrus it's sasl2
+  SASL_LIB_ROOT_NAME = sasl2
+  SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).a
+  ifeq ($(ARCH), Linux)
+# I don't think we need this anymore
+    GSSAPI_LIBS=
+#    GSSAPI_LIBS=-lgssapi_krb5
+  endif
+  ifeq ($(ARCH), SOLARIS)
+    GSSAPI_LIBS=-lgss
+  endif
+  ifeq ($(ARCH), HPUX)
+      GSSAPI_LIBS=-lgss
+      ifeq ($(USE_64),1)
+        GSSAPI_LIBS=-lgss
+      endif
+  endif
+
+  SASL_LINK += -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS)
+endif
+
 #########################################
 # NMCSDK
 #########################################