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

Diff for /pegasus/mak/config.mak between version 1.141.4.2 and 1.149

version 1.141.4.2, 2007/07/26 17:28:24 version 1.149, 2007/08/13 11:23:16
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
   
   #############################################################################
   
 BIN_DIR = $(HOME_DIR)/bin BIN_DIR = $(HOME_DIR)/bin
 LIB_DIR = $(HOME_DIR)/lib LIB_DIR = $(HOME_DIR)/lib
  
Line 512 
Line 532 
 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 560 
Line 583 
   endif   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
 # #
Line 696 
Line 760 
 # compile in the experimental APIs # compile in the experimental APIs
 DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES += -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
 # control direct access CIM build  
 ifeq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)  
     DEFINES += -DPEGASUS_USE_DIRECTACCESS_FOR_LOCAL  
     DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=1  
     ifeq ($(PEGASUS_DIRECTACCESS_SHARE_LIB),noshare)  
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)  
          DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=3  
       endif  
       $(error 'noshare' for PEGASUS_DIRECTACCESS_SHARE_REPOSITORY is also required.)  
     else  
       ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)  
       DEFINES += -DPEGASUS_DIRECTACCESS_BUILDTYPE=2  
       endif  
     endif  
     ifndef PEGASUS_USE_EXPERIMENTAL_INTERFACES  
         ifneq ($(OS_TYPE),windows)  
             $(warning Direct access CIM built  without CIMClient.h experimental interfaces.)  
         endif  
     endif  
 else  
     ifeq ($(PEGASUS_DIRECTACCESS_SHARE_REPOSITORY),noshare)  
       $(error PEGASUS_USE_DIRECTACCESS_FOR_LOCAL must be true for this this noshare option.)  
     endif  
     ifeq ($(PEGASUS_DIRECTACCESS_SHARE_LIB),noshare)  
       $(error PEGASUS_USE_DIRECTACCESS_FOR_LOCAL must be true for this this noshare option.)  
     endif  
 endif  
   
   
 # Ensure that the deprecated interfaces are defined in the Pegasus libraries. # Ensure that the deprecated interfaces are defined in the Pegasus libraries.
 # One may wish to disable these interfaces if binary compatibility with # One may wish to disable these interfaces if binary compatibility with
 # previous Pegasus releases is not required. # previous Pegasus releases is not required.
Line 889 
Line 924 
     endif     endif
   endif   endif
  
   ## Specifies the user context of the cimservermain process when privilege    ## Defines the user context of the cimservermain process when privilege
   ## separation is enabled.   ## separation is enabled.
   ifndef PEGASUS_CIMSERVERMAIN_USER    PEGASUS_CIMSERVERMAIN_USER = cimsrvr
     PEGASUS_CIMSERVERMAIN_USER = pegasus  
   endif  
   DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"   DEFINES += -DPEGASUS_CIMSERVERMAIN_USER=\"$(PEGASUS_CIMSERVERMAIN_USER)\"
 endif endif
  


Legend:
Removed from v.1.141.4.2  
changed lines
  Added in v.1.149

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2