(file) Return to Makefile CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Makefile between version 1.111 and 1.112

version 1.111, 2004/08/27 20:49:18 version 1.112, 2004/09/01 00:03:57
Line 131 
Line 131 
  
 ifeq ($(OS),linux) ifeq ($(OS),linux)
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto      EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto -lcrypt
       ifdef PEGASUS_USE_RELEASE_DIRS
          EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
       else
          EXTRA_LINK_ARGUMENTS =  -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib
       endif
   endif   endif
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -lssl -lcrypto      EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
   endif   endif
 endif endif
  
Line 155 
Line 160 
   endif   endif
 endif endif
  
   ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_GNU)
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
   endif
   
   ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)
     ifdef PEGASUS_HAS_SSL
       EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto
     endif
   endif
   
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib   SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib
   ifdef PEGASUS_HAS_SSL   ifdef PEGASUS_HAS_SSL


Legend:
Removed from v.1.111  
changed lines
  Added in v.1.112

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2