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.183 and 1.211.10.3

version 1.183, 2008/12/16 18:55:36

version 1.211.10.3, 2013/08/15 08:32:04

Line 105

ifndef ALT_OBJ_DIR

ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)

OBJ_DIR = $(HOME_DIR)/obj32/$(DIR)

else

OBJ_DIR = $(HOME_DIR)/obj/$(DIR)

endif

else

ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)

OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)32

else

OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)

endif

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

Line 118

Line 126

else

BIN_DIR = $(HOME_DIR)/bin

endif

ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)

LIB_DIR = $(HOME_DIR)/lib32

else

LIB_DIR = $(HOME_DIR)/lib

endif

# l10n

# define the location for the compiled messages

Line 222

Line 235

# option of the mof compiler needs to be set.

# *****

## Sets default CIM Schema if PEGASUS_CIM_SCHEMA not defined.

## 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=CIM217

PEGASUS_CIM_SCHEMA=CIM236

endif

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

Line 365

Line 381

endif

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 476

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 524

Line 490

DEFINES += -DPEGASUS_REMOVE_TRACE

endif

ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT

PLATFORM_FILE_32 = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT).mak

ifeq ($(wildcard $(PLATFORM_FILE_32)), )

$(error PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT environment variable must be set to one of\

the following:$(VALID_PLATFORMS))

endif

DEFINES += -DPEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT

ifdef PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR

DEFINES += -DPEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR=\"$(PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR)\"

endif

# PEP 315

# Control whether compile with or without method entertexit trace code.

# A value other than 'true' or 'false' will cause a make error.

Line 704

Line 683

# Controls snmp indication handler to use NET-SNMP to deliver trap

ifdef PEGASUS_USE_NET_SNMP

ifeq ($(PEGASUS_USE_NET_SNMP),true)

DEFINES += -DPEGASUS_USE_NET_SNMP

else

ifneq ($(PEGASUS_USE_NET_SNMP),false)

$(error PEGASUS_USE_NET_SNMP ($(PEGASUS_USE_NET_SNMP)) invalid, must be true or false)

endif

# Controls snmp indication handler to use NET-SNMP V3 features.

ifndef PEGASUS_ENABLE_NET_SNMPV3

ifeq ($(PEGASUS_USE_NET_SNMP),true)

PEGASUS_ENABLE_NET_SNMPV3=true

else

PEGASUS_ENABLE_NET_SNMPV3=false

endif

ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true)

ifneq ($(PEGASUS_USE_NET_SNMP),true)

$(error PEGASUS_USE_NET_SNMP should be set to true when PEGASUS_ENABLE_NET_SNMPV3 is true)

endif

DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3

else

ifneq ($(PEGASUS_ENABLE_NET_SNMPV3),false)

$(error PEGASUS_ENABLE_NET_SNMPV3 ($(PEGASUS_ENABLE_NET_SNMPV3)) invalid, must be true or false)

endif

ifdef PEGASUS_HAS_SSL

Line 925

Line 929

## as defined for openslp

ifeq ($(PEGASUS_USE_OPENSLP),true)

ifeq ($(PEGASUS_ENABLE_SLP),true)

PEGASUS_USE_EXTERNAL_SLP=openslp

export PEGASUS_USE_EXTERNAL_SLP=openslp

PEGASUS_USE_OPENSLP=

else

$(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \

Line 1025

Line 1029

$(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \

Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)

else

PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)

export PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)

endif

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

Line 1104

Line 1108

$(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if DMTF Indications profile support is enabled)

endif

DEFINES += -DPEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT

DEFINES += -DPEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT -DPEGASUS_ENABLE_INDICATION_ORDERING

else

ifneq ($(PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT),false)

$(error PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT ($(PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT)) invalid, must be true or false)

Line 1142

Line 1146

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 1183

ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER

ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)

DEFINES += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER

ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER

PEGASUS_JAVA_CLASSPATH_DELIMITER = :

endif

ifndef PEGASUS_JVM

PEGASUS_JVM = sun

endif

ifeq ($(PEGASUS_JVM),gcj)

PEGASUS_JAVA_COMPILER = gcj -C

PEGASUS_JAVA_JAR = fastjar

PEGASUS_JAVA_INTERPRETER = gij

else

PEGASUS_JAVA_COMPILER = javac -target 1.4 -source 1.4

PEGASUS_JAVA_JAR = jar

PEGASUS_JAVA_INTERPRETER = java

endif

else

ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)

