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

Diff for /pegasus/mak/config.mak between version 1.191 and 1.204

version 1.191, 2010/07/09 11:24:50 version 1.204, 2012/08/09 10:32:17
Line 105 
Line 105 
 ## ##
  
 ifndef ALT_OBJ_DIR ifndef ALT_OBJ_DIR
     ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
       OBJ_DIR = $(HOME_DIR)/obj32/$(DIR)
     else
     OBJ_DIR = $(HOME_DIR)/obj/$(DIR)     OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
     endif
   else
     ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
       OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)32
 else else
     OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)     OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)
 endif endif
   endif
  
 ############################################################################# #############################################################################
  
Line 118 
Line 126 
 else else
     BIN_DIR = $(HOME_DIR)/bin     BIN_DIR = $(HOME_DIR)/bin
 endif endif
   
   ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
     LIB_DIR = $(HOME_DIR)/lib32
   else
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
   endif
  
 # l10n # l10n
 # define the location for the compiled messages # define the location for the compiled messages
Line 222 
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=CIM231
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 369 
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 525 
Line 528 
     DEFINES += -DPEGASUS_REMOVE_TRACE     DEFINES += -DPEGASUS_REMOVE_TRACE
 endif endif
  
   
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
      PLATFORM_FILE_32 = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT).mak
      ifeq ($(wildcard $(PLATFORM_FILE_32)), )
         $(error  PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT  environment variable must be set to one of\
           the following:$(VALID_PLATFORMS))
      endif
        DEFINES += -DPEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
      ifdef PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR
          DEFINES += -DPEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR=\"$(PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR)\"
      endif
   endif
   
 # PEP 315 # PEP 315
 # Control whether compile with or without method entertexit trace code. # Control whether compile with or without method entertexit trace code.
 # A value other than 'true' or 'false' will cause a make error. # A value other than 'true' or 'false' will cause a make error.
Line 708 
Line 724 
   DEFINES += -DPEGASUS_USE_NET_SNMP   DEFINES += -DPEGASUS_USE_NET_SNMP
 endif endif
  
   # Controls snmp indication handler to use NET-SNMP V3 features.
   ifndef PEGASUS_ENABLE_NET_SNMPV3
       ifdef PEGASUS_USE_NET_SNMP
           PEGASUS_ENABLE_NET_SNMPV3=true
       else
           PEGASUS_ENABLE_NET_SNMPV3=false
       endif
   endif
   
   ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true)
       ifndef PEGASUS_USE_NET_SNMP
           $(error PEGASUS_USE_NET_SNMP should be set when PEGASUS_ENABLE_NET_SNMPV3 is true)
       endif
       DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3
   else
       ifneq ($(PEGASUS_ENABLE_NET_SNMPV3),false)
           $(error PEGASUS_ENABLE_NET_SNMPV3 ($(PEGASUS_ENABLE_NET_SNMPV3)) invalid, must be true or false)
       endif
   endif
   
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
     DEFINES += -DPEGASUS_HAS_SSL     DEFINES += -DPEGASUS_HAS_SSL
  
Line 1105 
Line 1141 
                 $(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 1395 
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 1434 
Line 1473 
  
 ##============================================================================== ##==============================================================================
 ## ##
 ## PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY  
 ##  
 ##     Enable binary protocol between cimserver and out-of-process providers.  
 ##     By default this feature is enabled.  
 ##  
 ##==============================================================================  
   
 ifndef PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY  
   PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY=true  
 endif  
   
 ifeq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),true)  
   DEFINES += -DPEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY  
 else  
   ifneq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),false)  
     $(error "PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY must be true or false")  
   endif  
 endif  
   
 ##==============================================================================  
 ##  
 ## PEGASUS_ENABLE_PROTOCOL_BINARY ## PEGASUS_ENABLE_PROTOCOL_BINARY
 ## ##
 ##     Enables the binary protocol between clients and cimserver. With provider ##     Enables the binary protocol between clients and cimserver. With provider
Line 1498 
Line 1516 
       DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"       DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"
   endif   endif
 endif endif
   
   ifdef PEGASUS_EXTRA_PROVIDER_LIB_DIR
      ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
         $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when PEGASUS_EXTRA_PROVIDER_LIB_DIR defined.")
      endif
      DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"$(PEGASUS_EXTRA_PROVIDER_LIB_DIR):\"
   else
      DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"\"
   endif
   
   ################################################################################
   ##
   ## PEGASUS_INITIAL_THREADSTACK_SIZE
   ##
   ##     This environment variable sets the initial size of the stack on new threads.
   ##     When it is undefined, the size defaults to something relatively small
   ##     (see src/Pegasus/Common/Config.h or if overridden by platform see
   ##      src/Pegasus/Common/Platform_$(PEGASUS_PLATFORM).h).
   ##     Value is specified in number of bytes.
   ##
   ################################################################################
   
   ifdef PEGASUS_INITIAL_THREADSTACK_SIZE
   DEFINES += -DPEGASUS_INITIAL_THREADSTACK_SIZE=$(PEGASUS_INITIAL_THREADSTACK_SIZE)
   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.191  
changed lines
  Added in v.1.204
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2