(file) Return to config.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config.mak between version 1.86 and 1.135.2.5

version 1.86, 2005/03/19 04:01:37 version 1.135.2.5, 2006/12/31 22:14:49
Line 1 
Line 1 
   #//%2006////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
   #//
   #// Permission is hereby granted, free of charge, to any person obtaining a copy
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
   #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
   #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
   #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
   #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//==============================================================================
 ################################################################################ ################################################################################
 ## ##
 ## Get external environment variables. Note that all external environment ## Get external environment variables. Note that all external environment
Line 44 
Line 74 
     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
 endif endif
  
   ifdef PEGASUS_DEBUG
        PEGASUS_USE_DEBUG_BUILD_OPTIONS = 1
   endif
   
 PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak) PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)
 PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES)) PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
 VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP)) VALID_PLATFORMS=$(subst .mak,, $(PLATFORM_TEMP))
Line 54 
Line 88 
 endif endif
  
 ################################################################################ ################################################################################
   ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU)
       ifdef CXX
         GCC_VERSION = $(shell $(CXX) -dumpversion)
       else
         GCC_VERSION = $(shell g++ -dumpversion)
       endif
   else
       GCC_VERSION =
   endif
  
 OBJ_DIR = $(HOME_DIR)/obj/$(DIR) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
Line 63 
Line 106 
 # define the location for the compiled messages # define the location for the compiled messages
 MSG_ROOT = $(HOME_DIR)/msg MSG_ROOT = $(HOME_DIR)/msg
  
   #############################################################################
   ##  The following REPOSITORY_XXX variables are only used within the
   ## makefiles for building the repository (cimmofl) and running the tests.
   ## They have no effect on CIMconfig initial startup configuration.
   
   #
 # define the location for the repository # define the location for the repository
   #
   # NOTE: There is another variable efined in many of the test makefiles
   # called REPOSITORYDIR. It is a local variable in each of those Makefiles
   # to localally control where the temporay small repository they
   # build, use and then delete is located. Most of the time it is set to TMP_DIR.
   #
   
 REPOSITORY_DIR = $(HOME_DIR) REPOSITORY_DIR = $(HOME_DIR)
   
   #
   # WARNING: The REPOSITORY_NAME varible is not used by all the test,
   # many of them are still hardcoded to "repository".  What this means
   # is that you can change the repository name and build it. But you
   # cannot run the test without many of them failing
   #
   
 REPOSITORY_NAME = repository REPOSITORY_NAME = repository
   
   
 REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME) REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
  
 # define the repository mode # define the repository mode
 #       XML = XML format #       XML = XML format
 #       BIN = Binary format #       BIN = Binary format
 # #
   ifndef PEGASUS_REPOSITORY_MODE
      ## set to default value
      REPOSITORY_MODE = XML
   else
      ## validate assigned value
      ifeq ($(PEGASUS_REPOSITORY_MODE),XML)
 REPOSITORY_MODE = XML REPOSITORY_MODE = XML
      else
        ifeq ($(PEGASUS_REPOSITORY_MODE),BIN)
         REPOSITORY_MODE = BIN
        else
         $(error PEGASUS_REPOSITORY_MODE ($(PEGASUS_REPOSITORY_MODE)) \
                    is invalid. It must be set to either XML or BIN)
        endif
      endif
   endif
   
   
   ###########################################################################
  
 # The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER, # The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,
 # are used to control the version of the CIM Schema # are used to control the version of the CIM Schema
Line 88 
Line 172 
 # #
 # To use the PEGASUS_CIM_SCHEMA variable the Schema mof # To use the PEGASUS_CIM_SCHEMA variable the Schema mof
 # files must be placed in the directory # files must be placed in the directory
 # $(PEGAUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)  # $(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
 # #
 # The value of PEGASUS_CIM_SCHEMA must conform to the # The value of PEGASUS_CIM_SCHEMA must conform to the
 # following syntax: # following syntax:
