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

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

version 1.133.2.1, 2006/10/10 04:10:31 version 1.134, 2006/10/17 21:24:43
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 571 
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 594 
Line 608 
   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 607 
Line 615 
  
 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.133.2.1  
changed lines
  Added in v.1.134

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2