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.122.2.2 and 1.152

version 1.122.2.2, 2006/05/17 20:57:38

version 1.152, 2007/09/12 20:35:02

Line 98

GCC_VERSION =

endif

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

## As a general rule, the directory structure for the object files mirrors

## the directory structure of the source files. E.g.,

## $PEGASUS_HOME/obj/Pegasus/Common contains the object files for the

## source files in $PEGASUS_ROOT/src/Pegasus/Common. Each source-level

## Makefile includes a DIR value that defines this common path (e.g.,

## Pegasus/Common). In a small number of cases, source files are built

## multiple times with difference compile options.

## To handle this situation, the ALT_OBJ_DIR variable can be used to

## specify an alternative object directory for use in building the

## objects defined in the Makefile.

ifndef ALT_OBJ_DIR

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

else

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

endif

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

BIN_DIR = $(HOME_DIR)/bin

LIB_DIR = $(HOME_DIR)/lib

Line 212

Line 232

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

endif

else

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29

CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM2131

CIM_SCHEMA_VER=

endif

Line 371

Line 391

endif

# Setup the conditional compile for client displays.

ifdef PEGASUS_CLIENT_TRACE_ENABLE

DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE

endif

# Allow PEGASUS_ASSERT statements to be disabled.

ifdef PEGASUS_NOASSERTS

DEFINES += -DNDEBUG

Line 441

Line 455

endif

# Allow to define the default value for the Provider User Context

# property as REQUESTOR.

# If is set and true use REQUESTOR

# If is not set or false use PRIVILEGED

ifdef PEGASUS_DEFAULT_USERCTXT_REQUESTOR

ifeq ($(PEGASUS_DEFAULT_USERCTXT_REQUESTOR),true)

DEFINES += -DPEGASUS_DEFAULT_USERCTXT_REQUESTOR

else

ifneq ($(PEGASUS_DEFAULT_USERCTXT_REQUESTOR),false)

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

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

# Bug 2147

Line 473

Line 490

DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION

endif

# PEP 233

# Controls support for EmbeddedInstance properties

# and parameters

ifndef PEGASUS_EMBEDDED_INSTANCE_SUPPORT

PEGASUS_EMBEDDED_INSTANCE_SUPPORT = true

endif

ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)

DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT

else

ifneq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), false)

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

endif

# Allow ExecQuery functionality to be enabled

ifndef PEGASUS_ENABLE_EXECQUERY

DEFINES += -DPEGASUS_DISABLE_EXECQUERY

Line 499

Line 532

endif

ifdef PEGASUS_HAS_SSL

ifndef OPENSSL_BIN

DEFINES += -DPEGASUS_HAS_SSL

OPENSSL_BIN = $(OPENSSL_HOME)/bin

# Enable SSL Random file by default.

ifndef PEGASUS_USE_SSL_RANDOMFILE

PEGASUS_USE_SSL_RANDOMFILE = true

endif

# Allow SSL Random file functionality to be optionally disabled.

ifdef PEGASUS_USE_SSL_RANDOMFILE

ifeq ($(PEGASUS_USE_SSL_RANDOMFILE), true)

DEFINES += -DPEGASUS_SSL_RANDOMFILE

else

ifneq ($(PEGASUS_USE_SSL_RANDOMFILE), false)

$(error PEGASUS_USE_SSL_RANDOMFILE\

($(PEGASUS_USE_SSL_RANDOMFILE)) invalid, \

must be true or false)

endif

ifndef OPENSSL_COMMAND

ifdef OPENSSL_BIN

OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl

else

OPENSSL_COMMAND = openssl

endif

ifndef OPENSSL_SET_SERIAL_SUPPORTED

ifneq (, $(findstring 0.9.6, $(shell $(OPENSSL_COMMAND) version)))

Line 521

Line 575

# Check for Enable SSL CRL verification

ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION

ifeq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), true)

FLAGS += -DPEGASUS_ENABLE_SSL_CRL_VERIFICATION

DEFINES += -DPEGASUS_ENABLE_SSL_CRL_VERIFICATION

else

ifneq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), false)

$(error PEGASUS_ENABLE_SSL_CRL_VERIFICATION\

Line 533

Line 587

endif

# PEP 258

# Allow Audit Logger to be disabled

ifdef PEGASUS_DISABLE_AUDIT_LOGGER

ifeq ($(PEGASUS_DISABLE_AUDIT_LOGGER),true)

DEFINES += -DPEGASUS_DISABLE_AUDIT_LOGGER

else

ifneq ($(PEGASUS_DISABLE_AUDIT_LOGGER),false)

$(error PEGASUS_DISABLE_AUDIT_LOGGER ($(PEGASUS_DISABLE_AUDIT_LOGGER)) \

invalid, must be true or false)

endif

# PEP 291

# Enable IPv6 support

ifndef PEGASUS_ENABLE_IPV6

PEGASUS_ENABLE_IPV6 = true

endif

# Check for Enable IPv6 support

ifdef PEGASUS_ENABLE_IPV6

ifeq ($(PEGASUS_ENABLE_IPV6),true)

DEFINES += -DPEGASUS_ENABLE_IPV6

else

ifneq ($(PEGASUS_ENABLE_IPV6),false)

$(error PEGASUS_ENABLE_IPV6 ($(PEGASUS_ENABLE_IPV6)) \

invalid, must be true or false)

endif

# Verify Test IPv6 support

# If PEGASUS_ENABLE_IPV6 is defined and PEGASUS_TEST_IPV6 is not defined, we set

# PEGASUS_TEST_IPV6 to the same value as PEGASUS_ENABLE_IPV6.

# You can explicitly set PEGASUS_TEST_IPV6 to false if you don't want to run the

# IPv6 tests (for example, on an IPv4 system that is running an IPv6-enabled

# version of Pegasus).

ifdef PEGASUS_TEST_IPV6

ifneq ($(PEGASUS_TEST_IPV6),true)

ifneq ($(PEGASUS_TEST_IPV6),false)

$(error PEGASUS_TEST_IPV6 ($(PEGASUS_TEST_IPV6)) \

invalid, must be true or false)

endif

else

PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)