Line 140 
Line 224 
  
 LEX = flex LEX = flex
  
   ## ======================================================================
   ##
   ## PEGASUS_ENABLE_SORTED_DIFF
   ## This controls if the DIFFSORT function is used rather than a simple DIFF of
   ##  of the test results files to the static results file.
   ##
   ##   Set to "true" enables the sorted diffs of results to static results files.
   ##   otherwise results in regular diffs of results to static results files.
   ##   see bug 2283 for background information concerning this config variable.
   ##
   ##  Defaults to true.
   ##
   ##
   ifndef PEGASUS_ENABLE_SORTED_DIFF
   PEGASUS_ENABLE_SORTED_DIFF=true
   endif
   
 ## ======================================================================== ## ========================================================================
 ## DIFFSORT function definition ## DIFFSORT function definition
 ## Here is an example using the DIFFSORT function: ## Here is an example using the DIFFSORT function:
Line 155 
Line 256 
  
 endef endef
  
   ifndef FORCE_NOCASE
   
 DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \ DIFFSORT = $(SORT) $(1) > $(1).tmp $(NL) \
 $(SORT) $(2) > $(2).tmp $(NL) \ $(SORT) $(2) > $(2).tmp $(NL) \
 $(DIFF) $(1).tmp $(2).tmp $(NL) \ $(DIFF) $(1).tmp $(2).tmp $(NL) \
 $(RM) -f $(1).tmp $(NL) \ $(RM) -f $(1).tmp $(NL) \
 $(RM) -f $(2).tmp $(NL) $(RM) -f $(2).tmp $(NL)
  
   else
   
   DIFFSORT = $(SORT) -f $(1) > $(1).tmp $(NL) \
   $(SORT) -f $(2) > $(2).tmp $(NL) \
   $(DIFF) -i $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
   
   endif
   
   DIFFSORTNOCASE = $(SORT) $(1) > $(1).tmp $(NL) \
   $(SORT) $(2) > $(2).tmp $(NL) \
   $(DIFF) -i $(1).tmp $(2).tmp $(NL) \
   $(RM) -f $(1).tmp $(NL) \
   $(RM) -f $(2).tmp $(NL)
   
   #
   # The following is used to define the usage message for MakeFile
   #
   # See the pegasus/Makfile for an exampleof its usage.
   #
   USAGE = @$(ECHO) " $(1)"
  
 ################################################################################ ################################################################################
 ## ##
Line 185 
Line 310 
 ## ##
 ################################################################################ ################################################################################
  
 # Setup the conditional compile for client displays.  
 #  ################################################################################
 ifdef PEGASUS_CLIENT_TRACE_ENABLE  ##
     DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE  ## PEGASUS_MAX_THREADS_PER_SVC_QUEUE
   ##
   ## Controls the maximum number of threads allowed per message service queue.
   ##     It is allowed to range between 1 and MAX_THREADS_PER_SVC_QUEUE_LIMIT
   ##     as set in pegasus/src/Pegasus/Common/MessageQueueService.cpp.  If the
   ##     specified value is out of range, MAX_THREADS_PER_SVC_QUEUE_LIMIT is
   ##     used.  The default value is MAX_THREADS_PER_SVC_QUEUE_DEFAULT, as
   ##     defined in pegasus/src/Pegasus/Common/MessageQueueService.cpp.
   ##
   ##      Label                                   Current value
   ##      --------------------------------------  -------------
   ##      MAX_THREADS_PER_SVC_QUEUE_LIMIT         5000
   ##      MAX_THREADS_PER_SVC_QUEUE_DEFAULT       5
   ##
   ##
   
   ifdef PEGASUS_MAX_THREADS_PER_SVC_QUEUE
     DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)
   endif
   
   ##############################################################################
   ##
   ## PEGASUS_INDICATIONS_Q_THRESHOLD
   ##
   ## Controls if indications providers are stalled if the indications
   ## service queue is too large.
   ##
   ##      defaults to not set.
   ##
   ##      It can be set to any positive value.
   ##
   ## If not set providers are never stalled. This implies that the
   ## indications service queue may become as large as neccesary to hold all
   ## the indicaitons generated.
   ##
   ## If set to any value then providers are stalled by forcing them to sleep
   ## when they try to deliver an indication and the indications service queue
   ## exceeds this value. They are resumed when the queue count falls 10 percent
   ## below this value.
   ##
   ## Stall and resume log entries are made to inform the administrator
   ## the condition has occured.
   ##
   ## WARNING: This also affects the Out of Process Providers (OOP Providers)
   ##    The OOP Providers use two one way pipes for communication.
   ##    By stalling the Provider this prevents the pipe from being read
   ##    which will cause the pipe to fill up and the remote side will block.
   ##    OOP Prividers mix indications and operations on these two pipes.
   ##    This means the operations will also be blocked as a side effect of
   ##    the indications being stalled.
   ##
   ##
   
   ifdef PEGASUS_INDICATIONS_Q_THRESHOLD
     DEFINES += -DPEGASUS_INDICATIONS_Q_THRESHOLD=$(PEGASUS_INDICATIONS_Q_THRESHOLD)
   endif
   
   
   # Allow PEGASUS_ASSERT statements to be disabled.
   ifdef PEGASUS_NOASSERTS
       DEFINES += -DNDEBUG
 endif endif
  
 # do not compile trace code. sometimes it causes problems debugging # do not compile trace code. sometimes it causes problems debugging
