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.64.2.7 and 1.83

version 1.64.2.7, 2005/08/12 23:47:59

version 1.83, 2005/03/01 22:46:10

Line 18

ifdef PEGASUS_HOME

HOME_DIR = $(subst \,/,$(PEGASUS_HOME))

else

ERROR = pegasus_home_undefined

$(error PEGASUS_HOME environment variable undefined)

pegasus_home_undefined:

@ echo PEGASUS_HOME environment variable undefined

@ exit 1

endif

ifdef PEGASUS_ROOT

ROOT = $(subst \,/,$(PEGASUS_ROOT))

else

ERROR = pegasus_root_undefined

$(error PEGASUS_ROOT environment variable undefined)

pegasus_root_undefined:

@ echo PEGASUS_ROOT environment variable undefined

@ exit 1

endif

# l10n

Line 50

Line 44

DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))

endif

VALID_PLATFORMS = \

PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)

WIN32_IX86_MSVC \

PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))

LINUX_IX86_GNU \

VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP))

LINUX_PPC_GNU \

LINUX_PPC64_GNU \

LINUX_IA64_GNU \

LINUX_ZSERIES_GNU \

LINUX_ZSERIES64_GNU \

AIX_RS_IBMCXX \

HPUX_PARISC_ACC \

HPUX_IA64_ACC \

TRU64_ALPHA_DECCXX \

SOLARIS_SPARC_GNU \

SOLARIS_SPARC_CC \

ZOS_ZSERIES_IBM \

NSK_NONSTOP_NMCPLUS \

DARWIN_PPC_GNU

ifndef PEGASUS_PLATFORM

ERROR = pegasus_platform_undefined

$(error PEGASUS_PLATFORM environment variable undefined. Please set to\

pegasus_platform_undefined:

one of the following:$(VALID_PLATFORMS))

@ echo PEGASUS_PLATFORM environment variable undefined. Please set to\

one of the following: $(VALID_PLATFORMS)

@ exit 1

endif

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

Line 88

Line 65

# define the location for the repository

REPOSITORY_DIR = $(HOME_DIR)

REPOSITORY_ROOT = $(REPOSITORY_DIR)/repository

REPOSITORY_NAME = repository

REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)

# define the repository mode

# XML = XML format

# BIN = Binary format

REPOSITORY_MODE = XML

# The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,

# are used to control the version of the CIM Schema

Line 144

Line 128

CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))

endif

else

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29

CIM_SCHEMA_VER=28

CIM_SCHEMA_VER=

endif

ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))

Line 206

Line 190

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

ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)

PLATFORM_FILE = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

ifneq ($(wildcard $(PLATFORM_FILE)), )

FOUND = true

include $(PLATFORM_FILE)

endif

else

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

ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)

the following:$(VALID_PLATFORMS))

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),LINUX_PPC_GNU)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),LINUX_PPC64_GNU)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES_GNU)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES64_GNU)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),TRU64_ALPHA_DECCXX)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_GNU)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),NSK_NONSTOP_NMCPLUS)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)

include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak

FOUND = true

endif

ifneq ($(FOUND),true)

ERROR = pegasus_unknown_platform

pegasus_unknown_platform:

@ echo PEGASUS_PLATFORM environment variable must be set to one of\

the following: $(VALID_PLATFORMS)

@ exit 1

endif

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

Line 329

Line 233

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

## PEGASUS_MAX_THREADS_PER_SVC_QUEUE

## Controls the maximum number of threads allowed per message service queue.

## It is allowed to range between 1 and MAX_THREADS_PER_SVC_QUEUE_LIMIT

## as set in pegasus/src/Pegasus/Common/MessageQueueService.cpp.

## defaults to 0 (zero)

## if set to 0 (zero)

## then the max threads per service queue is

## set to MAX_THREADS_PER_SVC_QUEUE_DEFAULT.

## if set larger than MAX_THREADS_PER_SVC_QUEUE_LIMIT

