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

Diff for /pegasus/mak/config.mak between version 1.165 and 1.167.4.1.4.4

version 1.165, 2008/05/16 06:26:44 version 1.167.4.1.4.4, 2008/08/14 13:41:33
Line 57 
Line 57 
     $(error PEGASUS_ROOT environment variable undefined)     $(error PEGASUS_ROOT environment variable undefined)
 endif endif
  
 ############################################################################  
 # OpenPegasus relies on the existence of an external set of libraries to  
 # support localized messages.  Today, the only supported package is  
 # the International Components for Unicode (ICU) OSS project,  
 # http://oss.software.ibm.com/icu.  If PEGASUS_HAS_ICU is true,  
 # OpenPegasus will use the ICU library.  
 #  
 # ICU_ROOT points to the root directory of the ICU source tree.  If set,  
 # the OpenPegasus build will use this variable to locate the ICU include  
 # files. If not set, the ICU include files are expected to be installed  
 # in directories that are searched by default.  
 #  
 # ICU_INSTALL points to the directory containing the ICU libraries.  
 # If set, the OpenPegasus will use this variable to locate the ICU  
 # libraries.  If not set, the ICU libraries are expected to be installed  
 # in a directory that is searched by default.  
 #  
 # If PEGASUS_HAS_ICU is not set and either ICU_ROOT or ICU_INSTALL is  
 # set, the value of PEGASUS_HAS_ICU will be set to true.  
 ############################################################################  
 ifdef PEGASUS_HAS_ICU  
     ifneq ($(PEGASUS_HAS_ICU),true)  
         ifneq ($(PEGASUS_HAS_ICU),false)  
             $(error PEGASUS_HAS_ICU ($(PEGASUS_HAS_ICU)) \  
                 invalid, must be true or false)  
         endif  
     endif  
 else  
     ifdef ICU_ROOT  
         PEGASUS_HAS_ICU = true  
     else  
         ifdef ICU_INSTALL  
             PEGASUS_HAS_ICU = true  
         endif  
     endif  
 endif  
   
 ifdef PEGASUS_HAS_MESSAGES  
     ifneq ($(PEGASUS_HAS_ICU),true)  
         $(error Support for localized messages in OpenPegasus \  
             requires PEGASUS_HAS_ICU to be true)  
     endif  
 endif  
   
 # l10n  
 ifdef ICU_ROOT  
     ICUROOT =  $(subst \,/,$(ICU_ROOT))  
 endif  
   
 ifdef PEGASUS_TMP ifdef PEGASUS_TMP
     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
 else else
Line 378 
Line 329 
 ## ##
 ################################################################################ ################################################################################
  
   ############################################################################
   # OpenPegasus relies on the existence of an external set of libraries to
   # support localized messages.  Today, the only supported package is
   # the International Components for Unicode (ICU) OSS project,
   # http://oss.software.ibm.com/icu.  If PEGASUS_HAS_ICU is true,
   # OpenPegasus will use the ICU library.
   #
   # ICU_INSTALL points to the directory containing the ICU installation.
   # If set, the OpenPegasus will use this variable to locate the ICU
   # include files and libraries.  If not set, the ICU libraries are expected
   # to be installed in a directory that is searched by default.
   #
   # If PEGASUS_HAS_ICU is not set and ICU_INSTALL is set, the value of
   # PEGASUS_HAS_ICU will be set to true.
   ############################################################################
   
   ifdef PEGASUS_HAS_ICU
       ifneq ($(PEGASUS_HAS_ICU),true)
           ifneq ($(PEGASUS_HAS_ICU),false)
               $(error PEGASUS_HAS_ICU ($(PEGASUS_HAS_ICU)) \
                   invalid, must be true or false)
           endif
       endif
   else
       ifdef ICU_INSTALL
           PEGASUS_HAS_ICU = true
       endif
   endif
   
   ifdef PEGASUS_HAS_MESSAGES
       DEFINES += -DPEGASUS_HAS_MESSAGES
   
       ifneq ($(PEGASUS_HAS_ICU),true)
           $(error Support for localized messages in OpenPegasus \
               requires PEGASUS_HAS_ICU to be true)
       endif
   endif
   
   ifeq ($(PEGASUS_HAS_ICU),true)
       DEFINES += -DPEGASUS_HAS_ICU
   
       ##################################
       ##
       ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root
       ## resource bundle, default is to uppercase the root resource bundle
       ##
       ##################################
   
       ifdef ICU_NO_UPPERCASE_ROOT
           CNV_ROOT_FLAGS =
       else
           CNV_ROOT_FLAGS = -u
       endif
   
       ####################################
       ##
       ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root
       ## resource bundle will be generated from.  Defaults to _en if not set.
       ## If set, for any directory containing resource bundles, there must
       ## exist a file name:  package($ICU_ROOT_BUNDLE_LANG).txt or the make
       ## messages target will fail.
       ##
       ####################################
   
       ifdef ICU_ROOT_BUNDLE_LANG
           MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)
       else
           MSG_ROOT_SOURCE = _en
       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.x \
                       $(ICU_INSTALL)/lib/libicuuc.x
               else
                   EXTRA_LIBRARIES += -licuuc -licui18n
                   ifeq ($(OS),linux)
                       EXTRA_LIBRARIES += -licudata
                   endif
               endif
           endif
       endif
   endif
  
 ################################################################################ ################################################################################
 ## ##
Line 449 
Line 526 
     DEFINES += -DPEGASUS_REMOVE_TRACE     DEFINES += -DPEGASUS_REMOVE_TRACE
 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
   
 # PEP 161 # PEP 161
 # Control whether utf-8 filenames are supported by the repository # Control whether utf-8 filenames are supported by the repository
 ifdef PEGASUS_SUPPORT_UTF8_FILENAME ifdef PEGASUS_SUPPORT_UTF8_FILENAME
Line 748 
Line 838 
 # #
 # 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 790 
Line 877 
 ############################################################################ ############################################################################
 # #
 # 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 798 
Line 893 
 # 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 810 
Line 902 
 # #
  
 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
     ifeq ($(PEGASUS_USE_OPENSLP),true)
    ifeq ($(PEGASUS_ENABLE_SLP),true)    ifeq ($(PEGASUS_ENABLE_SLP),true)
       DEFINES += -DPEGASUS_USE_OPENSLP        DEFINES += -DPEGASUS_USE_EXTERNAL_SLP=1
         PEGASUS_USE_EXTERNAL_SLP_TYPE=1
     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 825 
Line 932 
     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 833 
Line 987 
 # #
 # 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 846 
Line 1003 
 #     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
         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 1139 
Line 1324 
     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
  
 ##============================================================================== ##==============================================================================
 ## ##


Legend:
Removed from v.1.165  
changed lines
  Added in v.1.167.4.1.4.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2