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

Diff for /pegasus/mak/config.mak between version 1.126 and 1.134

version 1.126, 2006/06/19 20:47:30 version 1.134, 2006/10/17 21:24:43
Line 371 
Line 371 
 endif endif
  
  
 # Setup the conditional compile for client displays.  
 #  
 ifdef PEGASUS_CLIENT_TRACE_ENABLE  
     DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE  
 endif  
   
 # Allow PEGASUS_ASSERT statements to be disabled. # Allow PEGASUS_ASSERT statements to be disabled.
 ifdef PEGASUS_NOASSERTS ifdef PEGASUS_NOASSERTS
     DEFINES += -DNDEBUG     DEFINES += -DNDEBUG
Line 441 
Line 435 
 endif endif
  
 # #
   # Allow to define the default value for the Provider User Context
   # property as REQUESTOR.
   # If is set and true use REQUESTOR
   # If is not set or false use PRIVILEGED
   #
   ifdef PEGASUS_DEFAULT_USERCTXT_REQUESTOR
     ifeq ($(PEGASUS_DEFAULT_USERCTXT_REQUESTOR),true)
       DEFINES += -DPEGASUS_DEFAULT_USERCTXT_REQUESTOR
     else
       ifneq ($(PEGASUS_DEFAULT_USERCTXT_REQUESTOR),false)
         $(error PEGASUS_DEFAULT_USERCTXT_REQUESTOR ($(PEGASUS_DEFAULT_USERCTXT_REQUESTOR)) invalid, must be true or false)
       endif
     endif
   endif
   
   #
 # PEP 197 # PEP 197
 # Allow the Provider User Context feature to be disabled. # Allow the Provider User Context feature to be disabled.
 # #
Line 476 
Line 486 
 # PEP 233 # PEP 233
 # Controls support for EmbeddedInstance properties # Controls support for EmbeddedInstance properties
 # and parameters # and parameters
 ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  ifndef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
       PEGASUS_EMBEDDED_INSTANCE_SUPPORT = true
   endif
   
     ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)     ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)
         DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT         DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT
     else     else
Line 484 
Line 497 
             $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)             $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)
         endif         endif
     endif     endif
 endif  
  
 # Allow ExecQuery functionality to be enabled # Allow ExecQuery functionality to be enabled
 ifndef PEGASUS_ENABLE_EXECQUERY ifndef PEGASUS_ENABLE_EXECQUERY
Line 506 
Line 519 
   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 546 
Line 570 
 endif endif
  
 # #
   # PEP 258
   # Allow Audit Logger to be disabled
   #
   ifdef PEGASUS_DISABLE_AUDIT_LOGGER
     ifeq ($(PEGASUS_DISABLE_AUDIT_LOGGER),true)
       DEFINES += -DPEGASUS_DISABLE_AUDIT_LOGGER
     else
       ifneq ($(PEGASUS_DISABLE_AUDIT_LOGGER),false)
         $(error PEGASUS_DISABLE_AUDIT_LOGGER ($(PEGASUS_DISABLE_AUDIT_LOGGER)) \
          invalid, must be true or false)
       endif
     endif
   endif
   
   #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
 # PEGASUS_DISABLE_SLP has been depracated. New use model is: # PEGASUS_DISABLE_SLP has been depracated. New use model is:
Line 660 
Line 699 
     ifdef PEGASUS_INDICATION_HASHTRACE     ifdef PEGASUS_INDICATION_HASHTRACE
         DEFINES += -DPEGASUS_INDICATION_HASHTRACE         DEFINES += -DPEGASUS_INDICATION_HASHTRACE
     endif     endif
   
       # Setup the conditional compile for client displays.
       ifdef PEGASUS_CLIENT_TRACE_ENABLE
           DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE
       endif
 endif endif
  
 # compile in the experimental APIs # compile in the experimental APIs
Line 809 
Line 853 
     endif     endif
   endif   endif
 endif endif
   
   
   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

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