endif

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

# PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP

# PEGASUS_DISABLE_SLP has been depracated. New use model is:

Line 604

Line 714

endif

# PEP 267

# SLP reregistration support.

# PEGASUS_SLP_REG_TIMEOUT is defined as the SLP registration timeout

# interval, in minutes.

ifdef PEGASUS_SLP_REG_TIMEOUT

ifeq ($(PEGASUS_ENABLE_SLP),true)

DEFINES += -DPEGASUS_SLP_REG_TIMEOUT=$(PEGASUS_SLP_REG_TIMEOUT)

else

$(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)

endif

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

Line 630

Line 751

DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT

endif

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

# PEGASUS_ENABLE_INTEROP_PROVIDER

# Enables the interop provider AND the server profile.

# initially this was activated by setting either the perfinst or slp enable

# flags. This allows activating this function without any either perfinst or

# slp enabled. Note that if either of these are enabled, this funtion is also

# enabled

## if either slp or perfinst are enabled and this is false, flag error

## This gets messy because should account for both postive and negative on

## interop so we don't get multiples.

ifdef PEGASUS_ENABLE_SLP

ifeq ($(PEGASUS_ENABLE_SLP),true)

ifndef PEGASUS_ENABLE_INTEROP_PROVIDER

PEGASUS_ENABLE_INTEROP_PROVIDER = true

else

ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)

$(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if SLP enabled)

endif

## if PERFINST enabled, set to force interop.

ifndef PEGASUS_DISABLE_PERFINST

ifndef PEGASUS_ENABLE_INTEROP_PROVIDER

PEGASUS_ENABLE_INTEROP_PROVIDER = true

else

ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)

$(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if PERFINST enabled)

endif

ifdef PEGASUS_ENABLE_INTEROP_PROVIDER

ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)

DEFINES += -DPEGASUS_ENABLE_INTEROP_PROVIDER

else

ifneq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)

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

endif

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

# set PEGASUS_DEBUG into the DEFINES if it exists.

# Note that this flag is the general separator between

# debug compiles and non-debug compiles and controls both

Line 647

Line 816

ifdef PEGASUS_INDICATION_HASHTRACE

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 661

Line 835

# Set compile flag to control compilation of CIMOM statistics

ifdef PEGASUS_DISABLE_PERFINST

FLAGS += -DPEGASUS_DISABLE_PERFINST

DEFINES += -DPEGASUS_DISABLE_PERFINST

endif

# Set compile flag to control compilation of SNIA Extensions

ifdef PEGASUS_SNIA_EXTENSIONS

FLAGS += -DPEGASUS_SNIA_EXTENSIONS

DEFINES += -DPEGASUS_SNIA_EXTENSIONS

endif

ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER

ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)

FLAGS += -DPEGASUS_ENABLE_CMPI_PROVIDER_MANAGER

DEFINES += -DPEGASUS_ENABLE_CMPI_PROVIDER_MANAGER

else

ifneq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), false)

$(error PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER \

Line 683

Line 857

ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER

ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)

FLAGS += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER

DEFINES += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER

else

ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)

$(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \

Line 695

Line 869

# Allow remote CMPI functionality to be enabled

ifdef PEGASUS_ENABLE_REMOTE_CMPI

FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI

DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI

endif

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

Line 723

Line 897

RMREPOSITORY = $(RMDIRHIER)

ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS

FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS

DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS

endif

ifdef PEGASUS_USE_RELEASE_DIRS

FLAGS += -DPEGASUS_USE_RELEASE_DIRS

DEFINES += -DPEGASUS_USE_RELEASE_DIRS

endif

ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS

FLAGS += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS

DEFINES += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS

endif

# Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib

Line 780

Line 954

EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)

endif

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

## By definining PEGASUS_USE_STATIC_LIBRARIES in the environment and STATIC

## in the Makefile, a static library is produced rather than a shared one.

## PEGASUS_USE_STATIC_LIBRARIES should be "true" or "false".

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

ifdef PEGASUS_USE_STATIC_LIBRARIES

ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)

else

ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),false)

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

endif

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

## PEGASUS_ENABLE_PRIVILEGE_SEPARATION

## Enables privilege separation support (uses the executor process to

## perform privileged operations).

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

ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION

ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)

DEFINES += -DPEGASUS_ENABLE_PRIVILEGE_SEPARATION

else

ifneq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),false)

$(error PEGASUS_ENABLE_PRIVILEGE_SEPARATION \

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

endif

## Defines the user context of the cimservermain process when privilege

## separation is enabled.

PEGASUS_CIMSERVERMAIN_USER = cimsrvr

DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"

endif

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

## PEGASUS_USE_PAM_STANDALONE_PROC

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

ifdef PEGASUS_USE_PAM_STANDALONE_PROC

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

Legend:

Removed from v.1.122.2.2
changed lines
	Added in v.1.152

No CVS admin address has been configured