[Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.5,1.6

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Fri Oct 13 20:16:30 UTC 2006


Author: rmeggins

Update of /cvs/dirsec/dsbuild/ds/mozilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27495

Modified Files:
	Makefile 
Log Message:
mozldap now finds the correct sasl when using --with-sasl; add --with-rpath


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	11 Oct 2006 14:36:25 -0000	1.5
+++ Makefile	13 Oct 2006 20:16:28 -0000	1.6
@@ -27,18 +27,6 @@
 ifeq ($(USE_64), 1)
 CONFIGURE_OPTS += --enable-64bit
 endif
-# use /usr/include/sasl on RHEL3 and RHEL4
-ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
-CONFIGURE_OPTS += --with-sasl-inc=/usr/include/sasl --with-sasl-lib=/usr/lib
-endif
-ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
-CONFIGURE_OPTS += --with-sasl-inc=/usr/include/sasl
-ifeq ($(USE_64), 1)
-CONFIGURE_OPTS += --with-sasl-lib=/usr/lib64
-else
-CONFIGURE_OPTS += --with-sasl-lib=/usr/lib
-endif
-endif
 
 NSPR_PREFIX=$(ABS_GARDIR)/$(CATEGORIES)/$(GARNAME)/work/mozilla/dist/$(OBJDIR)
 
@@ -79,7 +67,7 @@
 	cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) OBJDIR_NAME=$(OBJDIR)
 
 # next, configure and make the ldap c sdk
-	cd work/mozilla/directory/c-sdk && ./configure --enable-clu --with-svrcore $(CONFIGURE_OPTS)
+	cd work/mozilla/directory/c-sdk && ./configure --enable-clu --with-svrcore --with-sasl --with-rpath $(CONFIGURE_OPTS)
 	cd work/mozilla/directory/c-sdk && $(MAKE) $(OPTFLAG)
 
 # perldap uses MakeMaker, so lots of env. vars.




More information about the Fedora-directory-commits mailing list