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

Diff for /pegasus/mak/config.mak between version 1.166 and 1.194

version 1.166, 2008/05/22 17:43:53 version 1.194, 2011/01/07 11:26:03
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// 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
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//==============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 ################################################################################ ################################################################################
 ## ##
 ## Get external environment variables. Note that all external environment ## Get external environment variables. Note that all external environment
Line 107 
Line 105 
 ## ##
  
 ifndef ALT_OBJ_DIR ifndef ALT_OBJ_DIR
     ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
       OBJ_DIR = $(HOME_DIR)/obj32/$(DIR)
     else
     OBJ_DIR = $(HOME_DIR)/obj/$(DIR)     OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
     endif
   else
     ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
       OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)32
 else else
     OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)     OBJ_DIR = $(HOME_DIR)/obj/$(ALT_OBJ_DIR)
 endif endif
   endif
  
 ############################################################################# #############################################################################
  
Line 120 
Line 126 
 else else
     BIN_DIR = $(HOME_DIR)/bin     BIN_DIR = $(HOME_DIR)/bin
 endif endif
   
   ifeq ($(PEGASUS_INTERNAL_ENABLE_32BIT_PROVIDER_SUPPORT),true)
     LIB_DIR = $(HOME_DIR)/lib32
   else
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
   endif
  
 # l10n # l10n
 # define the location for the compiled messages # define the location for the compiled messages
Line 225 
Line 236 
 # ***** # *****
  
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM217      PEGASUS_CIM_SCHEMA=CIM225
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 367 
Line 378 
     endif     endif
 endif endif
  
   
 ifeq ($(PEGASUS_HAS_ICU),true) ifeq ($(PEGASUS_HAS_ICU),true)
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
  
Line 398 
Line 410 
     else     else
         MSG_ROOT_SOURCE = _en         MSG_ROOT_SOURCE = _en
     endif     endif
   
       ifdef ICU_INSTALL
           MSG_COMPILE = $(ICU_INSTALL)/bin/genrb
       else
           MSG_COMPILE = genrb
       endif
   
       MSG_FLAGS =
       MSG_SOURCE_EXT = .txt
       MSG_COMPILE_EXT = .res
   
       ifeq ($(OS),linux)
           CNV_ROOT_CMD = $(BIN_DIR)/cnv2rootbundle
       else
           CNV_ROOT_CMD = cnv2rootbundle
       endif
   
       # The library path option is needed on all link commands with some ICU
       # builds, because internal ICU library dependencies are resolved
       # dynamically.
       ifdef ICU_INSTALL
           ifeq ($(OS),zos)
               # On z/OS, the -L option must appear before the -o option and
               # the object (.o) and sidedeck (.x) files in the link command.
               FLAGS += -L$(ICU_INSTALL)/lib
               PR_FLAGS += -L$(ICU_INSTALL)/lib
           else
               EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib
           endif
       endif
   
       # The ICU include path and library dependencies are restricted to
       # where they are specifically needed.
       ifeq ($(HAS_ICU_DEPENDENCY),true)
           ifdef ICU_INSTALL
               SYS_INCLUDES += -I$(ICU_INSTALL)/include
           endif
   
           ifeq ($(OS),windows)
               EXTRA_LIBRARIES += \
                   $(ICU_INSTALL)/lib/icuuc.lib \
                   $(ICU_INSTALL)/lib/icuin.lib \
                   $(ICU_INSTALL)/lib/icudt.lib
           else
               ifeq ($(OS),zos)
                   EXTRA_LIBRARIES += \
                       $(ICU_INSTALL)/lib/libicui18n$(DYNLIB_SUFFIX) \
                       $(ICU_INSTALL)/lib/libicuuc$(DYNLIB_SUFFIX)
               else
                   EXTRA_LIBRARIES += -licuuc -licui18n
                   ifeq ($(OS),linux)
                       EXTRA_LIBRARIES += -licudata
                   endif
               endif
           endif
       endif
 endif endif
  
 ################################################################################ ################################################################################
