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

Diff for /pegasus/mak/config.mak between version 1.217 and 1.220

version 1.217, 2014/09/15 07:52:14 version 1.220, 2015/04/23 13:27:56
Line 604 
Line 604 
  
 ############################################################################ ############################################################################
 # #
   # PEGASUS_ENABLE_FQL
   # The use model is:
   #
   # Use PEGASUS_ENABLE_FQL=true  to enable  compilation of FQL functions.
   #
   # Use PEGASUS_ENABLE_FQL=false to disable compilation of FQL functions.
   #
   # Default is PEGASUS_ENABLE_FQL=true if not defined external to config.mak
   #
   
   ifndef PEGASUS_ENABLE_FQL
       # Default is true. CQL is enabled normally on all platforms unless specifically defined
       PEGASUS_ENABLE_FQL=true
   endif
   
   ifeq ($(PEGASUS_ENABLE_FQL),true)
       DEFINES += -DPEGASUS_ENABLE_FQL
   else
       ifneq ($(PEGASUS_ENABLE_FQL),false)
           $(error PEGASUS_ENABLE_FQL ($(PEGASUS_ENABLE_FQL)) invalid, must be true or false)
       endif
   endif
   
   ############################################################################
   #
 # PEGASUS_OVERRIDE_PRODUCT_ID # PEGASUS_OVERRIDE_PRODUCT_ID
 # PEP 186 # PEP 186
 # Allow override of product name/version/status.  A file # Allow override of product name/version/status.  A file
Line 1592 
Line 1617 
 NAMESPACE_INTEROP = interop NAMESPACE_INTEROP = interop
  
 NAMESPACE_ROOT_INTEROP = root/interop NAMESPACE_ROOT_INTEROP = root/interop
   
   
   ##==============================================================================
   ##
   ## PEGASUS_ENABLE_SESSION_COOKIES
   ##
   ##==============================================================================
   
   # Cookies are enabled by defaut when HAS_SSL is defined _or_ on zOS
   ifndef PEGASUS_ENABLE_SESSION_COOKIES
     ifdef PEGASUS_HAS_SSL
       PEGASUS_ENABLE_SESSION_COOKIES=true
     else
       ifeq ($(OS),zos)
         PEGASUS_ENABLE_SESSION_COOKIES=true
       else
         PEGASUS_ENABLE_SESSION_COOKIES=false
       endif
     endif
   endif
   
   ifeq ($(PEGASUS_ENABLE_SESSION_COOKIES),true)
     ifndef PEGASUS_HAS_SSL
       ifneq ($(OS),zos)
         $(error "PEGASUS_ENABLE_SESSION_COOKIES can be set to 'true' only when PEGASUS_HAS_SSL is 'true' or on zOS platform")
       endif
     endif
     DEFINES += -DPEGASUS_ENABLE_SESSION_COOKIES
   else
     ifneq ($(PEGASUS_ENABLE_SESSION_COOKIES),false)
       $(error "PEGASUS_ENABLE_SESSION_COOKIES must be true or false")
     endif
   endif
   
   ##==============================================================================
   ##
   ## PEGASUS_POSIX_TIMED_LOCK
   ##
   ##==============================================================================
   
   ifndef PEGASUS_POSIX_TIMED_LOCK
     PEGASUS_POSIX_TIMED_LOCK=true
   endif
   
   ifeq ($(PEGASUS_POSIX_TIMED_LOCK),true)
     DEFINES += -DPEGASUS_POSIX_TIMED_LOCK
   else
     ifneq ($(PEGASUS_POSIX_TIMED_LOCK),false)
       $(error "PEGASUS_POSIX_TIMED_LOCK must be true or false")
     endif
   endif


Legend:
Removed from v.1.217  
changed lines
  Added in v.1.220

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2