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

Diff for /pegasus/mak/config.mak between version 1.171.6.1 and 1.176

version 1.171.6.1, 2008/08/20 23:05:48 version 1.176, 2008/10/17 11:07:30
Line 444 
Line 444 
         else         else
             ifeq ($(OS),zos)             ifeq ($(OS),zos)
                 EXTRA_LIBRARIES += \                 EXTRA_LIBRARIES += \
                     $(ICU_INSTALL)/lib/libicui18n.x \                      $(ICU_INSTALL)/lib/libicui18n$(DYNLIB_SUFFIX) \
                     $(ICU_INSTALL)/lib/libicuuc.x                      $(ICU_INSTALL)/lib/libicuuc$(DYNLIB_SUFFIX)
             else             else
                 EXTRA_LIBRARIES += -licuuc -licui18n                 EXTRA_LIBRARIES += -licuuc -licui18n
                 ifeq ($(OS),linux)                 ifeq ($(OS),linux)
Line 539 
Line 539 
   endif   endif
 endif endif
  
   # Control whether the class definitions in the repository contain elements
   # propagated from superclass definitions.
   
   ifndef PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES
       PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES = false
   endif
   
   ifeq ($(PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES),true)
       DEFINES += -DPEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES
   else
       ifneq ($(PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES),false)
           $(error PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES ($(PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES)) invalid, must be true or false)
       endif
   endif
   
 # PEP 161 # PEP 161
 # Control whether utf-8 filenames are supported by the repository # Control whether utf-8 filenames are supported by the repository
 ifdef PEGASUS_SUPPORT_UTF8_FILENAME ifdef PEGASUS_SUPPORT_UTF8_FILENAME
Line 651 
Line 666 
     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
 endif endif
  
 # PEP 233  
 # Controls support for EmbeddedInstance properties  
 # and parameters  
 ifndef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     PEGASUS_EMBEDDED_INSTANCE_SUPPORT = true  
 endif  
   
 ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)  
     DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT  
 else  
     ifneq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), false)  
         $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)  
     endif  
 endif  
   
   
 # Allow ExecQuery functionality to be enabled # Allow ExecQuery functionality to be enabled
 ifndef PEGASUS_ENABLE_EXECQUERY ifndef PEGASUS_ENABLE_EXECQUERY
     DEFINES += -DPEGASUS_DISABLE_EXECQUERY     DEFINES += -DPEGASUS_DISABLE_EXECQUERY
Line 907 
Line 906 
       Please use PEGASUS_USE_EXTERNAL_SLP)       Please use PEGASUS_USE_EXTERNAL_SLP)
   endif   endif
   ## if PEGASUS_USE_OPENSLP used, convert to EXTERNAL_SLP variables   ## if PEGASUS_USE_OPENSLP used, convert to EXTERNAL_SLP variables
     ## as defined for openslp
   ifeq ($(PEGASUS_USE_OPENSLP),true)   ifeq ($(PEGASUS_USE_OPENSLP),true)
     ifeq ($(PEGASUS_ENABLE_SLP),true)     ifeq ($(PEGASUS_ENABLE_SLP),true)
       ###DEFINES += -DPEGASUS_USE_EXTERNAL_SLP_TYPE=1        PEGASUS_USE_EXTERNAL_SLP=openslp
       PEGASUS_USE_EXTERNAL_SLP_TYPE=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. \
         Please correct this inconsistency)         Please correct this inconsistency)
Line 1076 
Line 1076 
     endif     endif
 endif endif
  
 ifdef PEGASUS_ENABLE_INTEROP_PROVIDER  
     ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)  
         DEFINES += -DPEGASUS_ENABLE_INTEROP_PROVIDER  
     else  
         ifneq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)  
             $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true or false)  
         endif  
     endif  
 endif  
   
 # #
 ## PEP 323, DMTF Indications Profile support, stage 1 ## PEP 323, DMTF Indications Profile support, stage 1
 # #
Line 1106 
Line 1096 
     endif     endif
 endif endif
  
   ifdef PEGASUS_ENABLE_INTEROP_PROVIDER
       ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
           DEFINES += -DPEGASUS_ENABLE_INTEROP_PROVIDER
       else
           ifneq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)
               $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true or false)
           endif
       endif
   endif
   
   
 ############################################################################ ############################################################################
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
 # Note that this flag is the general separator between # Note that this flag is the general separator between

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