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

Diff for /pegasus/mak/config.mak between version 1.146 and 1.151.2.1

version 1.146, 2007/07/06 17:46:32 version 1.151.2.1, 2007/09/14 23:02:34
Line 39 
Line 39 
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 endif endif
  
   -include $(ROOT)/configure.mak
   
 ifdef PEGASUS_ENVVAR_FILE ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)     include $(PEGASUS_ENVVAR_FILE)
 else else
Line 534 
Line 536 
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
     DEFINES += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE     DEFINES += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
  
     ifndef OPENSSL_BIN  
         OPENSSL_BIN = $(OPENSSL_HOME)/bin  
     endif  
     ifndef OPENSSL_COMMAND     ifndef OPENSSL_COMMAND
           ifdef OPENSSL_BIN
         OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl         OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl
           else
               OPENSSL_COMMAND = openssl
           endif
     endif     endif
     ifndef OPENSSL_SET_SERIAL_SUPPORTED     ifndef OPENSSL_SET_SERIAL_SUPPORTED
         ifneq (, $(findstring 0.9.6, $(shell $(OPENSSL_COMMAND) version)))         ifneq (, $(findstring 0.9.6, $(shell $(OPENSSL_COMMAND) version)))
Line 587 
Line 590 
 # PEP 291 # PEP 291
 # Enable IPv6 support # Enable IPv6 support
 # #
   
 ifndef PEGASUS_ENABLE_IPV6 ifndef PEGASUS_ENABLE_IPV6
     PEGASUS_ENABLE_IPV6 = true     PEGASUS_ENABLE_IPV6 = true
 endif endif
Line 603 
Line 607 
   endif   endif
 endif endif
  
   # Verify Test IPv6 support
   # If PEGASUS_ENABLE_IPV6 is defined and PEGASUS_TEST_IPV6 is not defined, we set
   # PEGASUS_TEST_IPV6 to the same value as PEGASUS_ENABLE_IPV6.
   # You can explicitly set PEGASUS_TEST_IPV6 to false if you don't want to run the
   # IPv6 tests (for example, on an IPv4 system that is running an IPv6-enabled
   # version of Pegasus).
   #
   ifdef PEGASUS_TEST_IPV6
     ifneq ($(PEGASUS_TEST_IPV6),true)
       ifneq ($(PEGASUS_TEST_IPV6),false)
         $(error PEGASUS_TEST_IPV6 ($(PEGASUS_TEST_IPV6)) \
          invalid, must be true or false)
       endif
     endif
   else
     PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)
   endif
   
   ############################################################################
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
Line 712 
Line 735 
   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
Line 903 
Line 974 
     endif     endif
   endif   endif
  
   ## Specifies the user context of the cimservermain process when privilege    ## Defines the user context of the cimservermain process when privilege
   ## separation is enabled.   ## separation is enabled.
   ifndef PEGASUS_CIMSERVERMAIN_USER    PEGASUS_CIMSERVERMAIN_USER = cimsrvr
     PEGASUS_CIMSERVERMAIN_USER = pegasus  
   endif  
   DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"   DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"
 endif endif
  


Legend:
Removed from v.1.146  
changed lines
  Added in v.1.151.2.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2