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

Diff for /pegasus/mak/config.mak between version 1.139 and 1.141.4.2

version 1.139, 2007/04/25 20:43:25 version 1.141.4.2, 2007/07/26 17:28:24
Line 696 
Line 696 
 # compile in the experimental APIs # compile in the experimental APIs
 DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
   # control direct access CIM build
   ifeq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)
       DEFINES += -DPEGASUS_USE_DIRECTACCESS_FOR_LOCAL
       DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=1
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_LIB),noshare)
         ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)
            DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=3
         endif
         $(error 'noshare' for PEGASUS_DIRECTACCESS_SHARE_REPOSITORY is also required.)
       else
         ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)
         DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=2
         endif
       endif
       ifndef PEGASUS_USE_EXPERIMENTAL_INTERFACES
           ifneq ($(OS_TYPE),windows)
               $(warning Direct access CIM built  without CIMClient.h experimental interfaces.)
           endif
       endif
   else
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)
         $(error PEGASUS_USE_DIRECTACCESS_FOR_LOCAL must be true for this this noshare option.)
       endif
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_LIB),noshare)
         $(error PEGASUS_USE_DIRECTACCESS_FOR_LOCAL must be true for this this noshare option.)
       endif
   endif
   
   
 # Ensure that the deprecated interfaces are defined in the Pegasus libraries. # Ensure that the deprecated interfaces are defined in the Pegasus libraries.
 # One may wish to disable these interfaces if binary compatibility with # One may wish to disable these interfaces if binary compatibility with
 # previous Pegasus releases is not required. # previous Pegasus releases is not required.
Line 841 
Line 870 
   endif   endif
 endif endif
  
   ##==============================================================================
   ##
   ## PEGASUS_ENABLE_PRIVILEGE_SEPARATION
   ##
   ##     Enables privilege separation support (uses the executor process to
   ##     perform privileged operations).
   ##
   ##==============================================================================
   
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
     ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
       DEFINES += -DPEGASUS_ENABLE_PRIVILEGE_SEPARATION
     else
       ifneq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),false)
         $(error PEGASUS_ENABLE_PRIVILEGE_SEPARATION \
           ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)) invalid, must be true or false)
       endif
     endif
   
     ## Specifies the user context of the cimservermain process when privilege
     ## separation is enabled.
     ifndef PEGASUS_CIMSERVERMAIN_USER
       PEGASUS_CIMSERVERMAIN_USER = pegasus
     endif
     DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"
   endif
   
   ##==============================================================================
   ##
   ## PEGASUS_USE_PAM_STANDALONE_PROC
   ##
   ##==============================================================================
   
   ifdef PEGASUS_USE_PAM_STANDALONE_PROC
     DEFINES += -DPEGASUS_USE_PAM_STANDALONE_PROC
   endif
   
   ##==============================================================================
  
 ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER
     PEGASUS_JAVA_CLASSPATH_DELIMITER = :     PEGASUS_JAVA_CLASSPATH_DELIMITER = :


Legend:
Removed from v.1.139  
changed lines
  Added in v.1.141.4.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2