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

Diff for /pegasus/mak/config.mak between version 1.113.2.2 and 1.113.2.4

version 1.113.2.2, 2006/02/10 16:09:05 version 1.113.2.4, 2006/03/29 18:25:36
Line 476 
Line 476 
 # PEP 233 # PEP 233
 # Controls support for EmbeddedInstance properties # Controls support for EmbeddedInstance properties
 # and parameters # and parameters
 ifdef PEGASUS_ENABLE_EMBEDDED_INSTANCES  ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
       ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)
     DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT     DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT
       else
           ifneq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), false)
               $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)
           endif
       endif
 endif endif
  
 # Allow ExecQuery functionality to be enabled # Allow ExecQuery functionality to be enabled
Line 509 
Line 515 
  ifndef OPENSSL_BIN  ifndef OPENSSL_BIN
     OPENSSL_BIN = $(OPENSSL_HOME)/bin     OPENSSL_BIN = $(OPENSSL_HOME)/bin
  endif  endif
    ifndef OPENSSL_COMMAND
  OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl  OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl
    endif
  ifndef OPENSSL_SET_SERIAL_SUPPORTED  ifndef OPENSSL_SET_SERIAL_SUPPORTED
     ifneq (, $(findstring 0.9.6, $(shell $(OPENSSL_COMMAND) version)))     ifneq (, $(findstring 0.9.6, $(shell $(OPENSSL_COMMAND) version)))
         OPENSSL_SET_SERIAL_SUPPORTED = false         OPENSSL_SET_SERIAL_SUPPORTED = false


Legend:
Removed from v.1.113.2.2  
changed lines
  Added in v.1.113.2.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2