$(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \

Line 1197

Line 1214

DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI

endif

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

# Set any vendor-specific compile flags

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

ifdef PEGASUS_VENDOR_HP

DEFINES+= -DPEGASUS_VENDOR_HP

endif

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

Line 1221

Line 1228

RMREPOSITORY = $(RMDIRHIER)

ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS

ifndef PEGASUS_USE_RELEASE_CONFIG_OPTIONS

PEGASUS_USE_RELEASE_CONFIG_OPTIONS=false

endif

ifeq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),true)

DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS

else

ifneq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),false)

$(error PEGASUS_USE_RELEASE_CONFIG_OPTIONS \

($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS)) invalid, must be true or false)

endif

ifdef PEGASUS_USE_RELEASE_DIRS

Line 1288

Line 1304

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

ifdef PEGASUS_USE_STATIC_LIBRARIES

ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)

ifeq ($(OS_TYPE),windows)

$(error PEGASUS_USE_STATIC_LIBRARIES is not support on windows.)

else

ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),false)

ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),true)

$(error PEGASUS_USE_STATIC_LIBRARIES ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true or false)

$(error PEGASUS_USE_STATIC_LIBRARIES \

($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true.)

endif

Line 1344

Line 1362

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

## 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 1366

Line 1419

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

ifdef PEGASUS_USE_PAM_STANDALONE_PROC

ifndef PEGASUS_PAM_AUTHENTICATION

$(error "PEGASUS_PAM_AUTHENTICATION must be defined when PEGASUS_USE_PAM_STANDALONE_PROC is defined")

endif

DEFINES += -DPEGASUS_USE_PAM_STANDALONE_PROC

endif

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

ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER

PEGASUS_JAVA_CLASSPATH_DELIMITER = :

endif

ifndef PEGASUS_JVM

PEGASUS_JVM = sun

endif

ifeq ($(PEGASUS_JVM),gcj)

PEGASUS_JAVA_COMPILER = gcj -C

PEGASUS_JAVA_JAR = fastjar

PEGASUS_JAVA_INTERPRETER = gij

else

PEGASUS_JAVA_COMPILER = javac -target 1.4 -source 1.4

PEGASUS_JAVA_JAR = jar

PEGASUS_JAVA_INTERPRETER = java

endif

# Disable client timeouts when we're doing a valgrind build

ifdef PEGASUS_TEST_VALGRIND_LOG_DIR

DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND

Line 1422

Line 1461

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

## PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY

## Enable binary protocol between cimserver and out-of-process providers.

## By default this feature is enabled.

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

ifndef PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY

PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY=true

endif

ifeq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),true)

DEFINES += -DPEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY

else

ifneq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),false)

$(error "PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY must be true or false")

endif

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

## PEGASUS_ENABLE_PROTOCOL_BINARY

## Enables the binary protocol between clients and cimserver. With provider

Line 1464

Line 1482

endif

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

## PEGASUS_ENABLE_PROTOCOL_WEB

## Enables the GET-Method for files in order to act as a web-server

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

ifndef PEGASUS_ENABLE_PROTOCOL_WEB

PEGASUS_ENABLE_PROTOCOL_WEB = true

endif

ifeq ($(PEGASUS_ENABLE_PROTOCOL_WEB),true)

DEFINES += -DPEGASUS_ENABLE_PROTOCOL_WEB

else

ifneq ($(PEGASUS_ENABLE_PROTOCOL_WEB),false)

$(error "PEGASUS_ENABLE_PROTOCOL_WEB must be true or false")

endif

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

## PLATFORM_CORE_PATTERN

Line 1475

Line 1516

ifndef PLATFORM_CORE_PATTERN

PLATFORM_CORE_PATTERN = core*

endif

ifdef PEGASUS_FLAVOR

ifdef PEGASUS_USE_RELEASE_DIRS

ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS

$(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when both PEGASUS_FLAVOR and PEGASUS_USE_RELEASE_DIRS options are used")

endif

ifneq ($(PEGASUS_FLAVOR), tog)

DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"

endif

ifdef PEGASUS_EXTRA_PROVIDER_LIB_DIR

ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS

$(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when PEGASUS_EXTRA_PROVIDER_LIB_DIR defined.")

endif

DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"$(PEGASUS_EXTRA_PROVIDER_LIB_DIR):\"

else

DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"\"

endif

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

## PEGASUS_INITIAL_THREADSTACK_SIZE

## This environment variable sets the initial size of the stack on new threads.

## When it is undefined, the size defaults to something relatively small

## (see src/Pegasus/Common/Config.h or if overridden by platform see

## src/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h).

## Value is specified in number of bytes.

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

ifdef PEGASUS_INITIAL_THREADSTACK_SIZE

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.183
changed lines
	Added in v.1.211.10.3

No CVS admin address has been configured