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

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

version 1.64.2.7, 2005/08/12 23:47:59 version 1.65, 2004/11/12 22:36:38
Line 18 
Line 18 
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
   ERROR = pegasus_home_undefined      $(error PEGASUS_HOME environment variable undefined)
 pegasus_home_undefined:  
         @ echo PEGASUS_HOME environment variable undefined  
         @ exit 1  
 endif endif
  
 ifdef PEGASUS_ROOT ifdef PEGASUS_ROOT
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 else else
     ERROR = pegasus_root_undefined      $(error PEGASUS_ROOT environment variable undefined)
 pegasus_root_undefined:  
         @ echo PEGASUS_ROOT environment variable undefined  
         @ exit 1  
 endif endif
  
 # l10n # l10n
Line 54 
Line 48 
     WIN32_IX86_MSVC \     WIN32_IX86_MSVC \
     LINUX_IX86_GNU \     LINUX_IX86_GNU \
     LINUX_PPC_GNU \     LINUX_PPC_GNU \
     LINUX_PPC64_GNU \  
     LINUX_IA64_GNU \     LINUX_IA64_GNU \
     LINUX_ZSERIES_GNU \     LINUX_ZSERIES_GNU \
     LINUX_ZSERIES64_GNU \  
     AIX_RS_IBMCXX \     AIX_RS_IBMCXX \
     HPUX_PARISC_ACC \     HPUX_PARISC_ACC \
     HPUX_IA64_ACC \     HPUX_IA64_ACC \
Line 69 
Line 61 
     DARWIN_PPC_GNU     DARWIN_PPC_GNU
  
 ifndef PEGASUS_PLATFORM ifndef PEGASUS_PLATFORM
   ERROR = pegasus_platform_undefined      $(error PEGASUS_PLATFORM environment variable undefined.  Please set to\
 pegasus_platform_undefined:          one of the following: $(VALID_PLATFORMS))
         @ echo PEGASUS_PLATFORM environment variable undefined. Please set to\  
             one of the following: $(VALID_PLATFORMS)  
         @ exit 1  
 endif endif
  
 ################################################################################ ################################################################################
Line 221 
Line 210 
   FOUND = true   FOUND = true
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_PPC64_GNU)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   FOUND = true   FOUND = true
Line 236 
Line 220 
   FOUND = true   FOUND = true
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES64_GNU)  
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak  
   FOUND = true  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX) ifeq ($(PEGASUS_PLATFORM),AIX_RS_IBMCXX)
   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak   include $(ROOT)/mak/platform_$(PEGASUS_PLATFORM).mak
   FOUND = true   FOUND = true
Line 287 
Line 266 
 endif endif
  
 ifneq ($(FOUND),true) ifneq ($(FOUND),true)
   ERROR = pegasus_unknown_platform    $(error  PEGASUS_PLATFORM environment variable must be set to one of\
 pegasus_unknown_platform:          the following: $(VALID_PLATFORMS))
         @ echo PEGASUS_PLATFORM environment variable must be set to one of\  
             the following: $(VALID_PLATFORMS)  
         @ exit 1  
 endif endif
  
 ################################################################################ ################################################################################
Line 329 
Line 305 
 ## ##
 ################################################################################ ################################################################################
  
 ################################################################################  
 ##  
 ## PEGASUS_MAX_THREADS_PER_SVC_QUEUE  
 ##  
 ## Controls the maximum number of threads allowed per message service queue.  
 ##     It is allowed to range between 1 and MAX_THREADS_PER_SVC_QUEUE_LIMIT  
 ##     as set in pegasus/src/Pegasus/Common/MessageQueueService.cpp.  
 ##  
 ##      defaults to 0 (zero)  
 ##  
 ##      if set to 0 (zero)  
 ##       then the max threads per service queue is  
 ##            set to MAX_THREADS_PER_SVC_QUEUE_DEFAULT.  
 ##      if set larger than MAX_THREADS_PER_SVC_QUEUE_LIMIT  
 ##        then the max threads per service queue is  
 ##            set to MAX_THREADS_PER_SVC_QUEUE_LIMIT.  
 ##  
 ##      Label                                   Current value  
 ##      --------------------------------------  -------------  
 ##      MAX_THREADS_PER_SVC_QUEUE_LIMIT         5000  
 ##      MAX_THREADS_PER_SVC_QUEUE_DEFAULT       5  
 ##  
 ##  
   
 ifdef PEGASUS_MAX_THREADS_PER_SVC_QUEUE  
   DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=$(PEGASUS_MAX_THREADS_PER_SVC_QUEUE)  
 else  
   DEFINES += -DMAX_THREADS_PER_SVC_QUEUE=0  
 endif  
   
 # Setup the conditional compile for client displays. # Setup the conditional compile for client displays.
 # #
 ifdef PEGASUS_CLIENT_TRACE_ENABLE ifdef PEGASUS_CLIENT_TRACE_ENABLE
Line 370 
Line 316 
         DEFINES+= -DPEGASUS_REMOVE_TRACE         DEFINES+= -DPEGASUS_REMOVE_TRACE
 endif endif
  
 # Allow PEGASUS_ASSERT statements to be disabled  
 ifdef PEGASUS_NOASSERTS  
     DEFINES += -DNDEBUG  
 endif  
   
 # PEP 123 use monitor2 (the default) or not # PEP 123 use monitor2 (the default) or not
 #ifdef PEGASUS_USE_23HTTPMONITOR_SERVER #ifdef PEGASUS_USE_23HTTPMONITOR_SERVER
 DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_SERVER DEFINES+= -DPEGASUS_USE_23HTTPMONITOR_SERVER
Line 405 
Line 346 
  DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION  DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
 endif endif
  
 # Allow ExecQuery functionality to be enabled  
 ifndef PEGASUS_ENABLE_EXECQUERY  
     DEFINES += -DPEGASUS_DISABLE_EXECQUERY  
 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.
Line 472 
Line 409 
 endif endif
  
 DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\" DEFINES += -DPEGASUS_DEST_LIB_DIR=\"$(PEGASUS_DEST_LIB_DIR)\"
   
 ################################################################################  
 ##  
 ## Additional build flags passed in through environment variables.  
 ## These flags are added to the compile/link commands.  
 ##  
 ################################################################################  
   
 ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU  
   ifdef PEGASUS_EXTRA_CXX_FLAGS  
       EXTRA_CXX_FLAGS = $(PEGASUS_EXTRA_CXX_FLAGS)  
   endif  
   
   ifdef PEGASUS_EXTRA_C_FLAGS  
       EXTRA_C_FLAGS = $(PEGASUS_EXTRA_C_FLAGS)  
   endif  
   
   ifdef PEGASUS_EXTRA_LINK_FLAGS  
       EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)  
   endif  
 endif  

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