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

Diff for /pegasus/mak/config.mak between version 1.116 and 1.159

version 1.116, 2006/01/25 20:50:30 version 1.159, 2008/03/24 16:11:20
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// 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 #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 55 
Line 57 
     $(error PEGASUS_ROOT environment variable undefined)     $(error PEGASUS_ROOT environment variable undefined)
 endif endif
  
   ############################################################################
   # OpenPegasus relies on the existence of an external set of libraries to
   # support localized messages.  Today, the only supported package is
   # the International Components for Unicode (ICU) OSS project,
   # http://oss.software.ibm.com/icu.  If PEGASUS_HAS_ICU is true,
   # OpenPegasus will use the ICU library.
   #
   # ICU_ROOT points to the root directory of the ICU source tree.  If set,
   # the OpenPegasus build will use this variable to locate the ICU include
   # files. If not set, the ICU include files are expected to be installed
   # in directories that are searched by default.
   #
   # ICU_INSTALL points to the directory containing the ICU libraries.
   # If set, the OpenPegasus will use this variable to locate the ICU
   # libraries.  If not set, the ICU libraries are expected to be installed
   # in a directory that is searched by default.
   #
   # If PEGASUS_HAS_ICU is not set and either ICU_ROOT or ICU_INSTALL is
   # set, the value of PEGASUS_HAS_ICU will be set to true.
   ############################################################################
   ifdef PEGASUS_HAS_ICU
       ifneq ($(PEGASUS_HAS_ICU),true)
           ifneq ($(PEGASUS_HAS_ICU),false)
               $(error PEGASUS_HAS_ICU ($(PEGASUS_HAS_ICU)) \
                   invalid, must be true or false)
           endif
       endif
   else
       ifdef ICU_ROOT
           PEGASUS_HAS_ICU = true
       else
           ifdef ICU_INSTALL
               PEGASUS_HAS_ICU = true
           endif
       endif
   endif
   
   ifdef PEGASUS_HAS_MESSAGES
       ifneq ($(PEGASUS_HAS_ICU),true)
           $(error Support for localized messages in OpenPegasus \
               requires PEGASUS_HAS_ICU to be true)
       endif
   endif
   
 # l10n # l10n
 ifdef ICU_ROOT ifdef ICU_ROOT
     ICUROOT =  $(subst \,/,$(ICU_ROOT))     ICUROOT =  $(subst \,/,$(ICU_ROOT))
Line 87 
Line 133 
  
 ################################################################################ ################################################################################
 ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU) ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU)
       ifdef CXX
         GCC_VERSION = $(shell $(CXX) -dumpversion)
       else
     GCC_VERSION = $(shell g++ -dumpversion)     GCC_VERSION = $(shell g++ -dumpversion)
       endif
 else else
     GCC_VERSION =     GCC_VERSION =
 endif 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) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
   else
       OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)
   endif
   
   #############################################################################
   
   ifdef PEGASUS_TEST_VALGRIND_LOG_DIR
       BIN_DIR = $(HOME_DIR)/bin_exe
       VALGRIND_SCRIPT_BIN_DIR = $(HOME_DIR)/bin
   else
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
   endif
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
  
 # l10n # l10n
Line 198 
Line 273 
 # option of the mof compiler needs to be set. # option of the mof compiler needs to be set.
 # ***** # *****
  
 ifdef PEGASUS_CIM_SCHEMA  ifndef PEGASUS_CIM_SCHEMA
       PEGASUS_CIM_SCHEMA=CIM2131
   endif
   
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
     ifeq ($(findstring $(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA))),1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 271 28),)     ifeq ($(findstring $(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA))),1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 271 28),)
        CIM_SCHEMA_VER=        CIM_SCHEMA_VER=
     else     else
        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif     endif
 else  
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29  
     CIM_SCHEMA_VER=  
 endif  
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
     ALLOW_EXPERIMENTAL = -aE     ALLOW_EXPERIMENTAL = -aE
Line 365 
Line 439 
 endif endif
  
  
 # Setup the conditional compile for client displays.  
 #  
 ifdef PEGASUS_CLIENT_TRACE_ENABLE  
     DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE  
 endif  
   
 # Allow PEGASUS_ASSERT statements to be disabled. # Allow PEGASUS_ASSERT statements to be disabled.
 ifdef PEGASUS_NOASSERTS ifdef PEGASUS_NOASSERTS
     DEFINES += -DNDEBUG     DEFINES += -DNDEBUG
