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

Diff for /pegasus/mak/config.mak between version 1.108 and 1.125

version 1.108, 2005/11/16 18:48:39 version 1.125, 2006/05/02 20:26:56
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 86 
Line 88 
 endif endif
  
 ################################################################################ ################################################################################
   ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU)
       ifdef CXX
         GCC_VERSION = $(shell $(CXX) -dumpversion)
       else
         GCC_VERSION = $(shell g++ -dumpversion)
       endif
   else
       GCC_VERSION =
   endif
  
 OBJ_DIR = $(HOME_DIR)/obj/$(DIR) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
Line 161 
Line 172 
 # #
 # To use the PEGASUS_CIM_SCHEMA variable the Schema mof # To use the PEGASUS_CIM_SCHEMA variable the Schema mof
 # files must be placed in the directory # files must be placed in the directory
 # $(PEGAUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)  # $(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
 # #
 # The value of PEGASUS_CIM_SCHEMA must conform to the # The value of PEGASUS_CIM_SCHEMA must conform to the
 # following syntax: # following syntax:
Line 419 
Line 430 
 # PEP 72 # PEP 72
 # Allow Out-of-Process Providers to be disabled by default # Allow Out-of-Process Providers to be disabled by default
 # #
 ifdef PEGASUS_DEFAULT_OOP_FALSE  ifdef PEGASUS_DEFAULT_ENABLE_OOP
     DEFINES += -DPEGASUS_DEFAULT_OOP_FALSE    ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
       DEFINES += -DPEGASUS_DEFAULT_ENABLE_OOP
     else
       ifneq ($(PEGASUS_DEFAULT_ENABLE_OOP),false)
         $(error PEGASUS_DEFAULT_ENABLE_OOP ($(PEGASUS_DEFAULT_ENABLE_OOP)) invalid, must be true or false)
       endif
     endif
 endif endif
  
 # #
Line 456 
Line 473 
     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
 endif endif
  
   # PEP 233
   # Controls support for EmbeddedInstance properties
   # and parameters
   ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
       ifeq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), true)
           DEFINES += -DPEGASUS_EMBEDDED_INSTANCE_SUPPORT
       else
           ifneq ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT), false)
               $(error PEGASUS_EMBEDDED_INSTANCE_SUPPORT ($(PEGASUS_EMBEDDED_INSTANCE_SUPPORT)) invalid, must be true or false)
           endif
       endif
   endif
   
 # Allow ExecQuery functionality to be enabled # Allow ExecQuery functionality to be enabled
 ifndef PEGASUS_ENABLE_EXECQUERY ifndef PEGASUS_ENABLE_EXECQUERY
     DEFINES += -DPEGASUS_DISABLE_EXECQUERY     DEFINES += -DPEGASUS_DISABLE_EXECQUERY
Line 471 
Line 501 
   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER   DEFINES += -DPEGASUS_ENABLE_EMAIL_HANDLER
 endif endif
  
   # Allow qualifiers to be disabled for instance operations
   ifdef PEGASUS_DISABLE_INSTANCE_QUALIFIERS
     DEFINES += -DPEGASUS_DISABLE_INSTANCE_QUALIFIERS
   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
    ifndef OPENSSL_BIN
       OPENSSL_BIN = $(OPENSSL_HOME)/bin
    endif
    ifndef OPENSSL_COMMAND
       OPENSSL_COMMAND = $(OPENSSL_BIN)/openssl
    endif
    ifndef OPENSSL_SET_SERIAL_SUPPORTED
       ifneq (, $(findstring 0.9.6, $(shell $(OPENSSL_COMMAND) version)))
           OPENSSL_SET_SERIAL_SUPPORTED = false
       else
           OPENSSL_SET_SERIAL_SUPPORTED = true
       endif
    endif
   
   # Enable CRL verification
   ifndef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
       PEGASUS_ENABLE_SSL_CRL_VERIFICATION = true
   endif
   
   # Check for Enable SSL CRL verification
   ifdef PEGASUS_ENABLE_SSL_CRL_VERIFICATION
       ifeq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), true)
           FLAGS += -DPEGASUS_ENABLE_SSL_CRL_VERIFICATION
       else
           ifneq ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION), false)
               $(error PEGASUS_ENABLE_SSL_CRL_VERIFICATION\
                    ($(PEGASUS_ENABLE_SSL_CRL_VERIFICATION)) invalid, \
                     must be true or false)
           endif
       endif
   endif
   endif
   
 # #
 # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP # PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP
 # #
 # Use PEGASUS_ENABLE_SLP to enable SLP functions in the Pegasus standard  # PEGASUS_DISABLE_SLP has been depracated. New use model is:
 # compile on those platforms that do not enable it by default.  
 # #
 # Use PEGASUS_DISABLE_SLP to disable SLP on those platforms that enable  # Use PEGASUS_ENABLE_SLP=true  to enable  compilation of SLP functions.
 # it by default.  #
   # Use PEGASUS_ENABLE_SLP=false to disable compilation of SLP functions.
 # #
 # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP
 # by default. # by default.
