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

Diff for /pegasus/mak/config.mak between version 1.149 and 1.151.2.8

version 1.149, 2007/08/13 11:23:16 version 1.151.2.8, 2008/10/23 18:15:52
Line 39 
Line 39 
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 endif endif
  
   -include $(ROOT)/options.mak
   
 ifdef PEGASUS_ENVVAR_FILE ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)     include $(PEGASUS_ENVVAR_FILE)
 else else
Line 430 
Line 432 
     DEFINES += -DPEGASUS_DISABLE_CQL     DEFINES += -DPEGASUS_DISABLE_CQL
 endif endif
  
   ###################################################
   # Allow EXPORT Server within cimserver to be disabled
   # default - enabled
   # true - enabled
   # false - disabled and not referenced within server
   
   ifdef PEGASUS_ENABLE_EXPORTSERVER
     ifeq ($(PEGASUS_ENABLE_EXPORTSERVER),true)
       DEFINES += -DPEGASUS_ENABLE_EXPORTSERVER
     else
       ifneq ($(PEGASUS_ENABLE_EXPORTSERVER),false)
         $(error PEGASUS_ENABLE_EXPORTSERVER ($(PEGASUS_ENABLE_EXPORTSERVER)) invalid, must be true or false)
       endif
     endif
   else
     DEFINES += -DPEGASUS_ENABLE_EXPORTSERVER
     PEGASUS_ENABLE_EXPORTSERVER=true
   endif
   
 # #
 # PEP 186 # PEP 186
 # Allow override of product name/version/status.  A file # Allow override of product name/version/status.  A file
Line 620 
Line 641 
     endif     endif
   endif   endif
 else else
   PEGASUS_TEST_IPV6 = PEGASUS_ENABLE_IPV6    PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)
 endif endif
  
   ############################################################################
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
Line 733 
Line 754 
   DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT   DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
 endif endif
  
   ############################################################################
   #
   # PEGASUS_ENABLE_INTEROP_PROVIDER
   # Enables the interop provider AND the server profile.
   # initially this was activated by setting either the perfinst or slp enable
   # flags.  This allows activating this function without any either perfinst or
   # slp enabled.  Note that if either of these are enabled, this funtion is also
   # enabled
   
   ## if either slp or perfinst are enabled and this is false, flag error
   ## This gets messy because should account for both postive and negative on
   ## interop so we don't get multiples.
   
   ifdef PEGASUS_ENABLE_SLP
       ifeq ($(PEGASUS_ENABLE_SLP),true)
           ifndef PEGASUS_ENABLE_INTEROP_PROVIDER
               PEGASUS_ENABLE_INTEROP_PROVIDER = true
           else
               ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)
                   $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if SLP enabled)
               endif
           endif
       endif
   endif
   
   ## if PERFINST enabled, set to force interop.
   ifndef PEGASUS_DISABLE_PERFINST
       ifndef PEGASUS_ENABLE_INTEROP_PROVIDER
           PEGASUS_ENABLE_INTEROP_PROVIDER = true
       else
           ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)
               $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if PERFINST enabled)
           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
 # debug compiles and non-debug compiles and controls both # debug compiles and non-debug compiles and controls both


Legend:
Removed from v.1.149  
changed lines
  Added in v.1.151.2.8

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2