[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile, 1.6, 1.7 checksums, 1.7, 1.8

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Thu Oct 12 20:08:14 UTC 2006


Author: rmeggins

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

Modified Files:
	Makefile checksums 
Log Message:
more fixes to prepare for FDS 103


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	11 Oct 2006 14:36:18 -0000	1.6
+++ Makefile	12 Oct 2006 20:08:12 -0000	1.7
@@ -32,12 +32,22 @@
 	ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
 	ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.3 \
 	SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.3 \
-	SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20 \
 	DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \
-	NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1 \
 	ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.3 \
 	ONLINEHELP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/dsonlinehelp/work/fedora-dsonlinehelp-1.0
 
+ifdef SASL_SOURCE
+BUILD_ARGS += SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20
+else
+BUILD_ARGS += SASL_SOURCE_ROOT=
+endif
+
+ifdef SNMP_SOURCE
+BUILD_ARGS += NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1
+else
+BUILD_ARGS += NETSNMP_SOURCE_ROOT=
+endif
+
 ifndef NOJAVA
 BUILD_ARGS += BUILD_JAVA_CODE=1 GET_JAVA_FROM_PATH=1 GET_ANT_FROM_PATH=1 \
 	USE_DSMLGW=1 USE_CONSOLE=1 USE_JAVATOOLS=1 \


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- checksums	11 Oct 2006 14:36:18 -0000	1.7
+++ checksums	12 Oct 2006 20:08:12 -0000	1.8
@@ -1 +1 @@
-cb739889e28ab1328ab33b3403cd6792  download/fedora-ds-1.0.3.tar.gz
+d8d1363ed05d28629ba0146aa3bbd52e  download/fedora-ds-1.0.3.tar.gz




More information about the Fedora-directory-commits mailing list