## then the max threads per service queue is

## set to MAX_THREADS_PER_SVC_QUEUE_LIMIT.

## Label Current value

## -------------------------------------- -------------

## MAX_THREADS_PER_SVC_QUEUE_LIMIT 5000

## MAX_THREADS_PER_SVC_QUEUE_DEFAULT 5

ifdef PEGASUS_MAX_THREADS_PER_SVC_QUEUE

DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)

else

DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=0

endif

# Setup the conditional compile for client displays.

ifdef PEGASUS_CLIENT_TRACE_ENABLE

Line 370

Line 244

DEFINES+= -DPEGASUS_REMOVE_TRACE

endif

# Allow PEGASUS_ASSERT statements to be disabled

ifdef PEGASUS_NOASSERTS

DEFINES += -DNDEBUG

endif

# PEP 123 use monitor2 (the default) or not

#ifdef PEGASUS_USE_23HTTPMONITOR_SERVER

DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_SERVER

#endif

#BUG 1170 Monitor2 Client Workaround

#ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT

DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_CLIENT

#endif

# PEP 161

# Control whether utf-8 filenames are supported by the repository

ifdef PEGASUS_SUPPORT_UTF8_FILENAME

Line 405

Line 264

DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION

endif

# PEP 193

# The following flag need to be set to disable

# CQL in indication subscriptions

ifdef PEGASUS_DISABLE_CQL

DEFINES += -DPEGASUS_DISABLE_CQL

endif

# PEP 186

# Allow override of product name/version/status. A file

# pegasus/src/Pegasus/Common/ProductVersion.h must exist when this

# flag is defined.

ifdef PEGASUS_OVERRIDE_PRODUCT_ID

DEFINES += -DPEGASUS_OVERRIDE_PRODUCT_ID

endif

# PEP 197

# Allow the Provider User Context feature to be disabled.

ifdef PEGASUS_DISABLE_PROV_USERCTXT

DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT

else

ifdef PEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR

DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR

endif

ifdef PEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED

DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED

endif

ifdef PEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED

DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED

endif

ifdef PEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER

DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER

endif

# PEP 211

# Controls object normalization support.

ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION

DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION

endif

# Allow ExecQuery functionality to be enabled

ifndef PEGASUS_ENABLE_EXECQUERY

DEFINES += -DPEGASUS_DISABLE_EXECQUERY

endif

# setup function to enable SLP functions in the Pegasus standard compile

# Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.

# NOTE. Effective with Bug # 2633 some platforms now enable SLP.

# To see which platforms look for platform make files that set

# the variable PEGASUS_ENABLE_SLP

ifdef PEGASUS_ENABLE_SLP

DEFINES+= -DPEGASUS_ENABLE_SLP

endif

Line 430

Line 339

DEFINES+= -DPEGASUS_USE_EXPERIMENTAL_INTERFACES

# Set compile flag to control compilation of CIMOM statistics

ifdef PEGASUS_HAS_PERFINST

ifdef PEGASUS_DISABLE_PERFINST

FLAGS += -DPEGASUS_HAS_PERFINST

FLAGS += -DPEGASUS_DISABLE_PERFINST

endif

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

Line 471

Line 380

PEGASUS_DEST_LIB_DIR = lib

endif

ifeq ($(OS),VMS)

DEFINES += -DPEGASUS_DEST_LIB_DIR="""$(PEGASUS_DEST_LIB_DIR)"""

else

DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\"

endif

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

Line 480

Line 393

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

ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU

ifdef PEGASUS_EXTRA_CXX_FLAGS

EXTRA_CXX_FLAGS = $(PEGASUS_EXTRA_CXX_FLAGS)

endif

Line 492

Line 404

ifdef PEGASUS_EXTRA_LINK_FLAGS

EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)

endif

Legend:

Removed from v.1.64.2.7
changed lines
	Added in v.1.83

No CVS admin address has been configured