Line 470 
Line 538 
     DEFINES += -DPEGASUS_REMOVE_TRACE     DEFINES += -DPEGASUS_REMOVE_TRACE
 endif endif
  
   
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
      PLATFORM_FILE_32 = $(ROOT)/mak/platform_$(PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT).mak
      ifeq ($(wildcard $(PLATFORM_FILE_32)), )
         $(error  PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT  environment variable must be set to one of\
           the following:$(VALID_PLATFORMS))
      endif
        DEFINES += -DPEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
      ifdef PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR
          DEFINES += -DPEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR=\"$(PEGASUS_PROVIDER_MANAGER_32BIT_LIB_DIR)\"
      endif
   endif
   
   # PEP 315
   # Control whether compile with or without method entertexit trace code.
   # A value other than 'true' or 'false' will cause a make error.
   ifdef PEGASUS_REMOVE_METHODTRACE
     ifeq ($(PEGASUS_REMOVE_METHODTRACE),true)
       DEFINES += -DPEGASUS_REMOVE_METHODTRACE
     else
       ifneq ($(PEGASUS_REMOVE_METHODTRACE),false)
         $(error PEGASUS_REMOVE_METHODTRACE ($(PEGASUS_REMOVE_METHODTRACE)) invalid, must be true or false)
       endif
     endif
   endif
   
   # Control whether the class definitions in the repository contain elements
   # propagated from superclass definitions.
   
   ifndef PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES
       PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES = false
   endif
   
   ifeq ($(PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES),true)
       DEFINES += -DPEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES
   else
       ifneq ($(PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES),false)
           $(error PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES ($(PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES)) invalid, must be true or false)
       endif
   endif
   
   # SQLite repository support
   
   ifndef PEGASUS_USE_SQLITE_REPOSITORY
       PEGASUS_USE_SQLITE_REPOSITORY = false
   endif
   
   ifeq ($(PEGASUS_USE_SQLITE_REPOSITORY),true)
       ifeq ($(PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES),true)
           $(error PEGASUS_REPOSITORY_STORE_COMPLETE_CLASSES may not be set to true when PEGASUS_USE_SQLITE_REPOSITORY is true)
       endif
       DEFINES += -DPEGASUS_USE_SQLITE_REPOSITORY
   else
       ifneq ($(PEGASUS_USE_SQLITE_REPOSITORY),false)
           $(error PEGASUS_USE_SQLITE_REPOSITORY ($(PEGASUS_USE_SQLITE_REPOSITORY)) invalid, must be true or false)
       endif
   endif
   
 # PEP 161 # PEP 161
 # Control whether utf-8 filenames are supported by the repository  # Control whether utf-8 filenames are supported by the repository.
   # Note: These options only apply to the file-based repository, not SQLite.
 ifdef PEGASUS_SUPPORT_UTF8_FILENAME ifdef PEGASUS_SUPPORT_UTF8_FILENAME
     DEFINES += -DPEGASUS_SUPPORT_UTF8_FILENAME     DEFINES += -DPEGASUS_SUPPORT_UTF8_FILENAME
  
Line 582 
Line 709 
     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION     DEFINES += -DPEGASUS_ENABLE_OBJECT_NORMALIZATION
 endif endif
  
 # PEP 233  
 # Controls support for EmbeddedInstance properties  
 # and parameters  
 ifndef PEGASUS_EMBEDDED_INSTANCE_SUPPORT  
     PEGASUS_EMBEDDED_INSTANCE_SUPPORT = true  
 endif  
   
 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  
   
   
 # 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 623 
