(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.2 and 1.151.2.5

version 1.133.2.2, 2006/10/23 09:15:48 version 1.151.2.5, 2007/11/01 15:11:58
Line 39 
Line 39 
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 endif endif
  
   ifdef CONFIGURATION
     include $(CONFIGURATION)
   else
     -include $(ROOT)/configure.mak
   endif
   
 ifdef PEGASUS_ENVVAR_FILE ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)     include $(PEGASUS_ENVVAR_FILE)
 else else
Line 98 
Line 104 
     GCC_VERSION =     GCC_VERSION =
 endif endif
  
   #############################################################################
   ## As a general rule, the directory structure for the object files mirrors
   ## the directory structure of the source files.  E.g.,
   ## $PEGASUS_HOME/obj/Pegasus/Common contains the object files for the
   ## source files in $PEGASUS_ROOT/src/Pegasus/Common.  Each source-level
   ## Makefile includes a DIR value that defines this common path (e.g.,
   ## Pegasus/Common). In a small number of cases, source files are built
   ## multiple times with difference compile options.
   ## To handle this situation, the ALT_OBJ_DIR variable can be used to
   ## specify an alternative object directory for use in building the
   ## objects defined in the Makefile.
   ##
   
   ifndef ALT_OBJ_DIR
 OBJ_DIR = $(HOME_DIR)/obj/$(DIR) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
   else
       OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)
   endif
   
   #############################################################################
   
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
  
Line 212 
Line 238 
        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif     endif
 else else
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29      CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM2131
     CIM_SCHEMA_VER=     CIM_SCHEMA_VER=
 endif endif
  
Line 456 
Line 482 
 # #
 ifdef PEGASUS_DISABLE_PROV_USERCTXT ifdef PEGASUS_DISABLE_PROV_USERCTXT
     DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT     DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT
 else  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_REQUESTOR  
     endif  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_DESIGNATED  
     endif  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_PRIVILEGED  
     endif  
     ifdef PEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER  
         DEFINES += -DPEGASUS_DISABLE_PROV_USERCTXT_CIMSERVER  
     endif  
 endif endif
  
 # Bug 2147 # Bug 2147
Line 519 
Line 532 
   DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS   DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS
 endif endif
  
 # Allow repository instance filtering to be disabled  
 ifdef PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER  
   ifeq ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER), false)  
     DEFINES += -DPEGASUS_DISABLE_REPOSITORY_INSTANCE_FILTER  
   else  
     ifneq ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER), true)  
       $(error PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER ($(PEGASUS_ENABLE_REPOSITORY_INSTANCE_FILTER)) invalid, must be true or false)  
     endif  
   endif  
 endif  
   
 # Controls snmp indication handler to use NET-SNMP to deliver trap # Controls snmp indication handler to use NET-SNMP to deliver trap
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
   DEFINES += -DPEGASUS_USE_NET_SNMP   DEFINES += -DPEGASUS_USE_NET_SNMP
 endif endif
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
  ifndef OPENSSL_BIN      DEFINES += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
     OPENSSL_BIN = $(OPENSSL_HOME)/bin  
  endif  
  ifndef OPENSSL_COMMAND  ifndef OPENSSL_COMMAND
           ifdef OPENSSL_BIN
     OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl     OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl
           else
               OPENSSL_COMMAND = openssl
           endif
  endif  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)))
Line 558 
Line 563 
 # 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 570 
Line 575 
 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
   
   
   #
   # PEP 291
   # Enable IPv6 support
   #
   
   ifndef PEGASUS_ENABLE_IPV6
       PEGASUS_ENABLE_IPV6 = true
   endif
   
   # Check for Enable IPv6 support
   ifdef PEGASUS_ENABLE_IPV6
     ifeq ($(PEGASUS_ENABLE_IPV6),true)
       DEFINES += -DPEGASUS_ENABLE_IPV6
     else
       ifneq ($(PEGASUS_ENABLE_IPV6),false)
         $(error PEGASUS_ENABLE_IPV6 ($(PEGASUS_ENABLE_IPV6)) \
          invalid, must be true or false)
       endif
     endif
   endif
   
   # Verify Test IPv6 support
   # If PEGASUS_ENABLE_IPV6 is defined and PEGASUS_TEST_IPV6 is not defined, we set
   # PEGASUS_TEST_IPV6 to the same value as PEGASUS_ENABLE_IPV6.
   # You can explicitly set PEGASUS_TEST_IPV6 to false if you don't want to run the
   # IPv6 tests (for example, on an IPv4 system that is running an IPv6-enabled
   # version of Pegasus).
   #
   ifdef PEGASUS_TEST_IPV6
     ifneq ($(PEGASUS_TEST_IPV6),true)
       ifneq ($(PEGASUS_TEST_IPV6),false)
         $(error PEGASUS_TEST_IPV6 ($(PEGASUS_TEST_IPV6)) \
          invalid, must be true or false)
       endif
     endif
   else
     PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)
   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 600 
