← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/Makefile.netware

  • 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:
lib/Makefile.netware
1
1
#################################################################
2
 
# $Id: Makefile.netware,v 1.128 2009-09-07 19:34:03 gknauf Exp $
3
2
#
4
3
## Makefile for building libcurl.nlm (NetWare version - gnu make)
5
4
## Use: make -f Makefile.netware
6
5
##
7
 
## Comments to: Guenter Knauf http://www.gknw.de/phpbb
 
6
## Comments to: Guenter Knauf http://www.gknw.net/phpbb
8
7
#
9
8
#################################################################
10
9
 
15
14
 
16
15
# Edit the path below to point to the base of your Zlib sources.
17
16
ifndef ZLIB_PATH
18
 
ZLIB_PATH = ../../zlib-1.2.3
 
17
ZLIB_PATH = ../../zlib-1.2.5
19
18
endif
20
19
 
21
20
# Edit the path below to point to the base of your OpenSSL package.
22
21
ifndef OPENSSL_PATH
23
 
OPENSSL_PATH = ../../openssl-0.9.8k
 
22
OPENSSL_PATH = ../../openssl-0.9.8n
24
23
endif
25
24
 
26
25
# Edit the path below to point to the base of your LibSSH2 package.
27
26
ifndef LIBSSH2_PATH
28
 
LIBSSH2_PATH = ../../libssh2-1.1
 
27
LIBSSH2_PATH = ../../libssh2-1.2.5
29
28
endif
30
29
 
31
30
# Edit the path below to point to the base of your libidn package.
32
31
ifndef LIBIDN_PATH
33
 
LIBIDN_PATH = ../../libidn-1.13
 
32
LIBIDN_PATH = ../../libidn-1.18
 
33
endif
 
34
 
 
35
# Edit the path below to point to the base of your c-ares package.
 
36
ifndef LIBCARES_PATH
 
37
LIBCARES_PATH = ../ares
34
38
endif
35
39
 
36
40
ifndef INSTDIR
155
159
SDK_LDAP = $(NDK_ROOT)/cldapsdk/netware
156
160
CURL_INC = ../include
157
161
CURL_LIB = ../lib
158
 
ARES_LIB = ../ares
159
162
 
160
163
INCLUDES = -I$(CURL_INC) -I$(CURL_LIB)
161
164
 
162
165
ifdef WITH_ARES
163
 
        INCLUDES += -I$(ARES_LIB)
164
 
        LDLIBS += $(ARES_LIB)/libcares.$(LIBEXT)
 
166
        INCLUDES += -I$(LIBCARES_PATH)
 
167
        LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
165
168
endif
166
169
ifdef WITH_SSH2
167
170
        INCLUDES += -I$(LIBSSH2_PATH)/include
500
503
        @echo $(DL)#define HAVE_UTIME_H 1$(DL) >> $@
501
504
        @echo $(DL)#define HAVE_WRITEV 1$(DL) >> $@
502
505
        @echo $(DL)#define RETSIGTYPE void$(DL) >> $@
 
506
        @echo $(DL)#define SIZEOF_INT 4$(DL) >> $@
 
507
        @echo $(DL)#define SIZEOF_SHORT 2$(DL) >> $@
503
508
        @echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@
504
509
        @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
505
510
        @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
598
603
        @echo ipv6 support:    no
599
604
endif
600
605
 
601
 
$(ARES_LIB)/libcares.$(LIBEXT):
602
 
        $(MAKE) -C $(ARES_LIB) -f Makefile.netware lib
 
606
$(LIBCARES_PATH)/libcares.$(LIBEXT):
 
607
        $(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib
603
608
 
604
609
ca-bundle.crt: mk-ca-bundle.pl
605
610
        @echo Creating $@