Line 734 
   DEFINES += -DPEGASUS_USE_NET_SNMP   DEFINES += -DPEGASUS_USE_NET_SNMP
 endif endif
  
   # Controls snmp indication handler to use NET-SNMP V3 features.
   ifndef PEGASUS_ENABLE_NET_SNMPV3
       ifdef PEGASUS_USE_NET_SNMP
           PEGASUS_ENABLE_NET_SNMPV3=true
       else
           PEGASUS_ENABLE_NET_SNMPV3=false
       endif
   endif
   
   ifeq ($(PEGASUS_ENABLE_NET_SNMPV3),true)
       ifndef PEGASUS_USE_NET_SNMP
           $(error PEGASUS_USE_NET_SNMP should be set when PEGASUS_ENABLE_NET_SNMPV3 is true)
       endif
       DEFINES += -DPEGASUS_ENABLE_NET_SNMPV3
   else
       ifneq ($(PEGASUS_ENABLE_NET_SNMPV3),false)
           $(error PEGASUS_ENABLE_NET_SNMPV3 ($(PEGASUS_ENABLE_NET_SNMPV3)) invalid, must be true or false)
       endif
   endif
   
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
     DEFINES += -DPEGASUS_HAS_SSL     DEFINES += -DPEGASUS_HAS_SSL
  
Line 769 
Line 900 
 # #
 # 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 deprecated. New use model is:
 # #
 # Use PEGASUS_ENABLE_SLP=true  to enable  compilation of SLP functions. # Use PEGASUS_ENABLE_SLP=true  to enable  compilation of SLP functions.
 # #
 # Use PEGASUS_ENABLE_SLP=false to disable compilation of SLP functions. # Use PEGASUS_ENABLE_SLP=false to disable compilation of SLP functions.
 # #
 # Currently (Aug. 12, 2005) Windows is the only platform that enables SLP  
 # by default.  
 #  
 # NOTE. Effective with Bug # 2633 some platforms enable SLP. # NOTE. Effective with Bug # 2633 some platforms enable SLP.
 # To see which platforms look for platform make files that set # To see which platforms look for platform make files that set
 # the variable PEGASUS_ENABLE_SLP. # the variable PEGASUS_ENABLE_SLP.
Line 811 
Line 939 
 ############################################################################ ############################################################################
 # #
 # PEGASUS_USE_OPENSLP # PEGASUS_USE_OPENSLP
   
   ## NOTE: This variable has been deprecated and superceeded by the use of
   ## PEGASUS_USE_EXTERNAL_SLP. The use of this variable may be
   ## removed from Pegasus in future releases. It is converted to the
   ## PEGASUS_USE_EXTERNAL_SLP variable in the following function.
   ## Do not allow PEGASUS_USE_EXTERNAL_SLP if PEGASUS_ENABLE_SLP not set and
   ## insure that PEGASUS_USE_OPENSLP and PEGASUS_USE_EXTERNAL_SLP are not used
   ## simultaneously
 # #
 # Environment variable to set openslp as SLP environment to use # Environment variable to set openslp as SLP environment to use
 # for SLP Directory and User Agents. # for SLP Directory and User Agents.
Line 819 
Line 955 
 # internal pegasus slp agent.  Note that this does not disable the # internal pegasus slp agent.  Note that this does not disable the
 # compilation of the internal agent code, etc.  However, it assumes # compilation of the internal agent code, etc.  However, it assumes
 # openslp is installed on the platform and changes the interfaces # openslp is installed on the platform and changes the interfaces
 # to match this.  At this moment, this is a change specifically for  # to match this.
 # 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 # Use this variable in conjunction with PEGASUS_OPENSLP_HOME
 # to enable OpenSlp as the slp implementation. # to enable OpenSlp as the slp implementation.
Line 831 
Line 964 
 # #
  
 ifdef PEGASUS_USE_OPENSLP ifdef PEGASUS_USE_OPENSLP
     ifdef PEGASUS_USE_EXTERNAL_SLP
         $(error Both PEGASUS_USE_OPENSLP and PEGASUS_USE_EXTERNAL_SLP defined. \
             Please use PEGASUS_USE_EXTERNAL_SLP)
     endif
     ## if PEGASUS_USE_OPENSLP used, convert to EXTERNAL_SLP variables
     ## as defined for openslp
     ifeq ($(PEGASUS_USE_OPENSLP),true)
    ifeq ($(PEGASUS_ENABLE_SLP),true)    ifeq ($(PEGASUS_ENABLE_SLP),true)
       DEFINES += -DPEGASUS_USE_OPENSLP        export PEGASUS_USE_EXTERNAL_SLP=openslp
         PEGASUS_USE_OPENSLP=
     else     else
       $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)        $(error PEGASUS_USE_OPENSLP defined but PEGASUS_ENABLE_SLP is not true. \
           Please correct this inconsistency)
       endif
     else
       ifneq ($(PEGASUS_USE_OPENSLP), false)
         $(error PEGASUS_USE_OPENSLP \
               ($(PEGASUS_USE_OPENSLP)) \
               invalid, must be true or false)
       endif
     endif     endif
 endif endif
  
   #########################################################################
 # PEP 267 # PEP 267
 # SLP reregistration support. # SLP reregistration support.
 # PEGASUS_SLP_REG_TIMEOUT is defined as the SLP registration timeout # PEGASUS_SLP_REG_TIMEOUT is defined as the SLP registration timeout