Line 661 
  
 endif endif
  
 # PEP 267  
 # SLP reregistration support.  
 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  
   
   
   
 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 653 
Line 702 
     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 679 
Line 739 
   DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT   DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
 endif endif
  
   ############################################################################
   #
   # PEGASUS_ENABLE_INTEROP_PROVIDER
   # Enables the interop provider AND the server profile.
   # initially this was activated by setting either the perfinst or slp enable
   # flags.  This allows activating this function without any either perfinst or
   # slp enabled.  Note that if either of these are enabled, this funtion is also
   # enabled
   
   ## if either slp or perfinst are enabled and this is false, flag error
   ## This gets messy because should account for both postive and negative on
   ## interop so we don't get multiples.
   
   ifdef PEGASUS_ENABLE_SLP
       ifeq ($(PEGASUS_ENABLE_SLP),true)
           ifndef PEGASUS_ENABLE_INTEROP_PROVIDER
               PEGASUS_ENABLE_INTEROP_PROVIDER = true
           else
               ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)
                   $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if SLP enabled)
               endif
           endif
       endif
   endif
   
   ## if PERFINST enabled, set to force interop.
   ifndef PEGASUS_DISABLE_PERFINST
       ifndef PEGASUS_ENABLE_INTEROP_PROVIDER
           PEGASUS_ENABLE_INTEROP_PROVIDER = true
       else
           ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)
               $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true if PERFINST enabled)
           endif
       endif
   endif
   
   ifdef PEGASUS_ENABLE_INTEROP_PROVIDER
       ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
           DEFINES += -DPEGASUS_ENABLE_INTEROP_PROVIDER
       else
           ifneq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),false)
               $(error PEGASUS_ENABLE_INTEROP_PROVIDER ($(PEGASUS_ENABLE_INTEROP_PROVIDER)) invalid, must be true or false)
           endif
       endif
   endif
   
   
   ############################################################################
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
 # Note that this flag is the general separator between # Note that this flag is the general separator between
 # debug compiles and non-debug compiles and controls both # debug compiles and non-debug compiles and controls both
Line 715 
Line 823 
  
 # 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 737 
Line 845 
  
 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 749 
Line 857 
  
 # 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 777 
Line 885 
 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
Line 851 
Line 959 
   endif   endif
 endif endif
  
   ##==============================================================================
   ##
   ## PEGASUS_ENABLE_PRIVILEGE_SEPARATION
   ##
   ##     Enables privilege separation support (uses the executor process to
   ##     perform privileged operations).
   ##
   ##==============================================================================
   
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
     ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
       DEFINES += -DPEGASUS_ENABLE_PRIVILEGE_SEPARATION
     else
       ifneq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),false)
         $(error PEGASUS_ENABLE_PRIVILEGE_SEPARATION \
           ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)) invalid, must be true or false)
       endif
     endif
   
     ## Defines the user context of the cimservermain process when privilege
     ## separation is enabled.
     PEGASUS_CIMSERVERMAIN_USER = cimsrvr
     DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"
   endif
   
   ##==============================================================================
   ##
   ## PEGASUS_USE_PAM_STANDALONE_PROC
   ##
   ##==============================================================================
   
   ifdef PEGASUS_USE_PAM_STANDALONE_PROC
     DEFINES += -DPEGASUS_USE_PAM_STANDALONE_PROC
   endif
   
   ##==============================================================================
  
 ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER
     PEGASUS_JAVA_CLASSPATH_DELIMITER = :     PEGASUS_JAVA_CLASSPATH_DELIMITER = :

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