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.120 and 1.130

version 1.120, 2006/02/07 20:44:21

version 1.130, 2006/07/28 17:40:48

Line 441

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.

Line 473

Line 489

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 502

Line 534

ifndef OPENSSL_BIN

OPENSSL_BIN = $(OPENSSL_HOME)/bin

endif

ifndef OPENSSL_COMMAND

OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl

endif

ifndef OPENSSL_SET_SERIAL_SUPPORTED

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

OPENSSL_SET_SERIAL_SUPPORTED = false

Line 510

Line 544

OPENSSL_SET_SERIAL_SUPPORTED = true

endif

# Enable CRL verification

ifndef PEGASUS_ENABLE_SSL_CRL_VERIFICATION

PEGASUS_ENABLE_SSL_CRL_VERIFICATION = true

endif

# 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

else

ifneq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), false)

$(error PEGASUS_ENABLE_SSL_CRL_VERIFICATION\

($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION)) invalid, \

must be true or false)

endif

Line 553

Line 605

endif

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

# PEGASUS_USE_OPENSLP

# Environment variable to set openslp as SLP environment to use

# for SLP Directory and User Agents.

# Allows enabling use of openslp interfaces for slp instead of the

# internal pegasus slp agent. Note that this does not disable the

# compilation of the internal agent code, etc. However, it assumes

# openslp is installed on the platform and changes the interfaces

# to match this. At this moment, this is a change specifically for

# adaptec but we expect to generalize it to provide openslp as a

# generalized alternative to ldapslp.

# to use this. To set this function up,

# Use this variable in conjunction with PEGASUS_OPENSLP_HOME

# to enable OpenSlp as the slp implementation.

# NOTE that it has no affect if the PEGASUS_ENABLE_SLP etc. flags are not set.

ifdef PEGASUS_USE_OPENSLP

ifeq ($(PEGASUS_ENABLE_SLP),true)

DEFINES += -DPEGASUS_USE_OPENSLP

else

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

endif

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

# PEGASUS_OPENSLP_HOME

# Environment variable to set home location for OpenSLP include and library

# files if they are located somewhere other than /usr/include and /usr/lib.

# PEGASUS_USE_OPENSLP must also be defined for this environment variable

# to have any effect.

# This is the directory level within which both the include and lib

# directories holding the OpenSLP files will be found.

# EG: If the are located in /opt/OpenSLP/include and /opt/OpenSLP/lib

# then this environment variable should be set to /opt/OpenSLP.

# Enable this flag to allow the handshake to continue regardless of verification result

Line 611

Line 713

endif

ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER

ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)

FLAGS += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER

else

ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)

$(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \

($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER)) invalid, \

must be true or false)

endif

# Allow remote CMPI functionality to be enabled

ifdef PEGASUS_ENABLE_REMOTE_CMPI

FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI

Line 698

Line 812

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

ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER

PEGASUS_JAVA_CLASSPATH_DELIMITER = :

endif

Legend:

Removed from v.1.120
changed lines
	Added in v.1.130

No CVS admin address has been configured