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

Diff for /pegasus/mak/config.mak between version 1.201 and 1.206

version 1.201, 2012/02/09 09:18:38 version 1.206, 2013/02/18 15:00:20
Line 385 
Line 385 
 ifeq ($(PEGASUS_HAS_ICU),true) ifeq ($(PEGASUS_HAS_ICU),true)
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
  
     ##################################  
     ##  
     ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root  
     ## resource bundle, default is to uppercase the root resource bundle  
     ##  
     ##################################  
   
     ifdef ICU_NO_UPPERCASE_ROOT  
         CNV_ROOT_FLAGS =  
     else  
         CNV_ROOT_FLAGS = -u  
     endif  
   
     ####################################     ####################################
     ##     ##
     ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root     ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root
Line 533 
Line 520 
  
 # Allow PEGASUS_ASSERT statements to be disabled. # Allow PEGASUS_ASSERT statements to be disabled.
 ifdef PEGASUS_NOASSERTS ifdef PEGASUS_NOASSERTS
     DEFINES += -DNDEBUG      DEFINES += -DNDEBUG -DPEGASUS_NOASSERTS
 endif endif
  
 # do not compile trace code. sometimes it causes problems debugging # do not compile trace code. sometimes it causes problems debugging
Line 1264 
Line 1251 
     DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI     DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI
 endif endif
  
 ############################################################  
 #  
 # Set any vendor-specific compile flags  
 #  
 ############################################################  
   
 ifdef PEGASUS_VENDOR_HP  
     DEFINES+= -DPEGASUS_VENDOR_HP  
 endif  
   
  
 ############################################################ ############################################################
 # #
Line 1555 
Line 1532 
 DEFINES += -DPEGASUS_INITIAL_THREADSTACK_SIZE=$(PEGASUS_INITIAL_THREADSTACK_SIZE) DEFINES += -DPEGASUS_INITIAL_THREADSTACK_SIZE=$(PEGASUS_INITIAL_THREADSTACK_SIZE)
 endif endif
  
   ifndef PEGASUS_INTEROP_NAMESPACE
       PEGASUS_INTEROP_NAMESPACE=root/PG_InterOp
   else
   ifeq ($(PEGASUS_INTEROP_NAMESPACE),root/interop)
   DEFINES += -DNS_ROOT_INTEROP
       endif
   ifeq ($(PEGASUS_INTEROP_NAMESPACE),interop)
   DEFINES += -DNS_INTEROP
   endif
   endif
   
   ##These namespaces will be used in Makefiles.
   
   NAMESPACE_INTEROP = interop
   
   NAMESPACE_ROOT_INTEROP = root/interop

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