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

Diff for /pegasus/mak/config.mak between version 1.135.4.3 and 1.138.2.2

version 1.135.4.3, 2008/01/09 05:55:50 version 1.138.2.2, 2007/05/09 18:48:22
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 584 
Line 560 
   endif   endif
 endif endif
  
   
 #  
 # PEP 291  
 # Enable IPv6 support  
 #  
   
 ifndef PEGASUS_ENABLE_IPV6  
     PEGASUS_ENABLE_IPV6 = false  
 endif  
   
 # Check for Enable IPv6 support  
 ifdef PEGASUS_ENABLE_IPV6  
   ifeq ($(PEGASUS_ENABLE_IPV6),true)  
     DEFINES += -DPEGASUS_ENABLE_IPV6  
   else  
     ifneq ($(PEGASUS_ENABLE_IPV6),false)  
       $(error PEGASUS_ENABLE_IPV6 ($(PEGASUS_ENABLE_IPV6)) \  
        invalid, must be true or false)  
     endif  
   endif  
 endif  
   
 # Verify Test IPv6 support  
 # If PEGASUS_ENABLE_IPV6 is defined and PEGASUS_TEST_IPV6 is not defined, we set  
 # PEGASUS_TEST_IPV6 to the same value as PEGASUS_ENABLE_IPV6.  
 # You can explicitly set PEGASUS_TEST_IPV6 to false if you don't want to run the  
 # IPv6 tests (for example, on an IPv4 system that is running an IPv6-enabled  
 # version of Pegasus).  
 #  
 ifdef PEGASUS_TEST_IPV6  
   ifneq ($(PEGASUS_TEST_IPV6),true)  
     ifneq ($(PEGASUS_TEST_IPV6),false)  
       $(error PEGASUS_TEST_IPV6 ($(PEGASUS_TEST_IPV6)) \  
        invalid, must be true or false)  
     endif  
   endif  
 else  
   PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)  
 endif  
   
   
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
Line 906 
Line 841 
   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.
     ifdef PEGASUS_CIMSERVERMAIN_USER
       DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"
     endif
   
   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.135.4.3  
changed lines
  Added in v.1.138.2.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2