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

Diff for /pegasus/mak/config.mak between version 1.206 and 1.212

version 1.206, 2013/02/18 15:00:20 version 1.212, 2013/12/16 09:37:27
Line 239 
Line 239 
 ## NOTE: If the default below is changed, please update the definition ## NOTE: If the default below is changed, please update the definition
 ## of default for this variable in pegasus/doc/BuildAndReleaseOptions.html ## of default for this variable in pegasus/doc/BuildAndReleaseOptions.html
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM231      PEGASUS_CIM_SCHEMA=CIM236
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 480 
Line 480 
   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 -DPEGASUS_NOASSERTS
Line 721 
Line 683 
  
 # 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
     ifdef PEGASUS_USE_NET_SNMP      ifeq ($(PEGASUS_USE_NET_SNMP),true)
         PEGASUS_ENABLE_NET_SNMPV3=true         PEGASUS_ENABLE_NET_SNMPV3=true
     else     else
         PEGASUS_ENABLE_NET_SNMPV3=false         PEGASUS_ENABLE_NET_SNMPV3=false
Line 734 
Line 701 
 endif endif
  
 ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true) ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true)
     ifndef PEGASUS_USE_NET_SNMP      ifneq ($(PEGASUS_USE_NET_SNMP),true)
         $(error PEGASUS_USE_NET_SNMP should be set when PEGASUS_ENABLE_NET_SNMPV3 is true)          $(error PEGASUS_USE_NET_SNMP should be set to true when PEGASUS_ENABLE_NET_SNMPV3 is true)
     endif     endif
     DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3     DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3
 else else
Line 1179 
Line 1146 
         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 1399 
Line 1362 
  
 ##============================================================================== ##==============================================================================
 ## ##
   ## 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 1484 
Line 1482 
   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

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