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

Diff for /pegasus/mak/config.mak between version 1.152 and 1.154

version 1.152, 2007/09/12 20:35:02 version 1.154, 2007/10/23 19:17:51
Line 224 
Line 224 
 # 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/CIM2131  
     CIM_SCHEMA_VER=  
 endif  
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
     ALLOW_EXPERIMENTAL = -aE     ALLOW_EXPERIMENTAL = -aE
Line 588 
Line 587 
  
 # #
 # PEP 258 # PEP 258
 # Allow Audit Logger to be disabled  # Allow Audit Logger to be disabled.  It is enabled by default.
 # #
 ifdef PEGASUS_DISABLE_AUDIT_LOGGER  
   ifeq ($(PEGASUS_DISABLE_AUDIT_LOGGER),true)  ifndef PEGASUS_ENABLE_AUDIT_LOGGER
     DEFINES += -DPEGASUS_DISABLE_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   else
     ifneq ($(PEGASUS_DISABLE_AUDIT_LOGGER),false)          ifneq ($(PEGASUS_ENABLE_AUDIT_LOGGER),false)
       $(error PEGASUS_DISABLE_AUDIT_LOGGER ($(PEGASUS_DISABLE_AUDIT_LOGGER)) \              $(error PEGASUS_ENABLE_AUDIT_LOGGER \
        invalid, must be true or false)                ($(PEGASUS_ENABLE_AUDIT_LOGGER)) invalid, must be true or false)
     endif     endif
   endif   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 # PEP 291

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