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

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

version 1.196, 2011/01/20 13:08:18 version 1.208, 2013/05/02 09:31:01
Line 235 
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=CIM225      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 382 
Line 385 
 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 490 
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      DEFINES += -DNDEBUG -DPEGASUS_NOASSERTS
 endif endif
  
 # do not compile trace code. sometimes it causes problems debugging # do not compile trace code. sometimes it causes problems debugging
Line 1151 
Line 1103 
                 $(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          DEFINES += -DPEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT -DPEGASUS_ENABLE_INDICATION_ORDERING
     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 1261 
Line 1213 
     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 1441 
Line 1383 
 ##============================================================================== ##==============================================================================
  
 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 1549 
Line 1494 
 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.196  
changed lines
  Added in v.1.208

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2