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

Diff for /pegasus/mak/config.mak between version 1.136 and 1.141.4.2

version 1.136, 2007/01/30 12:55:01 version 1.141.4.2, 2007/07/26 17:28:24
Line 212 
Line 212 
        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif     endif
 else else
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29      CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM2131
     CIM_SCHEMA_VER=     CIM_SCHEMA_VER=
 endif endif
  
Line 456 
Line 456 
 # #
 ifdef PEGASUS_DISABLE_PROV_USERCTXT ifdef PEGASUS_DISABLE_PROV_USERCTXT
     DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT     DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT
 else  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR  
     endif  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED  
     endif  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED  
     endif  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER  
     endif  
 endif endif
  
 # Bug 2147 # Bug 2147
Line 519 
Line 506 
   DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS   DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS
 endif endif
  
 # Allow repository instance filtering to be disabled  
 ifdef PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER  
   ifeq ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER), false)  
     DEFINES += -DPEGASUS_DISABLE_REPOSITORY_INSTANCE_FILTER  
   else  
     ifneq ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER), true)  
       $(error PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER)) invalid, must be true or false)  
     endif  
   endif  
 endif  
   
 # Controls snmp indication handler to use NET-SNMP to deliver trap # Controls snmp indication handler to use NET-SNMP to deliver trap
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
   DEFINES += -DPEGASUS_USE_NET_SNMP   DEFINES += -DPEGASUS_USE_NET_SNMP
Line 720 
Line 696 
 # compile in the experimental APIs # compile in the experimental APIs
 DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
   # control direct access CIM build
   ifeq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)
       DEFINES += -DPEGASUS_USE_DIRECTACCESS_FOR_LOCAL
       DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=1
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_LIB),noshare)
         ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)
            DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=3
         endif
         $(error 'noshare' for PEGASUS_DIRECTACCESS_SHARE_REPOSITORY is also required.)
       else
         ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)
         DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=2
         endif
       endif
       ifndef PEGASUS_USE_EXPERIMENTAL_INTERFACES
           ifneq ($(OS_TYPE),windows)
               $(warning Direct access CIM built  without CIMClient.h experimental interfaces.)
           endif
       endif
   else
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)
         $(error PEGASUS_USE_DIRECTACCESS_FOR_LOCAL must be true for this this noshare option.)
       endif
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_LIB),noshare)
         $(error PEGASUS_USE_DIRECTACCESS_FOR_LOCAL must be true for this this noshare option.)
       endif
   endif
   
   
 # Ensure that the deprecated interfaces are defined in the Pegasus libraries. # Ensure that the deprecated interfaces are defined in the Pegasus libraries.
 # One may wish to disable these interfaces if binary compatibility with # One may wish to disable these interfaces if binary compatibility with
 # previous Pegasus releases is not required. # previous Pegasus releases is not required.
Line 865 
Line 870 
   endif   endif
 endif endif
  
   ##==============================================================================
   ##
   ## PEGASUS_ENABLE_PRIVILEGE_SEPARATION
   ##
   ##     Enables privilege separation support (uses the executor process to
   ##     perform privileged operations).
   ##
   ##==============================================================================
   
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
     ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
       DEFINES += -DPEGASUS_ENABLE_PRIVILEGE_SEPARATION
     else
       ifneq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),false)
         $(error PEGASUS_ENABLE_PRIVILEGE_SEPARATION \
           ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)) invalid, must be true or false)
       endif
     endif
   
     ## Specifies the user context of the cimservermain process when privilege
     ## separation is enabled.
     ifndef PEGASUS_CIMSERVERMAIN_USER
       PEGASUS_CIMSERVERMAIN_USER = pegasus
     endif
     DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"
   endif
   
   ##==============================================================================
   ##
   ## PEGASUS_USE_PAM_STANDALONE_PROC
   ##
   ##==============================================================================
   
   ifdef PEGASUS_USE_PAM_STANDALONE_PROC
     DEFINES += -DPEGASUS_USE_PAM_STANDALONE_PROC
   endif
   
   ##==============================================================================
  
 ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER
     PEGASUS_JAVA_CLASSPATH_DELIMITER = :     PEGASUS_JAVA_CLASSPATH_DELIMITER = :


Legend:
Removed from v.1.136  
changed lines
  Added in v.1.141.4.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2