Line 401 
Line 469 
     DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION     DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
 endif endif
  
   ############################################################################
   #
   # PEGASUS_ENABLE_CQL and PEGASUS_DISABLE_CQL
   # Set to enable CQL processor in indication subscriptions and query execution
   # PEGASUS_DISABLE_CQL (PEP 193) has been depracated. New use model is:
   #
   # Use PEGASUS_ENABLE_CQL=true  to enable  compilation of CQL functions.
 # #
 # PEP 193  # Use PEGASUS_ENABLE_CQL=false to disable compilation of CQL functions.
 # The following flag need to be set to disable  
 # CQL in indication subscriptions  
 # #
   # Default is PEGASUS_ENABLE_CQL=true if not defined external to config.mak
   #
   
 ifdef PEGASUS_DISABLE_CQL ifdef PEGASUS_DISABLE_CQL
     DEFINES += -DPEGASUS_DISABLE_CQL      $(error PEGASUS_DISABLE_CQL has been deprecated. Please use PEGASUS_ENABLE_CQL=[true/false]
   endif
   
   ifndef PEGASUS_ENABLE_CQL
       # Default is true. CQL is enabled normally on all platforms unless specifically defined
       PEGASUS_ENABLE_CQL=true
 endif endif
  
   ifeq ($(PEGASUS_ENABLE_CQL),true)
       DEFINES += -DPEGASUS_ENABLE_CQL
   else
       ifneq ($(PEGASUS_ENABLE_CQL),false)
           $(error PEGASUS_ENABLE_CQL ($(PEGASUS_ENABLE_CQL)) invalid, must be true or false)
       endif
   endif
   
   ############################################################################
 # #
   # PEGASUS_OVERRIDE_PRODUCT_ID
 # PEP 186 # PEP 186
 # Allow override of product name/version/status.  A file # Allow override of product name/version/status.  A file
 # pegasus/src/Pegasus/Common/ProductVersion.h must exist when this # pegasus/src/Pegasus/Common/ProductVersion.h must exist when this
Line 435 
Line 526 
 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.
 # #
 ifdef PEGASUS_DISABLE_PROV_USERCTXT ifdef PEGASUS_DISABLE_PROV_USERCTXT
     DEFINES += -DPEGASUS_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  
 endif endif
  
 # Bug 2147 # Bug 2147
Line 467 
Line 561 
     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 492 
Line 602 
   DEFINES += -DPEGASUS_USE_NET_SNMP   DEFINES += -DPEGASUS_USE_NET_SNMP
 endif endif
  
   ifdef PEGASUS_HAS_SSL
       DEFINES += -DPEGASUS_HAS_SSL
   
       # 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
           endif
       endif
   
       ifndef OPENSSL_COMMAND
           ifdef OPENSSL_BIN
               OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl
           else
               OPENSSL_COMMAND = openssl
           endif
       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)
               DEFINES += -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.  It is enabled by default.
   #
   
   ifndef PEGASUS_ENABLE_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_ENABLE_AUDIT_LOGGER),false)
               $(error PEGASUS_ENABLE_AUDIT_LOGGER \
                 ($(PEGASUS_ENABLE_AUDIT_LOGGER)) invalid, must be true or false)
           endif
       endif
   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
   
   
   #
   # 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
     endif
   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
     endif
   else
     PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)
   endif
   
   ############################################################################
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
Line 533 
Line 765 
   endif   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 # Enable this flag to allow the handshake to continue regardless of verification result
 # #
Line 540 
Line 833 
   DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT   DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
 endif 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
           endif
       endif
   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
       endif
   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
       endif
   endif
   
   
   ############################################################################
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
 # Note that this flag is the general separator between # Note that this flag is the general separator between
 # debug compiles and non-debug compiles and controls both # debug compiles and non-debug compiles and controls both
Line 557 
Line 898 
     ifdef PEGASUS_INDICATION_HASHTRACE     ifdef PEGASUS_INDICATION_HASHTRACE
         DEFINES += -DPEGASUS_INDICATION_HASHTRACE         DEFINES += -DPEGASUS_INDICATION_HASHTRACE
     endif     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
Line 571 
Line 917 
  
 # 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      DEFINES += -DPEGASUS_DISABLE_PERFINST
 endif endif
  
 # Set compile flag to control compilation of SNIA Extensions # Set compile flag to control compilation of SNIA Extensions
 ifdef PEGASUS_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)
           DEFINES += -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)
           DEFINES += -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 endif
  
 # Allow remote CMPI functionality to be enabled # Allow remote CMPI functionality to be enabled
 ifdef PEGASUS_ENABLE_REMOTE_CMPI ifdef PEGASUS_ENABLE_REMOTE_CMPI
     FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI      DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI
 endif endif
  
 ############################################################ ############################################################
Line 609 
Line 979 
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
 ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
     FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS      DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS
 endif endif
  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS      DEFINES += -DPEGASUS_USE_RELEASE_DIRS
 endif endif
  
 ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
     FLAGS += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS      DEFINES += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
 endif endif
  
 # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
Line 666 
Line 1036 
     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
   
     ## Defines the user context of the cimservermain process when privilege
     ## separation is enabled.
     PEGASUS_CIMSERVERMAIN_USER = cimsrvr
     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
   
   # Disable client timeouts when we're doing a valgrind build
   ifdef PEGASUS_TEST_VALGRIND_LOG_DIR
       DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND
   endif
   

Legend:
Removed from v.1.116  
changed lines
  Added in v.1.159
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2