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

Diff for /pegasus/mak/config.mak between version 1.157 and 1.161.4.2

version 1.157, 2008/02/19 22:49:19 version 1.161.4.2, 2008/04/25 22:23:39
Line 57 
Line 57 
     $(error PEGASUS_ROOT environment variable undefined)     $(error PEGASUS_ROOT environment variable undefined)
 endif endif
  
   ############################################################################
   # OpenPegasus relies on the existence of an external set of libraries to
   # support localized messages.  Today, the only supported package is
   # the International Components for Unicode (ICU) OSS project,
   # http://oss.software.ibm.com/icu.  If PEGASUS_HAS_ICU is true,
   # OpenPegasus will use the ICU library.
   #
   # ICU_ROOT points to the root directory of the ICU source tree.  If set,
   # the OpenPegasus build will use this variable to locate the ICU include
   # files. If not set, the ICU include files are expected to be installed
   # in directories that are searched by default.
   #
   # ICU_INSTALL points to the directory containing the ICU libraries.
   # If set, the OpenPegasus will use this variable to locate the ICU
   # libraries.  If not set, the ICU libraries are expected to be installed
   # in a directory that is searched by default.
   #
   # If PEGASUS_HAS_ICU is not set and either ICU_ROOT or ICU_INSTALL is
   # set, the value of PEGASUS_HAS_ICU will be set to true.
   ############################################################################
   ifdef PEGASUS_HAS_ICU
       ifneq ($(PEGASUS_HAS_ICU),true)
           ifneq ($(PEGASUS_HAS_ICU),false)
               $(error PEGASUS_HAS_ICU ($(PEGASUS_HAS_ICU)) \
                   invalid, must be true or false)
           endif
       endif
   else
       ifdef ICU_ROOT
           PEGASUS_HAS_ICU = true
       else
           ifdef ICU_INSTALL
               PEGASUS_HAS_ICU = true
           endif
       endif
   endif
   
   ifdef PEGASUS_HAS_MESSAGES
       ifneq ($(PEGASUS_HAS_ICU),true)
           $(error Support for localized messages in OpenPegasus \
               requires PEGASUS_HAS_ICU to be true)
       endif
   endif
   
 # l10n # l10n
 ifdef ICU_ROOT ifdef ICU_ROOT
     ICUROOT =  $(subst \,/,$(ICU_ROOT))     ICUROOT =  $(subst \,/,$(ICU_ROOT))
Line 425 
Line 469 
     DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION     DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
 endif endif
  
   ############################################################################
   #
   # PEGASUS_ENABLE_CQL and PEGASUS_DISABLE_CQL
   # Set to enable CQL processor in indication subscriptions and query execution
   # PEGASUS_DISABLE_CQL (PEP 193) has been depracated. New use model is:
   #
   # Use PEGASUS_ENABLE_CQL=true  to enable  compilation of CQL functions.
   #
   # Use PEGASUS_ENABLE_CQL=false to disable compilation of CQL functions.
 # #
 # PEP 193  # Default is PEGASUS_ENABLE_CQL=true if not defined external to config.mak
 # The following flag need to be set to disable  
 # CQL in indication subscriptions  
 # #
   
 ifdef PEGASUS_DISABLE_CQL ifdef PEGASUS_DISABLE_CQL
     DEFINES += -DPEGASUS_DISABLE_CQL      $(error PEGASUS_DISABLE_CQL has been deprecated. Please use PEGASUS_ENABLE_CQL=[true/false])
   endif
   
   ifndef PEGASUS_ENABLE_CQL
       # Default is true. CQL is enabled normally on all platforms unless specifically defined
       PEGASUS_ENABLE_CQL=true
   endif
   
   ifeq ($(PEGASUS_ENABLE_CQL),true)
       DEFINES += -DPEGASUS_ENABLE_CQL
   else
       ifneq ($(PEGASUS_ENABLE_CQL),false)
           $(error PEGASUS_ENABLE_CQL ($(PEGASUS_ENABLE_CQL)) invalid, must be true or false)
       endif
 endif endif
  
   ############################################################################
 # #
   # 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
 # pegasus/src/Pegasus/Common/ProductVersion.h must exist when this # pegasus/src/Pegasus/Common/ProductVersion.h must exist when this
Line 656 
Line 723 
   PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)   PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)
 endif endif
  
   #
   # PEP 322
   # Allow tracking generated indications data to be disabled.  It is enabled
   # by default.
   #
   
   ifndef PEGASUS_ENABLE_INDICATION_COUNT
       PEGASUS_ENABLE_INDICATION_COUNT = true
   endif
   
   ifdef PEGASUS_ENABLE_INDICATION_COUNT
       ifeq ($(PEGASUS_ENABLE_INDICATION_COUNT),true)
           DEFINES += -DPEGASUS_ENABLE_INDICATION_COUNT
       else
           ifneq ($(PEGASUS_ENABLE_INDICATION_COUNT),false)
               $(error PEGASUS_ENABLE_INDICATION_COUNT \
                 ($(PEGASUS_ENABLE_INDICATION_COUNT)) invalid, must be true or false)
           endif
       endif
   endif
   
 ############################################################################ ############################################################################
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
Line 1045 
Line 1133 
     DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND     DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND
 endif endif
  
   ## ======================================================================
   ##
   ## PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE
   ## This controls allowing the path specified in the Location property of
   ## PG_ProviderModule class.
   ##
   ##   Set to "true", It allows the absolute path specified in the Location property
   ##   of PG_ProviderModule class. Otherwise it does not allow the absolute path.
   ##   see bug 7289 for background information concerning this config variable.
   ##
   
   ifndef PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE
       PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE=false
   endif
   
   ifdef PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE
     ifeq ($(PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE),true)
       DEFINES += -DPEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE
     else
       ifneq ($(PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE),false)
         $(error PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE \
               ($(PEGASUS_ALLOW_ABSOLUTEPATH_IN_PROVIDERMODULE)) \
               invalid, must be true or false)
       endif
     endif
   endif
   


Legend:
Removed from v.1.157  
changed lines
  Added in v.1.161.4.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2