← Back to branch summary

~ubuntu-branches/ubuntu/vivid/curl/vivid-proposed

« back to all changes in this revision

Viewing changes to src/Makefile.netware

  • 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:
src/Makefile.netware
226
226
ifeq ($(findstring -idn,$(CFG)),-idn)
227
227
WITH_IDN = 1
228
228
endif
229
 
ifeq ($(findstring -spnego,$(CFG)),-spnego)
230
 
WITH_SPNEGO = 1
231
 
WITH_SSL = 1
232
 
endif
233
229
ifeq ($(findstring -metalink,$(CFG)),-metalink)
234
230
WITH_METALINK = 1
235
231
WITH_SSL = 1
267
263
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
268
264
        LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
269
265
        IMPORTS += GetProcessSwitchCount RunningProcess
270
 
ifdef WITH_SPNEGO
271
 
        # INCLUDES += -I$(FBOPENSSL_PATH)/include
272
 
        LDLIBS += $(FBOPENSSL_PATH)/nw/fbopenssl.$(LIBEXT)
273
 
endif
274
266
else
275
267
ifdef WITH_AXTLS
276
268
        # INCLUDES += -I$(AXTLS_PATH)/inc