[Fedora-directory-commits] setuputil buildpaths.mk, 1.3, 1.4 component_versions.mk, 1.5, 1.6 components.mk, 1.4, 1.5 internal_buildpaths.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.2, 1.3

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Fri Oct 13 22:59:05 UTC 2006


Author: rmeggins

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

Modified Files:
	buildpaths.mk component_versions.mk components.mk 
	internal_buildpaths.mk internal_comp_deps.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/setuputil/buildpaths.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildpaths.mk	17 Feb 2006 15:03:36 -0000	1.3
+++ buildpaths.mk	13 Oct 2006 22:59:02 -0000	1.4
@@ -90,6 +90,8 @@
 LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
 #LDAP_ROOT = $(BUILD_ROOT)/../ldapsdk-5.15
 
+SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20/built
+#SASL_BUILD_DIR = $(BUILD_ROOT)/../sasl
 
 ifeq ($(ARCH), WINNT)
 MSVCRT_ROOT = $(ABS_ROOT_PARENT)/dll-files


Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/component_versions.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- component_versions.mk	9 Oct 2006 15:06:17 -0000	1.5
+++ component_versions.mk	13 Oct 2006 22:59:02 -0000	1.6
@@ -67,3 +67,11 @@
 ifndef SVRCORE_RELDATE
   SVRCORE_RELDATE = SVRCORE_4_0_1_RTM
 endif
+
+ifndef SASL_VERSDIR
+  SASL_VERSDIR=cyrus
+endif
+ifndef SASL_RELDATE
+  SASL_RELDATE=v2.1.20.2
+endif
+


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/components.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- components.mk	21 Jun 2006 18:44:26 -0000	1.4
+++ components.mk	13 Oct 2006 22:59:02 -0000	1.5
@@ -280,6 +280,58 @@
   endif
 endif
 
+### SASL package ##########################################
+### 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
+
 #################################################################
 # Infozip (for Windows Packaging)
 #################################################################


Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/internal_buildpaths.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- internal_buildpaths.mk	29 Jul 2005 22:16:18 -0000	1.1.1.1
+++ internal_buildpaths.mk	13 Oct 2006 22:59:02 -0000	1.2
@@ -78,5 +78,10 @@
 LDAP_ROOT = $(NSCP_DISTDIR_FULL_RTL)/ldapsdk
 endif # LDAPSDK_SOURCE_ROOT
 
+#SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20
+ifndef SASL_SOURCE_ROOT
+SASL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/sasl
+endif # SASL_SOURCE_ROOT
+
 # Infozip (for Windows Packaging)
 BASE_INFOZIP = $(COMPONENTS_DIR)/infozip/i386


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/internal_comp_deps.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- internal_comp_deps.mk	23 Feb 2006 22:50:21 -0000	1.2
+++ internal_comp_deps.mk	13 Oct 2006 22:59:02 -0000	1.3
@@ -64,6 +64,26 @@
 	fi
 endif # LDAPSDK_SOURCE_ROOT
 
+ifndef SASL_SOURCE_ROOT
+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
+	- at if [ ! -f $@ ] ; \
+	then echo "Error: could not get component SASL file $@" ; \
+	fi
+endif # not Linux
+endif # SASL_SOURCE_ROOT
+
 #################################################################
 # Infozip (for Windows Packaging)
 #################################################################




More information about the Fedora-directory-commits mailing list