← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/Makefile.netware

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-26 02:50:18 UTC
  • mfrom: (3.4.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110126025018-dzgm2m2t5d1vc9y4
Tags: 7.21.3-1ubuntu1
https://launchpad.net/bugs/707756
* Merge from debian unstable.  Remaining changes: (LP: #707756)
  - debian/control:
    + Build-Depends: Replace libssh2-1-dev with openssh-server.
      Drop stunnel since it's in universe, as well.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
    Above changes are necessary to be independent from the universe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.netware
19
19
 
20
20
# Edit the path below to point to the base of your OpenSSL package.
21
21
ifndef OPENSSL_PATH
22
 
OPENSSL_PATH = ../../openssl-0.9.8o
 
22
OPENSSL_PATH = ../../openssl-0.9.8q
23
23
endif
24
24
 
25
25
# Edit the path below to point to the base of your LibSSH2 package.
418
418
        @echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@
419
419
        @echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@
420
420
        @echo $(DL)#define SEND_TYPE_RETV int$(DL) >> $@
 
421
        @echo $(DL)#define SIZEOF_SIZE_T 4$(DL) >> $@
421
422
        @echo $(DL)#define pressanykey PressAnyKeyToContinue$(DL) >> $@
422
423
else
423
424
        @echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@
453
454
        @echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@
454
455
        @echo $(DL)#define SEND_TYPE_RETV ssize_t$(DL) >> $@
455
456
        @echo $(DL)#define SIZEOF_OFF_T 8$(DL) >> $@
 
457
        @echo $(DL)#define SIZEOF_SIZE_T 8$(DL) >> $@
456
458
        @echo $(DL)#define _LARGEFILE 1$(DL) >> $@
457
459
ifdef ENABLE_IPV6
458
460
        @echo $(DL)#define ENABLE_IPV6 1$(DL) >> $@