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

Diff for /pegasus/mak/config.mak between version 1.133.2.1 and 1.136

version 1.133.2.1, 2006/10/10 04:10:31 version 1.136, 2007/01/30 12:55:01
Line 57 
Line 57 
     $(error PEGASUS_ROOT environment variable undefined)     $(error PEGASUS_ROOT environment variable undefined)
 endif endif
  
   
 # l10n # l10n
 ifdef ICU_ROOT ifdef ICU_ROOT
     ICUROOT =  $(subst \,/,$(ICU_ROOT))     ICUROOT =  $(subst \,/,$(ICU_ROOT))
Line 559 
Line 558 
 # Check for Enable SSL CRL verification # Check for Enable SSL CRL verification
 ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
     ifeq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), true)     ifeq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), true)
         FLAGS += -DPEGASUS_ENABLE_SSL_CRL_VERIFICATION          DEFINES += -DPEGASUS_ENABLE_SSL_CRL_VERIFICATION
     else     else
         ifneq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), false)         ifneq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), false)
             $(error PEGASUS_ENABLE_SSL_CRL_VERIFICATION\             $(error PEGASUS_ENABLE_SSL_CRL_VERIFICATION\
Line 571 
Line 570 
 endif endif
  
 # #
   # PEP 258
   # Allow Audit Logger to be disabled
   #
   ifdef PEGASUS_DISABLE_AUDIT_LOGGER
     ifeq ($(PEGASUS_DISABLE_AUDIT_LOGGER),true)
       DEFINES += -DPEGASUS_DISABLE_AUDIT_LOGGER
     else
       ifneq ($(PEGASUS_DISABLE_AUDIT_LOGGER),false)
         $(error PEGASUS_DISABLE_AUDIT_LOGGER ($(PEGASUS_DISABLE_AUDIT_LOGGER)) \
          invalid, must be true or false)
       endif
     endif
   endif
   
   #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
 # PEGASUS_DISABLE_SLP has been depracated. New use model is: # PEGASUS_DISABLE_SLP has been depracated. New use model is:
Line 594 
Line 608 
   endif   endif
 endif endif
  
 ifdef PEGASUS_USE_OPENSLP  
   ifdef PEGASUS_SLP_REG_TIMEOUT  
     $(error Conflicting defines PEGASUS_USE_OPENSLP and PEGASUS_SLP_REG_TIMEOUT both set)  
   endif  
 endif  
   
 ifdef PEGASUS_DISABLE_SLP ifdef PEGASUS_DISABLE_SLP
     $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )     $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )
  
Line 607 
Line 615 
  
 endif endif
  
 ifdef PEGASUS_SLP_REG_TIMEOUT  
    ifeq ($(PEGASUS_ENABLE_SLP),true)  
       DEFINES += -DPEGASUS_SLP_REG_TIMEOUT  
     else  
       $(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)  
     endif  
 endif  
   
   
   
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
   ifeq ($(PEGASUS_ENABLE_SLP),true)   ifeq ($(PEGASUS_ENABLE_SLP),true)
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
Line 658 
Line 656 
     endif     endif
 endif endif
  
   # PEP 267
   # SLP reregistration support.
   # PEGASUS_SLP_REG_TIMEOUT is defined as the SLP registration timeout
   # interval, in minutes.
   ifdef PEGASUS_SLP_REG_TIMEOUT
       ifeq ($(PEGASUS_ENABLE_SLP),true)
          DEFINES += -DPEGASUS_SLP_REG_TIMEOUT=$(PEGASUS_SLP_REG_TIMEOUT)
        else
          $(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)
        endif
    endif
  
 ############################################################################ ############################################################################
 # #
Line 720 
Line 729 
  
 # Set compile flag to control compilation of CIMOM statistics # Set compile flag to control compilation of CIMOM statistics
 ifdef PEGASUS_DISABLE_PERFINST ifdef PEGASUS_DISABLE_PERFINST
     FLAGS += -DPEGASUS_DISABLE_PERFINST      DEFINES += -DPEGASUS_DISABLE_PERFINST
 endif endif
  
 # Set compile flag to control compilation of SNIA Extensions # Set compile flag to control compilation of SNIA Extensions
 ifdef PEGASUS_SNIA_EXTENSIONS ifdef PEGASUS_SNIA_EXTENSIONS
     FLAGS += -DPEGASUS_SNIA_EXTENSIONS      DEFINES += -DPEGASUS_SNIA_EXTENSIONS
 endif endif
  
 ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
     ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)     ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
         FLAGS += -DPEGASUS_ENABLE_CMPI_PROVIDER_MANAGER          DEFINES += -DPEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
     else     else
         ifneq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), false)         ifneq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), false)
             $(error PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER \             $(error PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER \
Line 742 
Line 751 
  
 ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
     ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)     ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
         FLAGS += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER          DEFINES += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
     else     else
         ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)         ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)
             $(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \             $(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \
Line 754 
Line 763 
  
 # Allow remote CMPI functionality to be enabled # Allow remote CMPI functionality to be enabled
 ifdef PEGASUS_ENABLE_REMOTE_CMPI ifdef PEGASUS_ENABLE_REMOTE_CMPI
     FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI      DEFINES += -DPEGASUS_ENABLE_REMOTE_CMPI
 endif endif
  
 ############################################################ ############################################################
Line 782 
Line 791 
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
 ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
     FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS      DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS
 endif endif
  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS      DEFINES += -DPEGASUS_USE_RELEASE_DIRS
 endif endif
  
 ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
     FLAGS += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS      DEFINES += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
 endif endif
  
 # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib

Legend:
Removed from v.1.133.2.1  
changed lines
  Added in v.1.136
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2