~ubuntu-branches/ubuntu/wily/curl/wily-proposed

« back to all changes in this revision

Viewing changes to docs/examples/Makefile.m32

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-11-10 08:48:21 UTC
  • mfrom: (3.4.52 sid)
  • Revision ID: package-import@ubuntu.com-20141110084821-inwi9tek417xe4te
Tags: 7.38.0-3ubuntu1
* Merge from 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.
* Dropped patches:
  - debian/patches/09_fix-timeout-in-poll-and-wait.patch: upstream
  - debian/patches/CVE-2014-3613.patch: upstream
  - debian/patches/CVE-2014-3620.patch: upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
148
148
ifeq ($(findstring -sspi,$(CFG)),-sspi)
149
149
SSPI = 1
150
150
endif
151
 
ifeq ($(findstring -spnego,$(CFG)),-spnego)
152
 
SPNEGO = 1
153
 
endif
154
151
ifeq ($(findstring -ldaps,$(CFG)),-ldaps)
155
152
LDAPS = 1
156
153
endif
230
227
    CFLAGS += -DUSE_SCHANNEL
231
228
  endif
232
229
endif
233
 
ifdef SPNEGO
234
 
  CFLAGS += -DHAVE_SPNEGO
235
 
endif
236
230
ifdef IPV6
237
231
  CFLAGS += -DENABLE_IPV6 -D_WIN32_WINNT=0x0501
238
232
endif