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.185.2.1 and 1.204

version 1.185.2.1, 2009/07/27 10:17:35

version 1.204, 2012/08/09 10:32:17

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=CIM231

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 524

Line 528

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 707

Line 724

DEFINES += -DPEGASUS_USE_NET_SNMP

endif

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

ifndef PEGASUS_ENABLE_NET_SNMPV3

ifdef PEGASUS_USE_NET_SNMP

PEGASUS_ENABLE_NET_SNMPV3=true

else

PEGASUS_ENABLE_NET_SNMPV3=false

endif

ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true)

ifndef PEGASUS_USE_NET_SNMP

$(error PEGASUS_USE_NET_SNMP should be set 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

DEFINES += -DPEGASUS_HAS_SSL

Line 925

Line 962

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

$(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 1141

$(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 1238

Line 1275

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 1385

Line 1431

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

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

Line 1424

Line 1473

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

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

Line 1505

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.185.2.1
changed lines
	Added in v.1.204

No CVS admin address has been configured