Line 493 
Line 562 
 # the variable PEGASUS_ENABLE_SLP. # the variable PEGASUS_ENABLE_SLP.
 # #
 # #
   
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
   ifdef PEGASUS_DISABLE_SLP   ifdef PEGASUS_DISABLE_SLP
     $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)     $(error Conflicting defines PEGASUS_ENABLE_SLP and PEGASUS_DISABLE_SLP both set)
   endif   endif
   endif
   
   ifdef PEGASUS_DISABLE_SLP
       $(error PEGASUS_DISABLE_SLP has been deprecated. Please use PEGASUS_ENABLE_SLP=[true/false] )
   
   PEGASUS_ENABLE_SLP=false
   
   endif
   
   ifdef PEGASUS_ENABLE_SLP
     ifeq ($(PEGASUS_ENABLE_SLP),true)
     DEFINES += -DPEGASUS_ENABLE_SLP     DEFINES += -DPEGASUS_ENABLE_SLP
     else
       ifneq ($(PEGASUS_ENABLE_SLP),false)
         $(error PEGASUS_ENABLE_SLP ($(PEGASUS_ENABLE_SLP)) invalid, must be true or false)
       endif
     endif
   endif
   
   
   ############################################################################
   #
   # PEGASUS_USE_OPENSLP
   #
   # Environment variable to set openslp as SLP environment to use
   # for SLP Directory and User Agents.
   #
   # Allows enabling use of openslp interfaces for slp instead of the
   # internal pegasus slp agent.  Note that this does not disable the
   # compilation of the internal agent code, etc.  However, it assumes
   # openslp is installed on the platform and changes the interfaces
   # to match this.  At this moment, this is a change specifically for
   # adaptec but we expect to generalize it to provide openslp as a
   # generalized alternative to ldapslp.
   # to use this. To set this function up,
   #
   # Use this variable in conjunction with PEGASUS_OPENSLP_HOME
   # to enable OpenSlp as the slp implementation.
   #
   # NOTE that it has no affect if the PEGASUS_ENABLE_SLP etc. flags are not set.
   #
   
   ifdef PEGASUS_USE_OPENSLP
      ifeq ($(PEGASUS_ENABLE_SLP),true)
         DEFINES += -DPEGASUS_USE_OPENSLP
       else
         $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)
       endif
   endif
   
   
   ############################################################################
   #
   # PEGASUS_OPENSLP_HOME
   #
   # Environment variable to set home location for OpenSLP include and library
   # files if they are located somewhere other than /usr/include and /usr/lib.
   #
   # PEGASUS_USE_OPENSLP must also be defined for this environment variable
   # to have any effect.
   #
   # This is the directory level within which both the include and lib
   # directories holding the OpenSLP files will be found.
   #
   # EG: If the are located in /opt/OpenSLP/include and /opt/OpenSLP/lib
   #     then this environment variable should be set to /opt/OpenSLP.
   #
   
   
   #
   # Enable this flag to allow the handshake to continue regardless of verification result
   #
   ifdef PEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
     DEFINES += -DPEGASUS_OVERRIDE_SSL_CERT_VERIFICATION_RESULT
 endif endif
  
 # set PEGASUS_DEBUG into the DEFINES if it exists. # set PEGASUS_DEBUG into the DEFINES if it exists.
Line 539 
Line 682 
     FLAGS += -DPEGASUS_SNIA_EXTENSIONS     FLAGS += -DPEGASUS_SNIA_EXTENSIONS
 endif endif
  
   ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
       ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
           FLAGS += -DPEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
       else
           ifneq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), false)
               $(error PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER \
                    ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER)) invalid, \
                     must be true or false)
           endif
       endif
   endif
   
   ifdef PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
       ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
           FLAGS += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
       else
           ifneq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), false)
               $(error PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER \
                    ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER)) invalid, \
                     must be true or false)
           endif
       endif
   endif
   
 # 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     FLAGS += -DPEGASUS_ENABLE_REMOTE_CMPI
Line 576 
Line 743 
     FLAGS += -DPEGASUS_USE_RELEASE_DIRS     FLAGS += -DPEGASUS_USE_RELEASE_DIRS
 endif endif
  
   ifdef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
       FLAGS += -DPEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
   endif
   
 # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib
 ifndef PEGASUS_DEST_LIB_DIR ifndef PEGASUS_DEST_LIB_DIR
     PEGASUS_DEST_LIB_DIR = lib     PEGASUS_DEST_LIB_DIR = lib

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