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.167.4.1.4.4 and 1.168

version 1.167.4.1.4.4, 2008/08/14 13:41:33

version 1.168, 2008/06/03 19:10:04

Line 415

CNV_ROOT_CMD = cnv2rootbundle

endif

# The library path option is needed on all link commands with some ICU

# builds, because internal ICU library dependencies are resolved

# dynamically.

ifdef ICU_INSTALL

ifeq ($(OS),zos)

# On z/OS, the -L option must appear before the -o option and

# the object (.o) and sidedeck (.x) files in the link command.

FLAGS += -L$(ICU_INSTALL)/lib

PR_FLAGS += -L$(ICU_INSTALL)/lib

else

EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib

endif

# The ICU include path and library dependencies are restricted to

# where they are specifically needed.

ifeq ($(HAS_ICU_DEPENDENCY),true)

ifdef ICU_INSTALL

SYS_INCLUDES += -I$(ICU_INSTALL)/include

endif

Line 443

Line 426

$(ICU_INSTALL)/lib/icudt.lib

else

ifeq ($(OS),zos)

# On z/OS, the -L option must appear before the -o option and

# the object (.o) and sidedeck (.x) files in the link command.

FLAGS += -L$(ICU_INSTALL)/lib

PR_FLAGS += -L$(ICU_INSTALL)/lib

EXTRA_LIBRARIES += \

$(ICU_INSTALL)/lib/libicui18n.x \

$(ICU_INSTALL)/lib/libicuuc.x

else

ifdef ICU_INSTALL

EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib

endif

EXTRA_LIBRARIES += -licuuc -licui18n

ifeq ($(OS),linux)

EXTRA_LIBRARIES += -licudata

Line 454

Line 444

endif

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

Line 838

Line 827

# PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP

# PEGASUS_DISABLE_SLP has been deprecated. New use model is:

# PEGASUS_DISABLE_SLP has been depracated. New use model is:

# Use PEGASUS_ENABLE_SLP=true to enable compilation of SLP functions.

# Use PEGASUS_ENABLE_SLP=false to disable compilation of SLP functions.

# Currently (Aug. 12, 2005) Windows is the only platform that enables SLP

# by default.

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

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

# the variable PEGASUS_ENABLE_SLP.

Line 877

Line 869

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

# PEGASUS_USE_OPENSLP

## NOTE: This variable has been deprecated and superceeded by the use of

## PEGASUS_USE_EXTERNAL_SLP. The use of this variable may be

## removed from Pegasus in future releases. It is converted to the

## PEGASUS_USE_EXTERNAL_SLP variable in the following function.

## Do not allow PEGASUS_USE_EXTERNAL_SLP if PEGASUS_ENABLE_SLP not set and

## insure that PEGASUS_USE_OPENSLP and PEGASUS_USE_EXTERNAL_SLP are not used

## simultaneously

# Environment variable to set openslp as SLP environment to use

# for SLP Directory and User Agents.

Line 893

Line 877

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

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

Line 902

Line 889

ifdef PEGASUS_USE_OPENSLP

ifdef PEGASUS_USE_EXTERNAL_SLP

$(error Both PEGASUS_USE_OPENSLP and PEGASUS_USE_EXTERNAL_SLP defined. \

Please use PEGASUS_USE_EXTERNAL_SLP)

endif

ifeq ($(PEGASUS_USE_OPENSLP),true)

ifeq ($(PEGASUS_ENABLE_SLP),true)

DEFINES += -DPEGASUS_USE_EXTERNAL_SLP=1

DEFINES += -DPEGASUS_USE_OPENSLP

PEGASUS_USE_EXTERNAL_SLP_TYPE=1

else

$(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \

Please correct this inconsistency)

endif

else

ifneq ($(PEGASUS_USE_OPENSLP), false)

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

$(error PEGASUS_USE_OPENSLP \

($(PEGASUS_USE_OPENSLP)) \

invalid, must be true or false)

endif

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

# PEP 267

# SLP reregistration support.

# PEGASUS_SLP_REG_TIMEOUT is defined as the SLP registration timeout

Line 932

Line 904

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. \

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

Please correct this inconsistency)

endif

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

# PEGASUS_USE_EXTERNAL_SLP

# Environment variable to set an external slp implementation as the SLP

# environment to use for SLP Directory Agents.

# This allows setting any one of several possible external SLP SAs as the

# interface for the SLP provider to communicate with in managing SLP templates

# in place of the internal SLP agent provided with Pegasus.

# Note: This does not disable the compilation of the internal agent code since

# this is used for the SLP UA defined with the pegasus client.

# Pegasus assumes that the external SLP defined is installed on the platform

# and running when pegasus is started. It changes the interfaces from the SLP

# provider to match the defined SLP implementation.

# This environment variable superceedes the use of PEGASUS_USE_OPENSLP since

# openslp is considered one of the valid external SLP environments usable by

# pegasus.

# The variable uses the value component to define a name for the external SLP

# environment that must match one of the names defined below.

# This variable is not allowed if the PEGASUS_ENABLE_SLP flag is not set.

# Allow only predefined string values for the variable corresponding

# to external slp types that pegasus knows.

# Valid types are openslp (1) and solarisslp (2)

EXTERNAL_SLP_TYPES = openslp solarisslp

ifdef PEGASUS_USE_EXTERNAL_SLP

ifeq ($(PEGASUS_ENABLE_SLP),true)

ifeq ($(PEGASUS_USE_EXTERNAL_SLP),openslp)

DEFINES += -DPEGASUS_USE_EXTERNAL_SLP_TYPE=1

else

ifeq ($(PEGASUS_USE_EXTERNAL_SLP),solarisslp)

DEFINES += -DPEGASUS_USE_EXTERNAL_SLP_TYPE=2

else

$(error PEGASUS_USE_EXTERNAL_SLP value ($(PEGASUS_USE_EXTERNAL_SLP)) \

invalid. It must be one of valid SLP external types \

($(EXTERNAL_SLP_TYPES)) )

endif

Line 987

Line 912

# PEGASUS_OPENSLP_HOME

# PEGASUS_OPENSLP_HOME superceeded by PEGASUS_OPEN_EXTERNAL_SLP_HOME. If

# PEGASUS_OPENSLP_HOME is encountered it will create PEGASUS_OPEN_EXTERNAL_SLP_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.

Line 1003

Line 925

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

ifdef PEGASUS_OPENSLP_HOME

ifdef PEGASUS_OPEN_EXTERNAL_SLP_HOME

$(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \

Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)

else

PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)

endif

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

# PEGASUS_EXTERNAL_SLP_HOME

# Environment variable to set home location for External SLP include and library

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

# This variable superceeds PEGASUS_OPENSLP_HOME to match the use of

# PEGASUS_USE_EXTERNAL_SLP variable.

# PEGASUS_USE_EXTERNAL_SLP 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 1324

Line 1218

endif

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

## PEGASUS_PAM_AUTHENTICATION

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

ifdef PEGASUS_PAM_AUTHENTICATION

# Compile in the code required for PAM authentication

# and compile out the code that uses the password file.

DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE

# Link with libpam only where it is needed.

ifeq ($(HAS_PAM_DEPENDENCY),true)

SYS_LIBS += -lpam

endif

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

Legend:

Removed from v.1.167.4.1.4.4
changed lines
	Added in v.1.168

No CVS admin address has been configured