(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.1 and 1.204

version 1.195.2.1, 2011/10/11 18:17:56 version 1.204, 2012/08/09 10:32:17
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=CIM228      PEGASUS_CIM_SCHEMA=CIM231
 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 1441 
Line 1431 
 ##============================================================================== ##==============================================================================
  
 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 1542 
 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.1  
changed lines
  Added in v.1.204

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2