Line 236 
Line 421 
 endif endif
  
 # #
   # PEP 72
   # Allow Out-of-Process Providers to be disabled by default
   #
   ifdef PEGASUS_DEFAULT_ENABLE_OOP
     ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
       DEFINES += -DPEGASUS_DEFAULT_ENABLE_OOP
     else
       ifneq ($(PEGASUS_DEFAULT_ENABLE_OOP),false)
         $(error PEGASUS_DEFAULT_ENABLE_OOP ($(PEGASUS_DEFAULT_ENABLE_OOP)) invalid, must be true or false)
       endif
     endif
   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
     endif
   endif
   
   #
 # PEP 197 # PEP 197
 # Allow the Provider User Context feature to be disabled. # Allow the Provider User Context feature to be disabled.
 # #
Line 256 
Line 471 
     endif     endif
 endif endif
  
   # Bug 2147
   # Allow local domain socket usage to be disabled.
   ifdef PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
       DEFINES += -DPEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET
   endif
   
 # PEP 211 # PEP 211
 # Controls object normalization support. # Controls object normalization support.
 ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
 endif 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
   endif
   
   
 # Allow ExecQuery functionality to be enabled # Allow ExecQuery functionality to be enabled
 ifndef PEGASUS_ENABLE_EXECQUERY ifndef PEGASUS_ENABLE_EXECQUERY
     DEFINES += -DPEGASUS_DISABLE_EXECQUERY     DEFINES += -DPEGASUS_DISABLE_EXECQUERY
