~ubuntu-branches/ubuntu/quantal/curl/quantal-security

« back to all changes in this revision

Viewing changes to lib/Makefile.vc10

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-05-28 12:21:13 UTC
  • mfrom: (3.4.29 sid)
  • Revision ID: package-import@ubuntu.com-20120528122113-i5f42lajprljoudn
Tags: 7.26.0-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Adjust udeb configure flags handling to something easier to merge in
  future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
!INCLUDE ..\Makefile.msvc.names
66
66
 
67
67
!IFNDEF OPENSSL_PATH
68
 
OPENSSL_PATH   = ../../openssl-0.9.8r
 
68
OPENSSL_PATH   = ../../openssl-0.9.8x
69
69
!ENDIF
70
70
 
71
71
!IFNDEF LIBSSH2_PATH
72
 
LIBSSH2_PATH   = ../../libssh2-1.2.8
 
72
LIBSSH2_PATH   = ../../libssh2-1.4.2
73
73
!ENDIF
74
74
 
75
75
!IFNDEF ZLIB_PATH
76
 
ZLIB_PATH  = ../../zlib-1.2.5
 
76
ZLIB_PATH  = ../../zlib-1.2.7
77
77
!ENDIF
78
78
 
79
79
!IFNDEF MACHINE