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.131 and 1.146

version 1.131, 2006/08/04 20:06:03

version 1.146, 2007/07/06 17:46:32

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 456

Line 476

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 525

Line 532

endif

ifdef PEGASUS_HAS_SSL

DEFINES += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE

ifndef OPENSSL_BIN

OPENSSL_BIN = $(OPENSSL_HOME)/bin

endif

Line 547

Line 556

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

Line 568

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

# PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP

# PEGASUS_DISABLE_SLP has been depracated. New use model is:

Line 630

Line 675

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 692

Line 748

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

Line 770

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 726

Line 782

# Allow remote CMPI functionality to be enabled

ifdef PEGASUS_ENABLE_REMOTE_CMPI

FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI

DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI

endif

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

Line 754

Line 810

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 828

Line 884

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

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

## separation is enabled.

ifndef PEGASUS_CIMSERVERMAIN_USER

PEGASUS_CIMSERVERMAIN_USER = pegasus

endif

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.131
changed lines
	Added in v.1.146

No CVS admin address has been configured