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

Diff for /pegasus/mak/config.mak between version 1.125 and 1.129

version 1.125, 2006/05/02 20:26:56 version 1.129, 2006/07/26 20:22:06
Line 476 
Line 476 
 # PEP 233 # PEP 233
 # Controls support for EmbeddedInstance properties # Controls support for EmbeddedInstance properties
 # and parameters # and parameters
 ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  ifndef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
       PEGASUS_EMBEDDED_INSTANCE_SUPPORT = true
   endif
   
     ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)     ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)
         DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT         DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT
     else     else
Line 484 
Line 487 
             $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)             $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)
         endif         endif
     endif     endif
 endif  
  
 # Allow ExecQuery functionality to be enabled # Allow ExecQuery functionality to be enabled
 ifndef PEGASUS_ENABLE_EXECQUERY ifndef PEGASUS_ENABLE_EXECQUERY
Line 793 
Line 796 
     EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)     EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LINK_FLAGS)
 endif endif
  
   ##==============================================================================
   ##
   ## By definining PEGASUS_USE_STATIC_LIBRARIES in the environment and STATIC
   ## in the Makefile, a static library is produced rather than a shared one.
   ## PEGASUS_USE_STATIC_LIBRARIES should be "true" or "false".
   ##
   ##==============================================================================
   
   ifdef PEGASUS_USE_STATIC_LIBRARIES
     ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
     else
       ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),false)
         $(error PEGASUS_USE_STATIC_LIBRARIES ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true or false)
       endif
     endif
   endif
   
   
   ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER
       PEGASUS_JAVA_CLASSPATH_DELIMITER = :
   endif


Legend:
Removed from v.1.125  
changed lines
  Added in v.1.129

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2