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.144 and 1.153.2.1

version 1.144, 2007/07/02 20:03:10

version 1.153.2.1, 2008/11/21 01:57:41

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 567

Line 588

# PEP 258

# Allow Audit Logger to be disabled

# Allow Audit Logger to be disabled. It is enabled by default.

ifdef PEGASUS_DISABLE_AUDIT_LOGGER

ifeq ($(PEGASUS_DISABLE_AUDIT_LOGGER),true)

ifndef PEGASUS_ENABLE_AUDIT_LOGGER

DEFINES += -DPEGASUS_DISABLE_AUDIT_LOGGER

PEGASUS_ENABLE_AUDIT_LOGGER = true

endif

ifdef PEGASUS_ENABLE_AUDIT_LOGGER

ifeq ($(PEGASUS_ENABLE_AUDIT_LOGGER),true)

DEFINES += -DPEGASUS_ENABLE_AUDIT_LOGGER

else

ifneq ($(PEGASUS_DISABLE_AUDIT_LOGGER),false)

ifneq ($(PEGASUS_ENABLE_AUDIT_LOGGER),false)

$(error PEGASUS_DISABLE_AUDIT_LOGGER ($(PEGASUS_DISABLE_AUDIT_LOGGER)) \

$(error PEGASUS_ENABLE_AUDIT_LOGGER \

invalid, must be true or false)

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

endif

# Check for use of deprecated variable

ifdef PEGASUS_DISABLE_AUDIT_LOGGER

$(error The PEGASUS_DISABLE_AUDIT_LOGGER variable is deprecated. \

Use PEGASUS_ENABLE_AUDIT_LOGGER=false instead)

endif

Line 585

Line 617

# PEP 291

# Enable IPv6 support

ifndef PEGASUS_ENABLE_IPV6

PEGASUS_ENABLE_IPV6 = true

endif

Line 601

Line 634

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

Line 710

Line 762

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 901

Line 1001

endif

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

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

## separation is enabled.

ifndef PEGASUS_CIMSERVERMAIN_USER

PEGASUS_CIMSERVERMAIN_USER = cimsrvr

PEGASUS_CIMSERVERMAIN_USER = pegasus

endif

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

endif

Line 938

Line 1036

PEGASUS_JAVA_INTERPRETER = java

endif

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

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

## Pegasus WMI-Mapper

## PLATFORM_CORE_PATTERN

## This variable describes the pattern used to search for core files.

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

## If not defined, this variable will be set to core*.

ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)

## Only wildcard characters supported by the make wildcard function

ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)

## may be used.

ifndef MSSdk

$(error MSSdk environment variable undefined)

ifndef PLATFORM_CORE_PATTERN

endif

PLATFORM_CORE_PATTERN = core*

endif

Legend:

Removed from v.1.144
changed lines
	Added in v.1.153.2.1

No CVS admin address has been configured