[Fedora-directory-commits] ldapserver nsconfig.mk,1.25,1.26
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Fri Nov 10 01:03:57 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359
Modified Files:
nsconfig.mk
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #3, #5, #9, #13, #15, #17)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nsconfig.mk 15 Sep 2006 14:59:47 -0000 1.25
+++ nsconfig.mk 10 Nov 2006 01:03:54 -0000 1.26
@@ -382,8 +382,6 @@
MAKE=gmake $(BUILDOPT) NO_JAVA=1
-export NSPR20=1
-
LWDEFS = LIVEWIRE=1
JSDEFS = JSFILE=1 JS_THREADSAFE=1
@@ -425,15 +423,15 @@
ifdef PRODUCT_IS_DIRECTORY_SERVER
ifeq ($(SECURITY), export)
- MCC_SERVER=-DMCC_HTTPD -DNS_EXPORT -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES)
+ MCC_SERVER=-DNS_EXPORT $(NSPR_DEFINES)
endif
ifeq ($(SECURITY), domestic)
- MCC_SERVER=-DMCC_HTTPD -DNS_DOMESTIC -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES)
+ MCC_SERVER=$(NSPR_DEFINES)
endif
ifeq ($(SECURITY), none)
- MCC_SERVER=-DMCC_HTTPD -DNS_UNSECURE $(NSPR_DEFINES)
+ MCC_SERVER=-DNS_UNSECURE $(NSPR_DEFINES)
endif
- DS_SERVER_DEFS = -DNS_DS
+ DS_SERVER_DEFS =
ifeq ($(BUILD_DEBUG),full)
MODULE_CFLAGS += -DDEBUG
endif
@@ -444,7 +442,7 @@
endif
endif
-MCC_SERVER += -DSPAPI20 -DBUILD_NUM=$(GET_BUILD_NUM)
+MCC_SERVER += -DBUILD_NUM=$(GET_BUILD_NUM)
# ----------- Default Flags, may be overridden below ------------
@@ -534,7 +532,6 @@
else
DL_LIB =-ldl
endif
-NSPR_DEFINES += -DNSPR20
RWTOOLS_VERSION = latest
#HTTPDSO_NAME=libdsnshttpd
PEER_ARCH=aix
@@ -650,7 +647,7 @@
NSAPI_CAPABLE=true
VERITY_ARCH=_hp800
USE_PTHREADS=1
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
LINK_DLL=$(CCC) $(DLL_LDFLAGS) $(ARCH_CFLAGS) -o $@
PEER_ARCH=hp
RWTOOLS_VERSION = latest
@@ -688,7 +685,7 @@
ifeq (6.5,$(OSVERSION))
ARCH_CFLAGS+=-DIRIX6_5 -mips3
endif
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_SGI_MP_SOURCE
+NSPR_DEFINES += -D_PR_NTHREAD -D_SGI_MP_SOURCE
LINK_DLL=$(CCC) $(DLL_LDFLAGS) -o $@
PEER_ARCH=irix
@@ -708,7 +705,6 @@
RANLIB=ranlib
DLL_LDFLAGS=-shared
LINK_DLL=$(CC) $(DLL_LDFLAGS) -o $@
-NSPR_DEFINES += -DNSPR20
NLIST=-lelf
NSAPI_CAPABLE=true
EXTRA_LIBS=-ldl -lcrypt -lpthread
@@ -759,7 +755,6 @@
NO_MSOFT_OBJ=1
BUILD_WEBPUB=no
BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=unixware
export NO_INFORMIX=1
@@ -821,7 +816,6 @@
NO_MSOFT_OBJ=1
BUILD_WEBPUB=no
BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=unixware5
DB_VERSION=oem
@@ -857,7 +851,6 @@
AUTOCATALOG_VERSION = oem
BUILD_WEBPUB = no
NO_MSOFT_OBJ = 1
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=sco
else
@@ -916,7 +909,6 @@
BUILD_WEBPUB = no
BUILD_IIOPLIB = no
DL_LIB =-ldl
-NSPR_DEFINES += -DNSPR20
# svr4-x86 compatible
PEER_ARCH=unixware
@@ -1037,7 +1029,6 @@
#this is no longer needed
#NEED_NSPR_MALLOC=yes
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=reliantunix
RWTOOLS_VERSION = latest
@@ -1073,7 +1064,6 @@
#EXTRA_LIBS=-lcxxstd -lcxx
endif
USE_PTHREADS=1
-NSPR_DEFINES += -DNSPR20
RWTOOLS_VERSION = latest
PEER_ARCH=osf
PEERDIR=$(DEVROOT)/osf/dev
@@ -1156,7 +1146,7 @@
NSAPI_CAPABLE=true
NLIST=-lelf
VERITY_ARCH=_solaris
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
PEER_ARCH=solaris
ifndef NS_USE_NATIVE
NSPR_DEFINES += -DSOLARIS_GCC
@@ -1200,7 +1190,7 @@
NO_MSOFT_OBJ=1
BUILD_WEBPUB=no
BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
export NO_INFORMIX=1
export NO_ORACLE=1
export NO_SYBASE=1
@@ -1269,7 +1259,7 @@
NONSHARED_FLAG=
NSAPI_CAPABLE=true
NO_MSOFT_OBJ=1
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU
+NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU
else
More information about the Fedora-directory-commits
mailing list