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

Diff for /pegasus/mak/config.mak between version 1.65 and 1.77

version 1.65, 2004/11/12 22:36:38 version 1.77, 2005/02/06 19:33:28
Line 44 
Line 44 
     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))     DISPLAYCONSUMER_DIR = $(subst \,/,$(PEGASUS_HOME))
 endif endif
  
 VALID_PLATFORMS = \  PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)
     WIN32_IX86_MSVC \  TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
     LINUX_IX86_GNU \  VALID_PLATFORMS=$(subst .mak,, $(TEMP))
     LINUX_PPC_GNU \  
     LINUX_IA64_GNU \  
     LINUX_ZSERIES_GNU \  
     AIX_RS_IBMCXX \  
     HPUX_PARISC_ACC \  
     HPUX_IA64_ACC \  
     TRU64_ALPHA_DECCXX \  
     SOLARIS_SPARC_GNU \  
     SOLARIS_SPARC_CC \  
     ZOS_ZSERIES_IBM \  
     NSK_NONSTOP_NMCPLUS \  
     DARWIN_PPC_GNU  
  
 ifndef PEGASUS_PLATFORM ifndef PEGASUS_PLATFORM
     $(error PEGASUS_PLATFORM environment variable undefined.  Please set to\     $(error PEGASUS_PLATFORM environment variable undefined.  Please set to\
Line 195 
Line 183 
 ## ##
 ################################################################################ ################################################################################
  
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  PLATFORM_FILE = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  ifneq ($(wildcard $(PLATFORM_FILE)), )
     FOUND = true      include $(PLATFORM_FILE)
 endif  else
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_PPC_GNU)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES_GNU)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),HPUX_PARISC_ACC)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),HPUX_IA64_ACC)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),TRU64_ALPHA_DECCXX)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_GNU)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),NSK_NONSTOP_NMCPLUS)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)  
     include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
     FOUND = true  
 endif  
   
 ifneq ($(FOUND),true)  
   $(error  PEGASUS_PLATFORM environment variable must be set to one of\   $(error  PEGASUS_PLATFORM environment variable must be set to one of\
         the following: $(VALID_PLATFORMS))         the following: $(VALID_PLATFORMS))
 endif endif
Line 316 
Line 237 
     DEFINES += -DPEGASUS_REMOVE_TRACE     DEFINES += -DPEGASUS_REMOVE_TRACE
 endif endif
  
 # PEP 123 use monitor2 (the default) or not  
 #ifdef PEGASUS_USE_23HTTPMONITOR_SERVER  
     DEFINES += -DPEGASUS_USE_23HTTPMONITOR_SERVER  
 #endif  
   
 #BUG 1170 Monitor2 Client Workaround  
 #ifdef PEGASUS_USE_23HTTPMONITOR_CLIENT  
     DEFINES += -DPEGASUS_USE_23HTTPMONITOR_CLIENT  
 #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 346 
Line 257 
     DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION     DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
 endif endif
  
   #
   # PEP 193
   # The following flag need to be set to disable
   # CQL in indication subscriptions
   #
   ifdef PEGASUS_DISABLE_CQL
       DEFINES += -DPEGASUS_DISABLE_CQL
   endif
   
   #
   # PEP 186
   # Allow override of product name/version/status.  A file
   # pegasus/src/Pegasus/Common/ProductVersion.h must exist when this
   # flag is defined.
   #
   ifdef PEGASUS_OVERRIDE_PRODUCT_ID
       DEFINES += -DPEGASUS_OVERRIDE_PRODUCT_ID
   endif
   
   #
   # PEP 197
   # Allow the Provider User Context feature to be disabled.
   #
   PEGASUS_DISABLE_PROV_USERCTXT=1
   ifdef PEGASUS_DISABLE_PROV_USERCTXT
       DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT
   else
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED
       endif
       ifdef PEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER
           DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER
       endif
   endif
   
   # PEP 211
   # Controls object normalization support.
   ifdef PEGASUS_ENABLE_OBJECT_NORMALIZATION
       DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
   endif
   
  
 # setup function to enable SLP functions in the Pegasus standard compile # setup function to enable SLP functions in the Pegasus standard compile
 # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code. # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
   # NOTE. Effective with Bug # 2633 some platforms now enable SLP.
   # To see which platforms look for platform make files that set
   # the variable PEGASUS_ENABLE_SLP
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
 endif endif
Line 367 
Line 328 
 DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
 # Set compile flag to control compilation of CIMOM statistics # Set compile flag to control compilation of CIMOM statistics
 ifdef PEGASUS_HAS_PERFINST  ifdef PEGASUS_DISABLE_PERFINST
     FLAGS += -DPEGASUS_HAS_PERFINST      FLAGS += -DPEGASUS_DISABLE_PERFINST
 endif endif
  
 ############################################################ ############################################################
Line 408 
Line 369 
     PEGASUS_DEST_LIB_DIR = lib     PEGASUS_DEST_LIB_DIR = lib
 endif endif
  
   ifeq ($(OS),VMS)
    DEFINES += -DPEGASUS_DEST_LIB_DIR="""$(PEGASUS_DEST_LIB_DIR)"""
   else
 DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\" DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\"
   endif
   

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