Line 277 
Line 514 
   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
 endif endif
  
 # setup function to enable SLP functions in the Pegasus standard compile  # Allow qualifiers to be disabled for instance operations
 # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.  ifdef PEGASUS_DISABLE_INSTANCE_QUALIFIERS
 # NOTE. Effective with Bug # 2633 some platforms now enable SLP.    DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS
   endif
   
   # Allow repository instance filtering to be disabled
   ifdef PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER
     ifeq ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER), false)
       DEFINES += -DPEGASUS_DISABLE_REPOSITORY_INSTANCE_FILTER
     else
       ifneq ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER), true)
         $(error PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER)) invalid, must be true or false)
       endif
     endif
   endif
   
   # Controls snmp indication handler to use NET-SNMP to deliver trap
   ifdef PEGASUS_USE_NET_SNMP
     DEFINES += -DPEGASUS_USE_NET_SNMP
   endif
   
   ifdef PEGASUS_HAS_SSL
    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
       else
           OPENSSL_SET_SERIAL_SUPPORTED = true
       endif
    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
       endif
   endif
   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
     endif
   endif
   
   #
   # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
   #
   # 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 # To see which platforms look for platform make files that set
 # the variable PEGASUS_ENABLE_SLP  # the variable PEGASUS_ENABLE_SLP.
   #
   #
   
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
     ifdef PEGASUS_DISABLE_SLP
       $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)
     endif
   endif
   
   ifdef PEGASUS_DISABLE_SLP
       $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )
   
   PEGASUS_ENABLE_SLP=false
   
   endif
   
   ifdef PEGASUS_ENABLE_SLP
     ifeq ($(PEGASUS_ENABLE_SLP),true)
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
     else
       ifneq ($(PEGASUS_ENABLE_SLP),false)
         $(error PEGASUS_ENABLE_SLP ($(PEGASUS_ENABLE_SLP)) invalid, must be true or false)
       endif
     endif
   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
   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
    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
   #
   ifdef PEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
     DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
 endif endif
  
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
Line 294 
Line 701 
 # debug mode. # debug mode.
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
     DEFINES += -DPEGASUS_DEBUG     DEFINES += -DPEGASUS_DEBUG
   
       # Indications debugging options
       ifdef PEGASUS_INDICATION_PERFINST
           DEFINES += -DPEGASUS_INDICATION_PERFINST
       endif
   
       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
 endif endif
  
 # compile in the experimental APIs # compile in the experimental APIs
 DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
   # Ensure that the deprecated interfaces are defined in the Pegasus libraries.
   # One may wish to disable these interfaces if binary compatibility with
   # previous Pegasus releases is not required.
   ifndef PEGASUS_DISABLE_DEPRECATED_INTERFACES
       DEFINES += -DPEGASUS_USE_DEPRECATED_INTERFACES
   endif
   
 # Set compile flag to control compilation of CIMOM statistics # Set compile flag to control compilation of CIMOM statistics
 ifdef PEGASUS_DISABLE_PERFINST ifdef PEGASUS_DISABLE_PERFINST
     FLAGS += -DPEGASUS_DISABLE_PERFINST     FLAGS += -DPEGASUS_DISABLE_PERFINST
 endif endif
  
   # Set compile flag to control compilation of SNIA Extensions
   ifdef PEGASUS_SNIA_EXTENSIONS
       FLAGS += -DPEGASUS_SNIA_EXTENSIONS
   endif
   
   ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
       ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
           FLAGS += -DPEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
       else
           ifneq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), false)
               $(error PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER \
                    ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER)) invalid, \
                     must be true or false)
           endif
       endif
   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
       endif
   endif
   
   # Allow remote CMPI functionality to be enabled
   ifdef PEGASUS_ENABLE_REMOTE_CMPI
       FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI
   endif
   
 ############################################################ ############################################################
 # #
 # Set any vendor-specific compile flags # Set any vendor-specific compile flags
Line 336 
Line 798 
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS     FLAGS += -DPEGASUS_USE_RELEASE_DIRS
 endif endif
  
   ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
       FLAGS += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
   endif
   
 # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
 ifndef PEGASUS_DEST_LIB_DIR ifndef PEGASUS_DEST_LIB_DIR
     PEGASUS_DEST_LIB_DIR = lib     PEGASUS_DEST_LIB_DIR = lib
Line 349 
Line 815 
  
 ################################################################################ ################################################################################
 ## ##
   ## PEGASUS_CLASS_CACHE_SIZE
   ##
   ##     This environment variable gives the size of the class cache used by
   ##     the CIM repository. When it is undefined, the size defaults to something
   ##     relatively small (see src/Pegasus/Repository/CIMRepository.cpp). If
   ##     defined, it gives the size of the class cache. If it is 0 , the class
   ##     cache is not defined compiled in at all.
   ##
   ################################################################################
   
   ifdef PEGASUS_CLASS_CACHE_SIZE
   DEFINES += -DPEGASUS_CLASS_CACHE_SIZE=$(PEGASUS_CLASS_CACHE_SIZE)
   endif
   
   ################################################################################
   ##
 ## Additional build flags passed in through environment variables. ## Additional build flags passed in through environment variables.
 ## These flags are added to the compile/link commands. ## These flags are added to the compile/link commands.
 ## ##
Line 366 
Line 848 
     EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)     EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)
 endif 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
     endif
   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
     endif
   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.86  
changed lines
  Added in v.1.135.2.5
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2