[Fedora-directory-commits] dsbuild/ds/mozilla Makefile, 1.4, 1.5 checksums, 1.3, 1.4

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile checksums 
Log Message:
preliminary fds103 work


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	24 Feb 2006 17:37:53 -0000	1.4
+++ Makefile	11 Oct 2006 14:36:25 -0000	1.5
@@ -3,9 +3,8 @@
 CATEGORIES = ds
 # have the regular download rule download the patch rather than listing it in PATCHFILES
 # this is so we can override the default patch rule
-#MYPATCH = mozilla-gcc4.patch
-MYPATCH = sysfdtable.patch sysfdtable2.patch
-DISTFILES = mozilla-components-1.0.2.tar.gz $(MYPATCH)
+MYPATCH = ipv6.patch
+DISTFILES = mozilla-components-1.0.3.tar.gz $(MYPATCH)
 PATCHFILES =
 
 LIBDEPS = 
@@ -28,6 +27,18 @@
 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)
 
@@ -68,8 +79,8 @@
 	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 --with-svrcore $(CONFIGURE_OPTS)
-	cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG)
+	cd work/mozilla/directory/c-sdk && ./configure --enable-clu --with-svrcore $(CONFIGURE_OPTS)
+	cd work/mozilla/directory/c-sdk && $(MAKE) $(OPTFLAG)
 
 # perldap uses MakeMaker, so lots of env. vars.
 	cd work/mozilla/directory/perldap && \


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/checksums,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- checksums	24 Feb 2006 17:24:05 -0000	1.3
+++ checksums	11 Oct 2006 14:36:25 -0000	1.4
@@ -1,3 +1,2 @@
-6e46eafaca84bb8121c96071e1546d04  download/mozilla-components-1.0.2.tar.gz
-f0d13d53c37adfe5312cf44d5d992042  download/sysfdtable.patch
-251df4db04cced3c22713c865289d471  download/sysfdtable2.patch
+20eb11a21b578f11d3c73c5f9e32d890  download/mozilla-components-1.0.3.tar.gz
+aa900d568ac03359a30bc5d4e257e275  download/ipv6.patch