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

Diff for /pegasus/mak/config.mak between version 1.195.2.6 and 1.196

version 1.195.2.6, 2014/05/05 16:47:43 version 1.196, 2011/01/20 13:08:18
Line 33 
Line 33 
 ## ##
 ################################################################################ ################################################################################
  
 #PEGASUS_ROOT is mandatory currently  ifndef ROOT
 ifdef PEGASUS_ROOT  
   ifeq ($(wildcard $(PEGASUS_ROOT)),)  
     $(error PEGASUS_ROOT = $(PEGASUS_ROOT) is incorrect, \  
       Did you meant to set it to $(CURDIR)?)  
   endif  
   ROOT =  $(subst \,/,$(PEGASUS_ROOT))   ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 else  
   $(error PEGASUS_ROOT environment variable undefined)  
 endif endif
  
   
 ifdef PEGASUS_ENVVAR_FILE ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)     include $(PEGASUS_ENVVAR_FILE)
 else else
Line 57 
Line 49 
     $(error PEGASUS_HOME environment variable undefined)     $(error PEGASUS_HOME environment variable undefined)
 endif endif
  
   ifdef PEGASUS_ROOT
       ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   else
       $(error PEGASUS_ROOT environment variable undefined)
   endif
  
 ifdef PEGASUS_TMP ifdef PEGASUS_TMP
     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 238 
Line 235 
 # option of the mof compiler needs to be set. # option of the mof compiler needs to be set.
 # ***** # *****
  
 ## Sets default CIM Schema if PEGASUS_CIM_SCHEMA not defined.  
 ## NOTE: If the default below is changed, please update the definition  
 ## of default for this variable in pegasus/doc/BuildAndReleaseOptions.html  
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM236      PEGASUS_CIM_SCHEMA=CIM225
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 388 
Line 382 
 ifeq ($(PEGASUS_HAS_ICU),true) ifeq ($(PEGASUS_HAS_ICU),true)
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
  
       ##################################
       ##
       ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root
       ## resource bundle, default is to uppercase the root resource bundle
       ##
       ##################################
   
       ifdef ICU_NO_UPPERCASE_ROOT
           CNV_ROOT_FLAGS =
       else
           CNV_ROOT_FLAGS = -u
       endif
   
     ####################################     ####################################
     ##     ##
     ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root     ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root
Line 483 
Line 490 
   DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)   DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)
 endif 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. # Allow PEGASUS_ASSERT statements to be disabled.
 ifdef PEGASUS_NOASSERTS ifdef PEGASUS_NOASSERTS
     DEFINES += -DNDEBUG -DPEGASUS_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 686 
Line 731 
  
 # Controls snmp indication handler to use NET-SNMP to deliver trap # Controls snmp indication handler to use NET-SNMP to deliver trap
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
    ifeq ($(PEGASUS_USE_NET_SNMP),true)  
       DEFINES += -DPEGASUS_USE_NET_SNMP       DEFINES += -DPEGASUS_USE_NET_SNMP
    else  
       ifneq ($(PEGASUS_USE_NET_SNMP),false)  
          $(error PEGASUS_USE_NET_SNMP ($(PEGASUS_USE_NET_SNMP)) invalid, must be true or false)  
       endif  
    endif  
 endif endif
   
 # Controls snmp indication handler to use NET-SNMP V3 features. # Controls snmp indication handler to use NET-SNMP V3 features.
 ifndef PEGASUS_ENABLE_NET_SNMPV3 ifndef PEGASUS_ENABLE_NET_SNMPV3
     ifeq ($(PEGASUS_USE_NET_SNMP),true)      ifdef PEGASUS_USE_NET_SNMP
        PEGASUS_ENABLE_NET_SNMPV3=true        PEGASUS_ENABLE_NET_SNMPV3=true
     else     else
         PEGASUS_ENABLE_NET_SNMPV3=false         PEGASUS_ENABLE_NET_SNMPV3=false
Line 704 
Line 744 
 endif endif
  
 ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true) ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true)
     ifneq ($(PEGASUS_USE_NET_SNMP),true)      ifndef PEGASUS_USE_NET_SNMP
         $(error PEGASUS_USE_NET_SNMP should be set to true when PEGASUS_ENABLE_NET_SNMPV3 is true)          $(error PEGASUS_USE_NET_SNMP should be set when PEGASUS_ENABLE_NET_SNMPV3 is true)
     endif     endif
     DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3     DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3
 else else
Line 1111 
Line 1151 
                 $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if DMTF Indications profile support is enabled)                 $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if DMTF Indications profile support is enabled)
             endif             endif
         endif         endif
         DEFINES += -DPEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT -DPEGASUS_ENABLE_INDICATION_ORDERING          DEFINES += -DPEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
     else     else
         ifneq ($(PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT),false)         ifneq ($(PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT),false)
             $(error PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT ($(PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT)) invalid, must be true or false)             $(error PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT ($(PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT)) invalid, must be true or false)
