← Back to branch summary

~ubuntu-branches/ubuntu/natty/curl/natty-security

« back to all changes in this revision

Viewing changes to packages/EPM/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-06-20 13:56:28 UTC
  • mfrom: (3.4.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100620135628-e30tp9jldq6hq985
Tags: 7.21.0-1ubuntu1
https://launchpad.net/bugs/596334
* Merge from debian unstable.  Remaining changes: LP: #596334
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
packages/EPM/Makefile.in
71
71
CC = @CC@
72
72
CCDEPMODE = @CCDEPMODE@
73
73
CFLAGS = @CFLAGS@
 
74
CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@
74
75
CPP = @CPP@
75
76
CPPFLAGS = @CPPFLAGS@
76
77
CROSSCOMPILING_FALSE = @CROSSCOMPILING_FALSE@
82
83
CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
83
84
CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
84
85
CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
 
86
CURL_DISABLE_IMAP = @CURL_DISABLE_IMAP@
85
87
CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@
86
88
CURL_DISABLE_LDAPS = @CURL_DISABLE_LDAPS@
 
89
CURL_DISABLE_POP3 = @CURL_DISABLE_POP3@
87
90
CURL_DISABLE_PROXY = @CURL_DISABLE_PROXY@
 
91
CURL_DISABLE_RTSP = @CURL_DISABLE_RTSP@
 
92
CURL_DISABLE_SMTP = @CURL_DISABLE_SMTP@
88
93
CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@
89
94
CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@
90
95
CURL_LIBS = @CURL_LIBS@
101
106
EXEEXT = @EXEEXT@
102
107
FGREP = @FGREP@
103
108
GREP = @GREP@
104
 
HAVE_ARES = @HAVE_ARES@
 
109
HAVE_LDAP_SSL = @HAVE_LDAP_SSL@
105
110
HAVE_LIBZ = @HAVE_LIBZ@
106
111
HAVE_LIBZ_FALSE = @HAVE_LIBZ_FALSE@
107
112
HAVE_LIBZ_TRUE = @HAVE_LIBZ_TRUE@
167
172
SUPPORT_FEATURES = @SUPPORT_FEATURES@
168
173
SUPPORT_PROTOCOLS = @SUPPORT_PROTOCOLS@
169
174
TEST_SERVER_LIBS = @TEST_SERVER_LIBS@
 
175
USE_ARES = @USE_ARES@
170
176
USE_EMBEDDED_ARES_FALSE = @USE_EMBEDDED_ARES_FALSE@
171
177
USE_EMBEDDED_ARES_TRUE = @USE_EMBEDDED_ARES_TRUE@
172
178
USE_GNUTLS = @USE_GNUTLS@
 
179
USE_LIBRTMP = @USE_LIBRTMP@
173
180
USE_LIBSSH2 = @USE_LIBSSH2@
174
181
USE_MANUAL_FALSE = @USE_MANUAL_FALSE@
175
182
USE_MANUAL_TRUE = @USE_MANUAL_TRUE@
176
183
USE_NSS = @USE_NSS@
 
184
USE_OPENLDAP = @USE_OPENLDAP@
 
185
USE_POLARSSL = @USE_POLARSSL@
177
186
USE_SSLEAY = @USE_SSLEAY@
178
187
USE_WINDOWS_SSPI = @USE_WINDOWS_SSPI@
179
188
VERSION = @VERSION@