[Fedora-directory-commits] dsbuild ds.conf.mk,1.2,1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	ds.conf.mk 
Log Message:
updated for Fedora DS 1.1


Index: ds.conf.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds.conf.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ds.conf.mk	8 Apr 2006 19:26:49 -0000	1.2
+++ ds.conf.mk	8 Feb 2008 21:51:51 -0000	1.3
@@ -1,15 +1,15 @@
-MASTER_SITES += http://directory.fedora.redhat.com/sources/
-MASTER_SITES += http://directory.fedora.redhat.com/download/
+MASTER_SITES += http://directory.fedoraproject.org/sources/
+MASTER_SITES += http://directory.fedoraproject.org/download/
 # DSMLGWJAR_VERSION is defined in ds/dsmlgwjars/Makefile
 ifdef DSMLGWJAR_VERSION
-MASTER_SITES += http://directory.fedora.redhat.com/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/
+MASTER_SITES += http://directory.fedoraproject.org/download/dsmlgwjars-$(DSMLGWJAR_VERSION)/
 endif
 
 # cvs information
 # use USE_CVS=1 on the make command line to grab the sources from CVS
 # instead of from the checksummed source tarballs
 # fedora anon cvs
-FEDCVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
+FEDCVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 # mozilla anon cvs
 MOZCVSROOT=:pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot
 # default to fedora for now since the mozilla sources are more static
@@ -18,3 +18,71 @@
 CVSTAG=HEAD
 # each ds/*/Makefile must define the CVS modules e.g.
 #CVSMODULES=ldapserver
+
+# override this if you do not have GNU install
+INSTALL=install
+
+# common args to be passed to configure
+DS_CONFIGURE_ARGS = 
+
+ifdef PREFIX
+CONFIGURE_ARGS += --prefix=$(PREFIX)
+DS_CONFIGURE_ARGS += --prefix=$(PREFIX)
+endif
+
+ifeq ($(USE_64), 1)
+CONFIGURE_OPTS += --enable-64bit
+endif
+
+ifndef CFLAGS
+ifdef DEBUG
+CFLAGS=-g
+else
+CFLAGS=-O2
+endif
+endif
+
+CONFIGURE_ENV += CFLAGS=$(CFLAGS)
+
+# component information
+ifdef NSPR_SOURCE
+export NSPR_INCLUDE_DIR=$(DESTDIR)$(PREFIX)/include/nspr4
+export NSPR_LIB_DIR=$(DESTDIR)$(PREFIX)/lib
+DS_CONFIGURE_ARGS += --with-nspr-inc=$(NSPR_INCLUDE_DIR) --with-nspr-lib=$(NSPR_LIB_DIR)
+endif
+
+ifdef NSS_SOURCE
+export NSS_INCLUDE_DIR=$(DESTDIR)$(PREFIX)/include/nss3
+export NSS_LIB_DIR=$(DESTDIR)$(PREFIX)/lib
+DS_CONFIGURE_ARGS += --with-nss-inc=$(NSS_INCLUDE_DIR) --with-nss-lib=$(NSS_LIB_DIR)
+endif
+
+ifdef SVRCORE_SOURCE
+DS_CONFIGURE_ARGS += --with-svrcore-inc=$(DESTDIR)$(PREFIX)/include --with-svrcore-lib=$(DESTDIR)$(PREFIX)/lib
+endif
+
+ifdef SASL_SOURCE
+DS_CONFIGURE_ARGS += --with-sasl=$(DESTDIR)$(PREFIX)
+else
+DS_CONFIGURE_ARGS += --with-sasl
+endif
+
+ifdef MOZLDAP_SOURCE
+DS_CONFIGURE_ARGS += --with-ldapsdk=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef ICU_SOURCE
+DS_CONFIGURE_ARGS += --with-icu=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef DB_SOURCE
+DS_CONFIGURE_ARGS += --with-db=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef SNMP_SOURCE
+DS_CONFIGURE_ARGS += --with-netsnmp=$(DESTDIR)$(PREFIX)
+endif
+
+ifdef ADMINUTIL_SOURCE
+DS_CONFIGURE_ARGS += --with-adminutil=$(DESTDIR)$(PREFIX)
+endif