Line 846 
Line 996 
     ifeq ($(PEGASUS_ENABLE_SLP),true)     ifeq ($(PEGASUS_ENABLE_SLP),true)
        DEFINES += -DPEGASUS_SLP_REG_TIMEOUT=$(PEGASUS_SLP_REG_TIMEOUT)        DEFINES += -DPEGASUS_SLP_REG_TIMEOUT=$(PEGASUS_SLP_REG_TIMEOUT)
      else      else
        $(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. Please correct this inconsistency)          $(error PEGASUS_SLP_REG_TIMEOUT defined but PEGASUS_ENABLE_SLP is not true. \
               Please correct this inconsistency)
        endif
    endif
   
   ############################################################################
   #
   # PEGASUS_USE_EXTERNAL_SLP
   
   # Environment variable to set an external slp implementation as the SLP
   # environment to use for SLP Directory Agents.
   
   # This allows setting any one of several possible external SLP SAs as the
   # interface for the SLP provider to communicate with in managing SLP templates
   # in place of the internal SLP agent provided with Pegasus.
   # Note: This does not disable the compilation of the internal agent code since
   # this is used for the SLP UA defined with the pegasus client.
   # Pegasus assumes that the external SLP defined is installed on the platform
   # and running when pegasus is started. It changes the interfaces from the SLP
   # provider to match the defined SLP implementation.
   
   # This environment variable superceedes the use of PEGASUS_USE_OPENSLP since
   # openslp is considered one of the valid external SLP environments usable by
   # pegasus.
   
   # The variable uses the value component to define a name for the external SLP
   # environment that must match one of the names defined below.
   
   # This variable is not allowed if the PEGASUS_ENABLE_SLP flag is not set.
   
   # Allow only predefined string values for the variable corresponding
   # to external slp types that pegasus knows.
   # Valid types are openslp (1) and solarisslp (2)
   EXTERNAL_SLP_TYPES = openslp solarisslp
   
   ifdef PEGASUS_USE_EXTERNAL_SLP
     ifeq ($(PEGASUS_ENABLE_SLP),true)
       ifeq ($(PEGASUS_USE_EXTERNAL_SLP),openslp)
         DEFINES += -DPEGASUS_USE_EXTERNAL_SLP_TYPE=1
       else
         ifeq ($(PEGASUS_USE_EXTERNAL_SLP),solarisslp)
            DEFINES += -DPEGASUS_USE_EXTERNAL_SLP_TYPE=2
         else
           $(error PEGASUS_USE_EXTERNAL_SLP value ($(PEGASUS_USE_EXTERNAL_SLP)) \
             invalid. It must be one of valid SLP external types \
             ($(EXTERNAL_SLP_TYPES)) )
         endif
       endif
      endif      endif
  endif  endif
  
Line 854 
Line 1051 
 # #
 # PEGASUS_OPENSLP_HOME # PEGASUS_OPENSLP_HOME
 # #
   # PEGASUS_OPENSLP_HOME superceeded by PEGASUS_OPEN_EXTERNAL_SLP_HOME. If
   # PEGASUS_OPENSLP_HOME is encountered it will create PEGASUS_OPEN_EXTERNAL_SLP_HOME
   #
 # Environment variable to set home location for OpenSLP include and library # Environment variable to set home location for OpenSLP include and library
 # files if they are located somewhere other than /usr/include and /usr/lib. # files if they are located somewhere other than /usr/include and /usr/lib.
 # #
