moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Andres Garcia Garcia updated to build with the most recent OpenSSL and

Browse Source 
the recent libcurl changes.
This commit is contained in:
Daniel Stenberg 2003-02-28 15:49:32 +00:00
parent 8f809e2a93
commit 0a1a185874
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Makefile.m32
View File

@ -12,7 +12,7 @@ AR = ar
RM = rm -f RM = rm -f
RANLIB = ranlib RANLIB = ranlib
STRIP = strip -g STRIP = strip -g
OPENSSL_PATH = ../../openssl-0.9.6g OPENSSL_PATH = ../../openssl-0.9.7a
ZLIB_PATH = ../../zlib-1.1.4 ZLIB_PATH = ../../zlib-1.1.4
######################################################## ########################################################
@ -22,8 +22,8 @@ INCLUDES = -I. -I.. -I../include -I../src
CFLAGS = -g -O2 -DMINGW32 CFLAGS = -g -O2 -DMINGW32
ifdef SSL ifdef SSL
INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl" INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
CFLAGS += -DUSE_SSLEAY CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue DLL_LIBS = -L$(OPENSSL_PATH)/out -leay32 -lssl32
endif endif
ifdef ZLIB ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)" INCLUDES += -I"$(ZLIB_PATH)"
@ -42,7 +42,7 @@ libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c \ ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c \
telnet.h getinfo.c strequal.c strequal.h easy.c security.h \ telnet.h getinfo.c strequal.c strequal.h easy.c security.h \
security.c krb4.h krb4.c memdebug.h memdebug.c inet_ntoa_r.h http_chunks.h http_chunks.c \ security.c krb4.h krb4.c memdebug.h memdebug.c inet_ntoa_r.h http_chunks.h http_chunks.c \
strtok.c connect.c hash.c llist.c multi.c \ strtok.c connect.c hash.c llist.c multi.c share.c share.h\
content_encoding.h content_encoding.c content_encoding.h content_encoding.c
libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \ libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \
@ -50,7 +50,7 @@ libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \
speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \ speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \
getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \ getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \
strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \ strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \
strtok.o connect.o hash.o llist.o multi.o \ strtok.o connect.o hash.o llist.o multi.o share.o \
content_encoding.o content_encoding.o
LIBRARIES = $(libcurl_a_LIBRARIES) LIBRARIES = $(libcurl_a_LIBRARIES)

8
src/Makefile.m32
View File

@ -12,7 +12,7 @@
CC = gcc CC = gcc
RM = rm -f RM = rm -f
STRIP = strip -s STRIP = strip -s
OPENSSL_PATH = ../../openssl-0.9.6g OPENSSL_PATH = ../../openssl-0.9.7a
ZLIB_PATH = ../../zlib-1.1.4 ZLIB_PATH = ../../zlib-1.1.4
# We may need these someday # We may need these someday
@ -25,7 +25,7 @@ ZLIB_PATH = ../../zlib-1.1.4
INCLUDES = -I. -I.. -I../include INCLUDES = -I. -I.. -I../include
CFLAGS = -g -O2 -DMINGW32 CFLAGS = -g -O2 -DMINGW32
ifdef SSL ifdef SSL
CFLAGS += -DUSE_SSLEAY CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
endif endif
LDFLAGS = LDFLAGS =
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
@ -43,7 +43,7 @@ else
endif endif
curl_LDADD += -lwsock32 -lws2_32 -lwinmm curl_LDADD += -lwsock32 -lws2_32 -lwinmm
ifdef SSL ifdef SSL
curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32
endif endif
ifdef ZLIB ifdef ZLIB
curl_LDADD += -L$(ZLIB_PATH) -lz curl_LDADD += -L$(ZLIB_PATH) -lz
@ -75,7 +75,7 @@ curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES)
$(COMPILE) -c $< $(COMPILE) -c $<
clean: clean:
$(RM) $(curl_OBJECTS) $(RM) $(curl_OBJECTS) curl.exe
distrib: clean distrib: clean
$(RM) $(curl_PROGRAMS) $(RM) $(curl_PROGRAMS)