Line 1149 
Line 1189 
         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 1217 
Line 1261 
     DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI     DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI
 endif endif
  
   ############################################################
   #
   # Set any vendor-specific compile flags
   #
   ############################################################
   
   ifdef PEGASUS_VENDOR_HP
       DEFINES+= -DPEGASUS_VENDOR_HP
   endif
   
  
 ############################################################ ############################################################
 # #
Line 1365 
Line 1419 
  
 ##============================================================================== ##==============================================================================
 ## ##
 ## PEGASUS_PAM_SESSION_SECURITY  
 ##  
 ## This is a new method to handle authentication with PAM in case it is required  
 ## to keep the PAM session established by pam_start() open across an  
 ## entire CIM request.  
 ##  
 ## This feature contradicts PEGASUS_PAM_AUTHENTICATION and  
 ## PEGASUS_USE_PAM_STANDALONE_PROC  
 ## Because of the additional process this feature is not compatible with  
 ## Privilege Separation.  
 ##  
 ##==============================================================================  
   
 ifeq ($(PEGASUS_PAM_SESSION_SECURITY),true)  
     ifdef PEGASUS_PAM_AUTHENTICATION  
         $(error "PEGASUS_PAM_AUTHENTICATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     ifdef PEGASUS_USE_PAM_STANDALONE_PROC  
         $(error "PEGASUS_USE_PAM_STANDALONE_PROC must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  
         $(error "PEGASUS_ENABLE_PRIVILEGE_SEPARATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     # Compile in the code required for PAM  
     # and compile out the code that uses the password file.  
     DEFINES += -DPEGASUS_PAM_SESSION_SECURITY -DPEGASUS_NO_PASSWORDFILE  
     # Link with libpam only where it is needed.  
     ifeq ($(HAS_PAM_DEPENDENCY),true)  
         SYS_LIBS += -lpam  
     endif  
 endif  
   
   
 ##==============================================================================  
 ##  
 ## PEGASUS_PAM_AUTHENTICATION ## PEGASUS_PAM_AUTHENTICATION
 ## ##
 ##============================================================================== ##==============================================================================
Line 1422 
Line 1441 
 ##============================================================================== ##==============================================================================
  
 ifdef PEGASUS_USE_PAM_STANDALONE_PROC ifdef PEGASUS_USE_PAM_STANDALONE_PROC
    ifndef PEGASUS_PAM_AUTHENTICATION  
        $(error "PEGASUS_PAM_AUTHENTICATION must be defined when PEGASUS_USE_PAM_STANDALONE_PROC is defined")  
    endif  
    DEFINES += -DPEGASUS_USE_PAM_STANDALONE_PROC    DEFINES += -DPEGASUS_USE_PAM_STANDALONE_PROC
 endif endif
  
Line 1485 
Line 1501 
   endif   endif
 endif endif
  
   
 ##==============================================================================  
 ##  
 ## PEGASUS_ENABLE_PROTOCOL_WEB  
 ##  
 ##     Enables the GET-Method for files in order to act as a web-server  
 ##  
 ##  
 ##  
 ##  
 ##==============================================================================  
 ifndef PEGASUS_ENABLE_PROTOCOL_WEB  
   PEGASUS_ENABLE_PROTOCOL_WEB = true  
 endif  
   
 ifeq ($(PEGASUS_ENABLE_PROTOCOL_WEB),true)  
   DEFINES += -DPEGASUS_ENABLE_PROTOCOL_WEB  
 else  
   ifneq ($(PEGASUS_ENABLE_PROTOCOL_WEB),false)  
     $(error "PEGASUS_ENABLE_PROTOCOL_WEB must be true or false")  
   endif  
 endif  
   
 ## ====================================================================== ## ======================================================================
 ## ##
 ## PLATFORM_CORE_PATTERN ## PLATFORM_CORE_PATTERN
Line 1556 
Line 1549 
 DEFINES += -DPEGASUS_INITIAL_THREADSTACK_SIZE=$(PEGASUS_INITIAL_THREADSTACK_SIZE) DEFINES += -DPEGASUS_INITIAL_THREADSTACK_SIZE=$(PEGASUS_INITIAL_THREADSTACK_SIZE)
 endif endif
  
 ifndef PEGASUS_INTEROP_NAMESPACE  
     PEGASUS_INTEROP_NAMESPACE=root/PG_InterOp  
 else  
 ifeq ($(PEGASUS_INTEROP_NAMESPACE),root/interop)  
 DEFINES += -DNS_ROOT_INTEROP  
     endif  
 ifeq ($(PEGASUS_INTEROP_NAMESPACE),interop)  
 DEFINES += -DNS_INTEROP  
 endif  
 endif  
   
 ##These namespaces will be used in Makefiles.  
   
 NAMESPACE_INTEROP = interop  
   
 NAMESPACE_ROOT_INTEROP = root/interop  

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