(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.133.2.2

version 1.133.2.1, 2006/10/10 04:10:31 version 1.133.2.2, 2006/10/23 09:15:48
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 594 
Line 593 
   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 600 
  
 endif endif
  
   # PEP 267
   # SLP reregistration support.
 ifdef PEGASUS_SLP_REG_TIMEOUT ifdef PEGASUS_SLP_REG_TIMEOUT
    ifeq ($(PEGASUS_ENABLE_SLP),true)    ifeq ($(PEGASUS_ENABLE_SLP),true)
       DEFINES += -DPEGASUS_SLP_REG_TIMEOUT        DEFINES += -DPEGASUS_SLP_REG_TIMEOUT=$(PEGASUS_SLP_REG_TIMEOUT)
     else     else
       $(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)       $(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)
     endif     endif


Legend:
Removed from v.1.133.2.1  
changed lines
  Added in v.1.133.2.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2