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

Diff for /pegasus/mak/config.mak between version 1.64 and 1.64.2.6

version 1.64, 2004/08/26 03:23:13 version 1.64.2.6, 2005/08/03 04:13:42
Line 54 
Line 54 
     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 219 
Line 221 
   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 229 
Line 236 
   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 328 
Line 340 
         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 358 
Line 375 
  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 421 
Line 442 
 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  
changed lines
  Added in v.1.64.2.6
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2