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

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

version 1.151.2.8, 2008/10/23 18:15:52 version 1.153, 2007/09/12 21:30:58
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 432 
Line 430 
     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 553 
Line 532 
 endif endif
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
     DEFINES += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE      DEFINES += -DPEGASUS_HAS_SSL
   
       # Enable SSL Random file by default.
       ifndef PEGASUS_USE_SSL_RANDOMFILE
           PEGASUS_USE_SSL_RANDOMFILE = true
       endif
   
       # Allow SSL Random file functionality to be optionally disabled.
       ifdef PEGASUS_USE_SSL_RANDOMFILE
           ifeq ($(PEGASUS_USE_SSL_RANDOMFILE), true)
               DEFINES += -DPEGASUS_SSL_RANDOMFILE
           else
               ifneq ($(PEGASUS_USE_SSL_RANDOMFILE), false)
                   $(error PEGASUS_USE_SSL_RANDOMFILE\
                        ($(PEGASUS_USE_SSL_RANDOMFILE)) invalid, \
                         must be true or false)
               endif
           endif
       endif
  
     ifndef OPENSSL_COMMAND     ifndef OPENSSL_COMMAND
         ifdef OPENSSL_BIN         ifdef OPENSSL_BIN
Line 591 
Line 588 
  
 # #
 # PEP 258 # PEP 258
 # Allow Audit Logger to be disabled  # Allow Audit Logger to be disabled.  It is enabled by default.
 # #
 ifdef PEGASUS_DISABLE_AUDIT_LOGGER  
   ifeq ($(PEGASUS_DISABLE_AUDIT_LOGGER),true)  ifndef PEGASUS_ENABLE_AUDIT_LOGGER
     DEFINES += -DPEGASUS_DISABLE_AUDIT_LOGGER      PEGASUS_ENABLE_AUDIT_LOGGER = true
   endif
   
   ifdef PEGASUS_ENABLE_AUDIT_LOGGER
       ifeq ($(PEGASUS_ENABLE_AUDIT_LOGGER),true)
           DEFINES += -DPEGASUS_ENABLE_AUDIT_LOGGER
   else   else
     ifneq ($(PEGASUS_DISABLE_AUDIT_LOGGER),false)          ifneq ($(PEGASUS_ENABLE_AUDIT_LOGGER),false)
       $(error PEGASUS_DISABLE_AUDIT_LOGGER ($(PEGASUS_DISABLE_AUDIT_LOGGER)) \              $(error PEGASUS_ENABLE_AUDIT_LOGGER \
        invalid, must be true or false)                ($(PEGASUS_ENABLE_AUDIT_LOGGER)) invalid, must be true or false)
     endif     endif
   endif   endif
 endif endif
  
   # Check for use of deprecated variable
   ifdef PEGASUS_DISABLE_AUDIT_LOGGER
       $(error The PEGASUS_DISABLE_AUDIT_LOGGER variable is deprecated. \
           Use PEGASUS_ENABLE_AUDIT_LOGGER=false instead)
   endif
   
  
 # #
 # PEP 291 # PEP 291

Legend:
Removed from v.1.151.2.8  
changed lines
  Added in v.1.153
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2