Line 867 
Line 1067 
 #     then this environment variable should be set to /opt/OpenSLP. #     then this environment variable should be set to /opt/OpenSLP.
 # #
  
   ifdef PEGASUS_OPENSLP_HOME
     ifdef PEGASUS_OPEN_EXTERNAL_SLP_HOME
       $(error Both PEGASUS_OPENSLP_HOME and PEGASUS_OPEN_EXTERNAL_SLP_HOME defined. \
         Please use PEGASUS_OPEN_EXTERNAL_SLP_HOME)
     else
         export PEGASUS_EXTERNAL_SLP_HOME=$(PEGASUS_OPENSLP_HOME)
      endif
   endif
   ############################################################################
   #
   # PEGASUS_EXTERNAL_SLP_HOME
   #
   # Environment variable to set home location for External SLP include and library
   # files if they are located somewhere other than /usr/include and /usr/lib.
   #
   # This variable superceeds PEGASUS_OPENSLP_HOME to match the use of
   # PEGASUS_USE_EXTERNAL_SLP variable.
   #
   # PEGASUS_USE_EXTERNAL_SLP 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 # Enable this flag to allow the handshake to continue regardless of verification result
 # #
Line 911 
Line 1139 
     endif     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  
   
 # #
 ## PEP 323, DMTF Indications Profile support, stage 1 ## PEP 323, DMTF Indications Profile support, stage 1
 # #
Line 941 
Line 1159 
     endif     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
Line 1001 
Line 1230 
 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)
         DEFINES += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER         DEFINES += -DPEGASUS_ENABLE_JMPI_PROVIDER_MANAGER
           ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER
               PEGASUS_JAVA_CLASSPATH_DELIMITER = :
           endif
   
           ifndef PEGASUS_JVM
               PEGASUS_JVM = sun
           endif
           ifeq ($(PEGASUS_JVM),gcj)
               PEGASUS_JAVA_COMPILER           = gcj -C
               PEGASUS_JAVA_JAR                = fastjar
               PEGASUS_JAVA_INTERPRETER        = gij
           else
               PEGASUS_JAVA_COMPILER           = javac -target 1.4 -source 1.4
               PEGASUS_JAVA_JAR                = jar
               PEGASUS_JAVA_INTERPRETER        = java
           endif
   
     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 1039 
Line 1285 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
 ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS  ifndef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
      PEGASUS_USE_RELEASE_CONFIG_OPTIONS=false
   endif
   
   ifeq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),true)
     DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS     DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS
   else
      ifneq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),false)
         $(error PEGASUS_USE_RELEASE_CONFIG_OPTIONS \
             ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS)) invalid, must be true or false)
      endif
 endif endif
  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
Line 1106 
Line 1361 
 ##============================================================================== ##==============================================================================
  
 ifdef PEGASUS_USE_STATIC_LIBRARIES ifdef PEGASUS_USE_STATIC_LIBRARIES
   ifeq ($(PEGASUS_USE_STATIC_LIBRARIES),true)      ifeq ($(OS_TYPE),windows)
           $(error PEGASUS_USE_STATIC_LIBRARIES is not support on windows.)
   else   else
     ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),false)          ifneq ($(PEGASUS_USE_STATIC_LIBRARIES),true)
       $(error PEGASUS_USE_STATIC_LIBRARIES ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true or false)              $(error PEGASUS_USE_STATIC_LIBRARIES \
                   ($(PEGASUS_USE_STATIC_LIBRARIES)) invalid, must be true.)
     endif     endif
   endif   endif
 endif endif
Line 1160 
Line 1417 
     endif     endif
 endif endif
  
   ##==============================================================================
   ##
   ## PEGASUS_PAM_AUTHENTICATION
   ##
   ##==============================================================================
   
   ifdef PEGASUS_PAM_AUTHENTICATION
       # Compile in the code required for PAM authentication
       # and compile out the code that uses the password file.
       DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE
   
       # Link with libpam only where it is needed.
       ifeq ($(HAS_PAM_DEPENDENCY),true)
           SYS_LIBS += -lpam
       endif
   endif
  
 ##============================================================================== ##==============================================================================
 ## ##
