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

Diff for /pegasus/mak/config.mak between version 1.183.2.3 and 1.198

version 1.183.2.3, 2010/08/11 11:20:29 version 1.198, 2011/08/11 12:12:33
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 223 
Line 236 
 # ***** # *****
  
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM222      PEGASUS_CIM_SCHEMA=CIM228
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 365 
Line 378 
     endif     endif
 endif endif
  
   
 ifeq ($(PEGASUS_HAS_ICU),true) ifeq ($(PEGASUS_HAS_ICU),true)
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
  
Line 524 
Line 538 
     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 707 
Line 734 
   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 925 
Line 972 
   ## as defined for openslp   ## as defined for openslp
   ifeq ($(PEGASUS_USE_OPENSLP),true)   ifeq ($(PEGASUS_USE_OPENSLP),true)
     ifeq ($(PEGASUS_ENABLE_SLP),true)     ifeq ($(PEGASUS_ENABLE_SLP),true)
       PEGASUS_USE_EXTERNAL_SLP=openslp        export PEGASUS_USE_EXTERNAL_SLP=openslp
       PEGASUS_USE_OPENSLP=       PEGASUS_USE_OPENSLP=
     else     else
       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \
Line 1025 
Line 1072 
     $(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \     $(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \
       Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)       Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)
   else   else
       PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)        export PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)
    endif    endif
 endif endif
 ############################################################################ ############################################################################
Line 1104 
Line 1151 
                 $(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 1183 
Line 1230 
 ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
     ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)     ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
         DEFINES += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER         DEFINES += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
           ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER
               PEGASUS_JAVA_CLASSPATH_DELIMITER = :
           endif
   
           ifndef PEGASUS_JVM
               PEGASUS_JVM = sun
           endif
           ifeq ($(PEGASUS_JVM),gcj)
               PEGASUS_JAVA_COMPILER           = gcj -C
               PEGASUS_JAVA_JAR                = fastjar
               PEGASUS_JAVA_INTERPRETER        = gij
           else
               PEGASUS_JAVA_COMPILER           = javac -target 1.4 -source 1.4
               PEGASUS_JAVA_JAR                = jar
               PEGASUS_JAVA_INTERPRETER        = java
           endif
   
     else     else
         ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)         ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)
             $(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \             $(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \
Line 1297 
Line 1361 
 ##============================================================================== ##==============================================================================
  
 ifdef PEGASUS_USE_STATIC_LIBRARIES ifdef PEGASUS_USE_STATIC_LIBRARIES
   ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)      ifeq ($(OS_TYPE),windows)
           $(error PEGASUS_USE_STATIC_LIBRARIES is not support on windows.)
   else   else
     ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),false)          ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
       $(error PEGASUS_USE_STATIC_LIBRARIES ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true or false)              $(error PEGASUS_USE_STATIC_LIBRARIES \
                   ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true.)
     endif     endif
   endif   endif
 endif endif
Line 1380 
Line 1446 
  
 ##============================================================================== ##==============================================================================
  
 ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER  
     PEGASUS_JAVA_CLASSPATH_DELIMITER = :  
 endif  
   
 ifndef PEGASUS_JVM  
         PEGASUS_JVM = sun  
 endif  
 ifeq ($(PEGASUS_JVM),gcj)  
         PEGASUS_JAVA_COMPILER           = gcj -C  
         PEGASUS_JAVA_JAR                = fastjar  
         PEGASUS_JAVA_INTERPRETER        = gij  
 else  
         PEGASUS_JAVA_COMPILER           = javac -target 1.4 -source 1.4  
         PEGASUS_JAVA_JAR                = jar  
         PEGASUS_JAVA_INTERPRETER        = java  
 endif  
   
 # Disable client timeouts when we're doing a valgrind build # Disable client timeouts when we're doing a valgrind build
 ifdef PEGASUS_TEST_VALGRIND_LOG_DIR ifdef PEGASUS_TEST_VALGRIND_LOG_DIR
     DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND     DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND
Line 1431 
Line 1480 
  
 ##============================================================================== ##==============================================================================
 ## ##
 ## 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 1485 
Line 1513 
     PLATFORM_CORE_PATTERN = core*     PLATFORM_CORE_PATTERN = core*
 endif endif
  
   ifdef PEGASUS_FLAVOR
     ifdef PEGASUS_USE_RELEASE_DIRS
       ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
         $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when both PEGASUS_FLAVOR and PEGASUS_USE_RELEASE_DIRS options are used")
       endif
     endif
     ifneq ($(PEGASUS_FLAVOR), tog)
         DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"
     endif
   endif
   
 ifdef PEGASUS_EXTRA_PROVIDER_LIB_DIR ifdef PEGASUS_EXTRA_PROVIDER_LIB_DIR
    ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS    ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
       $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when PEGASUS_EXTRA_PROVIDER_LIB_DIR defined.")       $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when PEGASUS_EXTRA_PROVIDER_LIB_DIR defined.")
Line 1494 
Line 1533 
    DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"\"    DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"\"
 endif 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
   

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