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

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

version 1.132, 2006/09/29 19:46:46 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 519 
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 582 
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 589 
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

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