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

Diff for /pegasus/mak/config.mak between version 1.141.2.1 and 1.146

version 1.141.2.1, 2007/06/08 10:28:29 version 1.146, 2007/07/06 17:46:32
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
       DEFINES += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
   
  ifndef OPENSSL_BIN  ifndef OPENSSL_BIN
     OPENSSL_BIN = $(OPENSSL_HOME)/bin     OPENSSL_BIN = $(OPENSSL_HOME)/bin
  endif  endif
Line 563 
Line 585 
  
 # #
 # PEP 291 # PEP 291
 # IPV6 Support for pegaus, Phase 1  # Enable IPv6 support
 # #
 ifdef PEGASUS_DISABLE_IPV6  ifndef PEGASUS_ENABLE_IPV6
   ifeq ($(PEGASUS_DISABLE_IPV6),true)      PEGASUS_ENABLE_IPV6 = true
     DEFINES += -DPEGASUS_DISABLE_IPV6  endif
   
   # Check for Enable IPv6 support
   ifdef PEGASUS_ENABLE_IPV6
     ifeq ($(PEGASUS_ENABLE_IPV6),true)
       DEFINES += -DPEGASUS_ENABLE_IPV6
   else   else
     ifneq ($(PEGASUS_DISABLE_IPV6),false)      ifneq ($(PEGASUS_ENABLE_IPV6),false)
       $(error PEGASUS_DISABLE_IPV6 ($(PEGASUS_DISABLE_IPV6)) \        $(error PEGASUS_ENABLE_IPV6 ($(PEGASUS_ENABLE_IPV6)) \
        invalid, must be true or false)        invalid, must be true or false)
     endif     endif
   endif   endif


Legend:
Removed from v.1.141.2.1  
changed lines
  Added in v.1.146

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2