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

Diff for /pegasus/mak/config.mak between version 1.185.2.2 and 1.190

version 1.185.2.2, 2009/11/18 14:00:29 version 1.190, 2010/06/30 07:17:39
Line 223 
Line 223 
 # ***** # *****
  
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM222      PEGASUS_CIM_SCHEMA=CIM225
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 365 
Line 365 
     endif     endif
 endif endif
  
   
 ifeq ($(PEGASUS_HAS_ICU),true) ifeq ($(PEGASUS_HAS_ICU),true)
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
  
Line 925 
Line 926 
   ## as defined for openslp   ## as defined for openslp
   ifeq ($(PEGASUS_USE_OPENSLP),true)   ifeq ($(PEGASUS_USE_OPENSLP),true)
     ifeq ($(PEGASUS_ENABLE_SLP),true)     ifeq ($(PEGASUS_ENABLE_SLP),true)
       PEGASUS_USE_EXTERNAL_SLP=openslp        export PEGASUS_USE_EXTERNAL_SLP=openslp
       PEGASUS_USE_OPENSLP=       PEGASUS_USE_OPENSLP=
     else     else
       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \
Line 1025 
Line 1026 
     $(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \     $(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \
       Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)       Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)
   else   else
       PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)        export PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)
    endif    endif
 endif endif
 ############################################################################ ############################################################################
Line 1477 
Line 1478 
 ifndef PLATFORM_CORE_PATTERN ifndef PLATFORM_CORE_PATTERN
     PLATFORM_CORE_PATTERN = core*     PLATFORM_CORE_PATTERN = core*
 endif endif
   
   ifdef PEGASUS_FLAVOR
     ifdef PEGASUS_USE_RELEASE_DIRS
       ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
         $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when both PEGASUS_FLAVOR and PEGASUS_USE_RELEASE_DIRS options are used")
       endif
     endif
     ifneq ($(PEGASUS_FLAVOR), tog)
         DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"
     endif
   endif

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