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

Diff for /pegasus/mak/config.mak between version 1.111 and 1.114

version 1.111, 2005/12/14 22:15:31 version 1.114, 2006/01/20 19:59:01
Line 419 
Line 419 
 # PEP 72 # PEP 72
 # Allow Out-of-Process Providers to be disabled by default # Allow Out-of-Process Providers to be disabled by default
 # #
 ifdef PEGASUS_DEFAULT_OOP_ON  ifdef PEGASUS_DEFAULT_ENABLE_OOP
   ifeq ($(PEGASUS_DEFAULT_OOP_ON),true)    ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
     DEFINES += -DPEGASUS_DEFAULT_OOP_ON      DEFINES += -DPEGASUS_DEFAULT_ENABLE_OOP
   else   else
     ifneq ($(PEGASUS_DEFAULT_OOP_ON),false)      ifneq ($(PEGASUS_DEFAULT_ENABLE_OOP),false)
       $(error PEGASUS_DEFAULT_OOP_ON ($(PEGASUS_DEFAULT_OOP_ON)) invalid, must be true or false)        $(error PEGASUS_DEFAULT_ENABLE_OOP ($(PEGASUS_DEFAULT_ENABLE_OOP)) invalid, must be true or false)
     endif     endif
   endif   endif
 endif endif
Line 490 
Line 490 
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
 # Use PEGASUS_ENABLE_SLP to enable SLP functions in the Pegasus standard  # PEGASUS_DISABLE_SLP has been depracated. New use model is:
 # compile on those platforms that do not enable it by default.  
 # #
 # Use PEGASUS_DISABLE_SLP to disable SLP on those platforms that enable  # Use PEGASUS_ENABLE_SLP=true  to enable  compilation of SLP functions.
 # it by default.  #
   # Use PEGASUS_ENABLE_SLP=false to disable compilation of SLP functions.
 # #
 # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP
 # by default. # by default.
Line 504 
Line 504 
 # the variable PEGASUS_ENABLE_SLP. # the variable PEGASUS_ENABLE_SLP.
 # #
 # #
   
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
   ifdef PEGASUS_DISABLE_SLP   ifdef PEGASUS_DISABLE_SLP
     $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)     $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)
   endif   endif
   endif
   
   ifdef PEGASUS_DISABLE_SLP
       $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )
   
   PEGASUS_ENABLE_SLP=false
   
   endif
   
   ifdef PEGASUS_ENABLE_SLP
     ifeq ($(PEGASUS_ENABLE_SLP),true)
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
     else
       ifneq ($(PEGASUS_ENABLE_SLP),false)
         $(error PEGASUS_ENABLE_SLP ($(PEGASUS_ENABLE_SLP)) invalid, must be true or false)
       endif
     endif
   endif
   
   #
   # Enable this flag to allow the handshake to continue regardless of verification result
   #
   ifdef PEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
     DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
 endif endif
  
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.


Legend:
Removed from v.1.111  
changed lines
  Added in v.1.114

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2