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

Diff for /pegasus/mak/config.mak between version 1.135.4.3 and 1.156

version 1.135.4.3, 2008/01/09 05:55:50 version 1.156, 2008/01/04 18:34:50
Line 98 
Line 98 
     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
   
   #############################################################################
   
   ifdef PEGASUS_TEST_VALGRIND_LOG
       BIN_DIR = $(HOME_DIR)/bin_exe
       VALGRIND_SCRIPT_BIN_DIR = $(HOME_DIR)/bin
   else
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
   endif
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
  
 # l10n # l10n
Line 204 
Line 229 
 # option of the mof compiler needs to be set. # option of the mof compiler needs to be set.
 # ***** # *****
  
 ifdef PEGASUS_CIM_SCHEMA  ifndef PEGASUS_CIM_SCHEMA
       PEGASUS_CIM_SCHEMA=CIM2131
   endif
   
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
     ifeq ($(findstring $(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA))),1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 271 28),)     ifeq ($(findstring $(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA))),1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 271 28),)
        CIM_SCHEMA_VER=        CIM_SCHEMA_VER=
     else     else
        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))        CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
     endif     endif
 else  
     CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM29  
     CIM_SCHEMA_VER=  
 endif  
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
     ALLOW_EXPERIMENTAL = -aE     ALLOW_EXPERIMENTAL = -aE
Line 456 
Line 480 
 # #
 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 530 
   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
     OPENSSL_BIN = $(OPENSSL_HOME)/bin  
       # Enable SSL Random file by default.
       ifndef PEGASUS_USE_SSL_RANDOMFILE
           PEGASUS_USE_SSL_RANDOMFILE = true
       endif
   
       # Allow SSL Random file functionality to be optionally disabled.
       ifdef PEGASUS_USE_SSL_RANDOMFILE
           ifeq ($(PEGASUS_USE_SSL_RANDOMFILE), true)
               DEFINES += -DPEGASUS_SSL_RANDOMFILE
           else
               ifneq ($(PEGASUS_USE_SSL_RANDOMFILE), false)
                   $(error PEGASUS_USE_SSL_RANDOMFILE\
                        ($(PEGASUS_USE_SSL_RANDOMFILE)) invalid, \
                         must be true or false)
               endif
           endif
  endif  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 571 
Line 592 
  
 # #
 # PEP 258 # PEP 258
 # Allow Audit Logger to be disabled  # Allow Audit Logger to be disabled.  It is enabled by default.
 # #
 ifdef PEGASUS_DISABLE_AUDIT_LOGGER  
   ifeq ($(PEGASUS_DISABLE_AUDIT_LOGGER),true)  ifndef PEGASUS_ENABLE_AUDIT_LOGGER
     DEFINES += -DPEGASUS_DISABLE_AUDIT_LOGGER      PEGASUS_ENABLE_AUDIT_LOGGER = true
   endif
   
   ifdef PEGASUS_ENABLE_AUDIT_LOGGER
       ifeq ($(PEGASUS_ENABLE_AUDIT_LOGGER),true)
           DEFINES += -DPEGASUS_ENABLE_AUDIT_LOGGER
   else   else
     ifneq ($(PEGASUS_DISABLE_AUDIT_LOGGER),false)          ifneq ($(PEGASUS_ENABLE_AUDIT_LOGGER),false)
       $(error PEGASUS_DISABLE_AUDIT_LOGGER ($(PEGASUS_DISABLE_AUDIT_LOGGER)) \              $(error PEGASUS_ENABLE_AUDIT_LOGGER \
        invalid, must be true or false)                ($(PEGASUS_ENABLE_AUDIT_LOGGER)) invalid, must be true or false)
     endif     endif
   endif   endif
 endif endif
  
   # Check for use of deprecated variable
   ifdef PEGASUS_DISABLE_AUDIT_LOGGER
       $(error The PEGASUS_DISABLE_AUDIT_LOGGER variable is deprecated. \
           Use PEGASUS_ENABLE_AUDIT_LOGGER=false instead)
   endif
   
  
 # #
 # PEP 291 # PEP 291
Line 591 
Line 623 
 # #
  
 ifndef PEGASUS_ENABLE_IPV6 ifndef PEGASUS_ENABLE_IPV6
     PEGASUS_ENABLE_IPV6 = false      PEGASUS_ENABLE_IPV6 = true
 endif endif
  
 # Check for Enable IPv6 support # Check for Enable IPv6 support
Line 624 
Line 656 
   PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)   PEGASUS_TEST_IPV6 = $(PEGASUS_ENABLE_IPV6)
 endif endif
  
   ############################################################################
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
Line 734 
Line 766 
   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 906 
Line 986 
   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 = :
Line 923 
Line 1039 
         PEGASUS_JAVA_JAR                = jar         PEGASUS_JAVA_JAR                = jar
         PEGASUS_JAVA_INTERPRETER        = java         PEGASUS_JAVA_INTERPRETER        = java
 endif endif
   
   # Disable client timeouts when we're doing a valgrind build
   ifdef PEGASUS_TEST_VALGRIND_LOG
       DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND
   endif
   

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