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

Diff for /pegasus/mak/config.mak between version 1.167.4.1.4.3 and 1.171.4.2

version 1.167.4.1.4.3, 2008/08/13 16:51:47 version 1.171.4.2, 2008/10/20 05:25:22
Line 877 
Line 877 
 ############################################################################ ############################################################################
 # #
 # PEGASUS_USE_OPENSLP # PEGASUS_USE_OPENSLP
   
 ## NOTE: This variable has been deprecated and superceeded by the use of ## NOTE: This variable has been deprecated and superceeded by the use of
 ## PEGASUS_USE_EXTERNAL_SLP. The use of this variable may be ## PEGASUS_USE_EXTERNAL_SLP. The use of this variable may be
 ## removed from Pegasus in future releases. It is converted to the ## removed from Pegasus in future releases. It is converted to the
Line 906 
Line 905 
     $(error Both PEGASUS_USE_OPENSLP and PEGASUS_USE_EXTERNAL_SLP defined. \     $(error Both PEGASUS_USE_OPENSLP and PEGASUS_USE_EXTERNAL_SLP defined. \
       Please use PEGASUS_USE_EXTERNAL_SLP)       Please use PEGASUS_USE_EXTERNAL_SLP)
   endif   endif
     ## if PEGASUS_USE_OPENSLP used, convert to EXTERNAL_SLP variables
     ## as defined for openslp
   ifeq ($(PEGASUS_USE_OPENSLP),true)   ifeq ($(PEGASUS_USE_OPENSLP),true)
     ifeq ($(PEGASUS_ENABLE_SLP),true)     ifeq ($(PEGASUS_ENABLE_SLP),true)
       DEFINES += -DPEGASUS_USE_EXTERNAL_SLP=1        PEGASUS_USE_EXTERNAL_SLP=openslp
       PEGASUS_USE_EXTERNAL_SLP=1        PEGASUS_USE_OPENSLP=
     else     else
       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \
         Please correct this inconsistency)         Please correct this inconsistency)
Line 1075 
Line 1076 
     endif     endif
 endif endif
  
 ifdef PEGASUS_ENABLE_INTEROP_PROVIDER  
     ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)  
         DEFINES += -DPEGASUS_ENABLE_INTEROP_PROVIDER  
     else  
         ifneq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)  
             $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true or false)  
         endif  
     endif  
 endif  
   
 # #
 ## PEP 323, DMTF Indications Profile support, stage 1 ## PEP 323, DMTF Indications Profile support, stage 1
 # #
Line 1105 
Line 1096 
     endif     endif
 endif endif
  
   ifdef PEGASUS_ENABLE_INTEROP_PROVIDER
       ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
           DEFINES += -DPEGASUS_ENABLE_INTEROP_PROVIDER
       else
           ifneq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)
               $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true or false)
           endif
       endif
   endif
   
   
 ############################################################################ ############################################################################
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
 # Note that this flag is the general separator between # Note that this flag is the general separator between


Legend:
Removed from v.1.167.4.1.4.3  
changed lines
  Added in v.1.171.4.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2