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

Diff for /pegasus/mak/config.mak between version 1.122.2.1 and 1.133.2.1

version 1.122.2.1, 2006/03/14 21:06:36 version 1.133.2.1, 2006/10/10 04:10:31
Line 57 
Line 57 
     $(error PEGASUS_ROOT environment variable undefined)     $(error PEGASUS_ROOT environment variable undefined)
 endif endif
  
   
 # l10n # l10n
 ifdef ICU_ROOT ifdef ICU_ROOT
     ICUROOT =  $(subst \,/,$(ICU_ROOT))     ICUROOT =  $(subst \,/,$(ICU_ROOT))
Line 371 
Line 372 
 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 436 
 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 473 
Line 484 
     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
 endif endif
  
   # PEP 233
   # Controls support for EmbeddedInstance properties
   # and parameters
   ifndef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
       PEGASUS_EMBEDDED_INSTANCE_SUPPORT = true
   endif
   
   ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)
       DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT
   else
       ifneq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), false)
           $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)
       endif
   endif
   
   
 # Allow ExecQuery functionality to be enabled # Allow ExecQuery functionality to be enabled
 ifndef PEGASUS_ENABLE_EXECQUERY ifndef PEGASUS_ENABLE_EXECQUERY
     DEFINES += -DPEGASUS_DISABLE_EXECQUERY     DEFINES += -DPEGASUS_DISABLE_EXECQUERY
Line 493 
Line 520 
   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 556 
Line 594 
   endif   endif
 endif endif
  
   ifdef PEGASUS_USE_OPENSLP
     ifdef PEGASUS_SLP_REG_TIMEOUT
       $(error Conflicting defines PEGASUS_USE_OPENSLP and PEGASUS_SLP_REG_TIMEOUT both set)
     endif
   endif
   
 ifdef PEGASUS_DISABLE_SLP ifdef PEGASUS_DISABLE_SLP
     $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )     $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )
  
Line 563 
Line 607 
  
 endif endif
  
   ifdef PEGASUS_SLP_REG_TIMEOUT
      ifeq ($(PEGASUS_ENABLE_SLP),true)
         DEFINES += -DPEGASUS_SLP_REG_TIMEOUT
       else
         $(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)
       endif
   endif
   
   
   
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
   ifeq ($(PEGASUS_ENABLE_SLP),true)   ifeq ($(PEGASUS_ENABLE_SLP),true)
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
Line 647 
Line 701 
     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 681 
Line 740 
     endif     endif
 endif endif
  
   ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
       ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
           FLAGS += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
       else
           ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)
               $(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \
                    ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER)) invalid, \
                     must be true or false)
           endif
       endif
   endif
   
 # Allow remote CMPI functionality to be enabled # Allow remote CMPI functionality to be enabled
 ifdef PEGASUS_ENABLE_REMOTE_CMPI ifdef PEGASUS_ENABLE_REMOTE_CMPI
     FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI     FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI
Line 768 
Line 839 
     EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)     EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)
 endif endif
  
   ##==============================================================================
   ##
   ## By definining PEGASUS_USE_STATIC_LIBRARIES in the environment and STATIC
   ## in the Makefile, a static library is produced rather than a shared one.
   ## PEGASUS_USE_STATIC_LIBRARIES should be "true" or "false".
   ##
   ##==============================================================================
   
   ifdef PEGASUS_USE_STATIC_LIBRARIES
     ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
     else
       ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),false)
         $(error PEGASUS_USE_STATIC_LIBRARIES ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true or false)
       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.122.2.1  
changed lines
  Added in v.1.133.2.1
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2