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

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

version 1.138.2.2, 2007/05/09 18:48:22 version 1.141.4.2, 2007/07/26 17:28:24
Line 212 
Line 212 
        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif     endif
 else else
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29      CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM2131
     CIM_SCHEMA_VER=     CIM_SCHEMA_VER=
 endif endif
  
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 862 
Line 891 
  
   ## Specifies the user context of the cimservermain process when privilege   ## Specifies the user context of the cimservermain process when privilege
   ## separation is enabled.   ## separation is enabled.
   ifdef PEGASUS_CIMSERVERMAIN_USER    ifndef PEGASUS_CIMSERVERMAIN_USER
     DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"      PEGASUS_CIMSERVERMAIN_USER = pegasus
   endif   endif
     DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"
 endif endif
  
 ##============================================================================== ##==============================================================================

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