Line 1173 
Line 1446 
  
 ##============================================================================== ##==============================================================================
  
 ifndef PEGASUS_JAVA_CLASSPATH_DELIMITER  
     PEGASUS_JAVA_CLASSPATH_DELIMITER = :  
 endif  
   
 ifndef PEGASUS_JVM  
         PEGASUS_JVM = sun  
 endif  
 ifeq ($(PEGASUS_JVM),gcj)  
         PEGASUS_JAVA_COMPILER           = gcj -C  
         PEGASUS_JAVA_JAR                = fastjar  
         PEGASUS_JAVA_INTERPRETER        = gij  
 else  
         PEGASUS_JAVA_COMPILER           = javac -target 1.4 -source 1.4  
         PEGASUS_JAVA_JAR                = jar  
         PEGASUS_JAVA_INTERPRETER        = java  
 endif  
   
 # Disable client timeouts when we're doing a valgrind build # Disable client timeouts when we're doing a valgrind build
 ifdef PEGASUS_TEST_VALGRIND_LOG_DIR ifdef PEGASUS_TEST_VALGRIND_LOG_DIR
     DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND     DEFINES += -DPEGASUS_DISABLE_CLIENT_TIMEOUT -DPEGASUS_TEST_VALGRIND
Line 1222 
Line 1478 
   endif   endif
 endif endif
  
   ##==============================================================================
   ##
   ## PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY
   ##
   ##     Enable binary protocol between cimserver and out-of-process providers.
   ##     By default this feature is enabled.
   ##
   ##==============================================================================
   
   ifndef PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY
     PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY=true
   endif
   
   ifeq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),true)
     DEFINES += -DPEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY
   else
     ifneq ($(PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY),false)
       $(error "PEGASUS_ENABLE_PROTOCOL_INTERNAL_BINARY must be true or false")
     endif
   endif
   
   ##==============================================================================
   ##
   ## PEGASUS_ENABLE_PROTOCOL_BINARY
   ##
   ##     Enables the binary protocol between clients and cimserver. With provider
   ##     agent, both requests and responses are binary. For "ordinary" clients,
   ##     requests are XML and responses are binary. By default, this only affects
   ##     the protocol used over local domain sockets.
   ##
   ##==============================================================================
   
   ifndef PEGASUS_ENABLE_PROTOCOL_BINARY
     PEGASUS_ENABLE_PROTOCOL_BINARY=false
   endif
   
   ifeq ($(PEGASUS_ENABLE_PROTOCOL_BINARY),true)
     DEFINES += -DPEGASUS_ENABLE_PROTOCOL_BINARY
   else
     ifneq ($(PEGASUS_ENABLE_PROTOCOL_BINARY),false)
       $(error "PEGASUS_ENABLE_PROTOCOL_BINARY must be true or false")
     endif
   endif
   
   ## ======================================================================
   ##
   ## PLATFORM_CORE_PATTERN
   ## This variable describes the pattern used to search for core files.
   ## If not defined, this variable will be set to core*.
   ## Only wildcard characters supported by the make wildcard function
   ## may be used.
   
   ifndef PLATFORM_CORE_PATTERN
       PLATFORM_CORE_PATTERN = core*
   endif
   
   ifdef PEGASUS_FLAVOR
     ifdef PEGASUS_USE_RELEASE_DIRS
       ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
         $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when both PEGASUS_FLAVOR and PEGASUS_USE_RELEASE_DIRS options are used")
       endif
     endif
     ifneq ($(PEGASUS_FLAVOR), tog)
         DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"
     endif
   endif
   
   ifdef PEGASUS_EXTRA_PROVIDER_LIB_DIR
      ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
         $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when PEGASUS_EXTRA_PROVIDER_LIB_DIR defined.")
      endif
      DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"$(PEGASUS_EXTRA_PROVIDER_LIB_DIR):\"
   else
      DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"\"
   endif
   

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