pegasus/mak/config.mak - diff

Return to config.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config.mak between version 1.195.2.2 and 1.195.2.3

version 1.195.2.2, 2012/02/15 17:47:01

version 1.195.2.3, 2013/06/03 22:34:47

Line 239

## NOTE: If the default below is changed, please update the definition

## of default for this variable in pegasus/doc/BuildAndReleaseOptions.html

ifndef PEGASUS_CIM_SCHEMA

PEGASUS_CIM_SCHEMA=CIM231

PEGASUS_CIM_SCHEMA=CIM236

endif

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)

Line 385

ifeq ($(PEGASUS_HAS_ICU),true)

DEFINES += -DPEGASUS_HAS_ICU

##################################

## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root

## resource bundle, default is to uppercase the root resource bundle

##################################

ifdef ICU_NO_UPPERCASE_ROOT

CNV_ROOT_FLAGS =

else

CNV_ROOT_FLAGS = -u

endif

####################################

## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root

Line 493

Line 480

DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)

endif

##############################################################################

## PEGASUS_INDICATIONS_Q_THRESHOLD

## Controls if indications providers are stalled if the indications

## service queue is too large.

## defaults to not set.

## It can be set to any positive value.

## If not set providers are never stalled. This implies that the

## indications service queue may become as large as neccesary to hold all

## the indicaitons generated.

## If set to any value then providers are stalled by forcing them to sleep

## when they try to deliver an indication and the indications service queue

## exceeds this value. They are resumed when the queue count falls 10 percent

## below this value.

## Stall and resume log entries are made to inform the administrator

## the condition has occured.

## WARNING: This also affects the Out of Process Providers (OOP Providers)

## The OOP Providers use two one way pipes for communication.

## By stalling the Provider this prevents the pipe from being read

## which will cause the pipe to fill up and the remote side will block.

## OOP Prividers mix indications and operations on these two pipes.

## This means the operations will also be blocked as a side effect of

## the indications being stalled.

ifdef PEGASUS_INDICATIONS_Q_THRESHOLD

DEFINES += -DPEGASUS_INDICATIONS_Q_THRESHOLD=$(PEGASUS_INDICATIONS_Q_THRESHOLD)

endif

# Allow PEGASUS_ASSERT statements to be disabled.

ifdef PEGASUS_NOASSERTS

DEFINES += -DNDEBUG

DEFINES += -DNDEBUG -DPEGASUS_NOASSERTS

endif

# do not compile trace code. sometimes it causes problems debugging

Line 1192

Line 1141

DEFINES += -DPEGASUS_INDICATION_HASHTRACE

endif

# Setup the conditional compile for client displays.

ifdef PEGASUS_CLIENT_TRACE_ENABLE

DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE

endif

# compile in the experimental APIs

Line 1264

Line 1209

DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI

endif

############################################################

# Set any vendor-specific compile flags

############################################################

ifdef PEGASUS_VENDOR_HP

DEFINES+= -DPEGASUS_VENDOR_HP

endif

############################################################

Line 1422

Line 1357

##==============================================================================

## PEGASUS_PAM_SESSION_SECURITY

## This is a new method to handle authentication with PAM in case it is required

## to keep the PAM session established by pam_start() open across an

## entire CIM request.

## This feature contradicts PEGASUS_PAM_AUTHENTICATION and

## PEGASUS_USE_PAM_STANDALONE_PROC

## Because of the additional process this feature is not compatible with

## Privilege Separation.

##==============================================================================

ifeq ($(PEGASUS_PAM_SESSION_SECURITY),true)

ifdef PEGASUS_PAM_AUTHENTICATION

$(error "PEGASUS_PAM_AUTHENTICATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")

endif

ifdef PEGASUS_USE_PAM_STANDALONE_PROC

$(error "PEGASUS_USE_PAM_STANDALONE_PROC must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")

endif

ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION

$(error "PEGASUS_ENABLE_PRIVILEGE_SEPARATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")

endif

# Compile in the code required for PAM

# and compile out the code that uses the password file.

DEFINES += -DPEGASUS_PAM_SESSION_SECURITY -DPEGASUS_NO_PASSWORDFILE

# Link with libpam only where it is needed.

ifeq ($(HAS_PAM_DEPENDENCY),true)

SYS_LIBS += -lpam

endif

##==============================================================================

## PEGASUS_PAM_AUTHENTICATION

##==============================================================================

Line 1555

Line 1525

DEFINES += -DPEGASUS_INITIAL_THREADSTACK_SIZE=$(PEGASUS_INITIAL_THREADSTACK_SIZE)

endif

ifndef PEGASUS_INTEROP_NAMESPACE

PEGASUS_INTEROP_NAMESPACE=root/PG_InterOp

else

ifeq ($(PEGASUS_INTEROP_NAMESPACE),root/interop)

DEFINES += -DNS_ROOT_INTEROP

endif

ifeq ($(PEGASUS_INTEROP_NAMESPACE),interop)

DEFINES += -DNS_INTEROP

endif

##These namespaces will be used in Makefiles.

NAMESPACE_INTEROP = interop

NAMESPACE_ROOT_INTEROP = root/interop

Legend:

Removed from v.1.195.2.2
changed lines
	Added in v.1.195.2.3

No CVS admin address has been configured