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

Diff for /pegasus/mak/config.mak between version 1.195.2.6 and 1.209

version 1.195.2.6, 2014/05/05 16:47:43 version 1.209, 2013/05/20 06:09:18
Line 33 
Line 33 
 ## ##
 ################################################################################ ################################################################################
  
 #PEGASUS_ROOT is mandatory currently  ifndef ROOT
 ifdef PEGASUS_ROOT  
   ifeq ($(wildcard $(PEGASUS_ROOT)),)  
     $(error PEGASUS_ROOT = $(PEGASUS_ROOT) is incorrect, \  
       Did you meant to set it to $(CURDIR)?)  
   endif  
   ROOT =  $(subst \,/,$(PEGASUS_ROOT))   ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 else  
   $(error PEGASUS_ROOT environment variable undefined)  
 endif endif
  
   
 ifdef PEGASUS_ENVVAR_FILE ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)     include $(PEGASUS_ENVVAR_FILE)
 else else
Line 57 
Line 49 
     $(error PEGASUS_HOME environment variable undefined)     $(error PEGASUS_HOME environment variable undefined)
 endif endif
  
   ifdef PEGASUS_ROOT
       ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   else
       $(error PEGASUS_ROOT environment variable undefined)
   endif
  
 ifdef PEGASUS_TMP ifdef PEGASUS_TMP
     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 686 
Line 683 
  
 # Controls snmp indication handler to use NET-SNMP to deliver trap # Controls snmp indication handler to use NET-SNMP to deliver trap
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
    ifeq ($(PEGASUS_USE_NET_SNMP),true)  
       DEFINES += -DPEGASUS_USE_NET_SNMP       DEFINES += -DPEGASUS_USE_NET_SNMP
    else  
       ifneq ($(PEGASUS_USE_NET_SNMP),false)  
          $(error PEGASUS_USE_NET_SNMP ($(PEGASUS_USE_NET_SNMP)) invalid, must be true or false)  
       endif  
    endif  
 endif endif
   
 # Controls snmp indication handler to use NET-SNMP V3 features. # Controls snmp indication handler to use NET-SNMP V3 features.
 ifndef PEGASUS_ENABLE_NET_SNMPV3 ifndef PEGASUS_ENABLE_NET_SNMPV3
     ifeq ($(PEGASUS_USE_NET_SNMP),true)      ifdef PEGASUS_USE_NET_SNMP
        PEGASUS_ENABLE_NET_SNMPV3=true        PEGASUS_ENABLE_NET_SNMPV3=true
     else     else
         PEGASUS_ENABLE_NET_SNMPV3=false         PEGASUS_ENABLE_NET_SNMPV3=false
Line 704 
Line 696 
 endif endif
  
 ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true) ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true)
     ifneq ($(PEGASUS_USE_NET_SNMP),true)      ifndef PEGASUS_USE_NET_SNMP
         $(error PEGASUS_USE_NET_SNMP should be set to true when PEGASUS_ENABLE_NET_SNMPV3 is true)          $(error PEGASUS_USE_NET_SNMP should be set when PEGASUS_ENABLE_NET_SNMPV3 is true)
     endif     endif
     DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3     DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3
 else else
Line 1365 
Line 1357 
  
 ##============================================================================== ##==============================================================================
 ## ##
 ## PEGASUS_PAM_SESSION_SECURITY  
 ##  
 ## This is a new method to handle authentication with PAM in case it is required  
 ## to keep the PAM session established by pam_start() open across an  
 ## entire CIM request.  
 ##  
 ## This feature contradicts PEGASUS_PAM_AUTHENTICATION and  
 ## PEGASUS_USE_PAM_STANDALONE_PROC  
 ## Because of the additional process this feature is not compatible with  
 ## Privilege Separation.  
 ##  
 ##==============================================================================  
   
 ifeq ($(PEGASUS_PAM_SESSION_SECURITY),true)  
     ifdef PEGASUS_PAM_AUTHENTICATION  
         $(error "PEGASUS_PAM_AUTHENTICATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     ifdef PEGASUS_USE_PAM_STANDALONE_PROC  
         $(error "PEGASUS_USE_PAM_STANDALONE_PROC must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  
         $(error "PEGASUS_ENABLE_PRIVILEGE_SEPARATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     # Compile in the code required for PAM  
     # and compile out the code that uses the password file.  
     DEFINES += -DPEGASUS_PAM_SESSION_SECURITY -DPEGASUS_NO_PASSWORDFILE  
     # Link with libpam only where it is needed.  
     ifeq ($(HAS_PAM_DEPENDENCY),true)  
         SYS_LIBS += -lpam  
     endif  
 endif  
   
   
 ##==============================================================================  
 ##  
 ## PEGASUS_PAM_AUTHENTICATION ## PEGASUS_PAM_AUTHENTICATION
 ## ##
 ##============================================================================== ##==============================================================================
Line 1485 
Line 1442 
   endif   endif
 endif endif
  
   
 ##==============================================================================  
 ##  
 ## PEGASUS_ENABLE_PROTOCOL_WEB  
 ##  
 ##     Enables the GET-Method for files in order to act as a web-server  
 ##  
 ##  
 ##  
 ##  
 ##==============================================================================  
 ifndef PEGASUS_ENABLE_PROTOCOL_WEB  
   PEGASUS_ENABLE_PROTOCOL_WEB = true  
 endif  
   
 ifeq ($(PEGASUS_ENABLE_PROTOCOL_WEB),true)  
   DEFINES += -DPEGASUS_ENABLE_PROTOCOL_WEB  
 else  
   ifneq ($(PEGASUS_ENABLE_PROTOCOL_WEB),false)  
     $(error "PEGASUS_ENABLE_PROTOCOL_WEB must be true or false")  
   endif  
 endif  
   
 ## ====================================================================== ## ======================================================================
 ## ##
 ## PLATFORM_CORE_PATTERN ## PLATFORM_CORE_PATTERN


Legend:
Removed from v.1.195.2.6  
changed lines
  Added in v.1.209

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2