amiga: do not hardcode openssl/zlib into the os config [ci skip]

Enable them in `lib/makefile.amiga` and `src/makefile.amiga` instead.

This allows builds without openssl and/or zlib. E.g. with the
<https://github.com/bebbo/amiga-gcc> cross-compiler.

Reviewed-by: Daniel Stenberg
Closes #9762

diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index ca2f7fd1c8efc76a1fdf2effa0e1a1c091808694..14f3a0448bcfcdcde099edc59ae59dbf71a7536c 100644 (file)
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -36,7 +36,6 @@
 #define HAVE_INTTYPES_H 1
 #define HAVE_IOCTLSOCKET_CAMEL 1
 #define HAVE_IOCTLSOCKET_CAMEL_FIONBIO 1
-#define HAVE_LIBZ 1
 #define HAVE_LONGLONG 1
 #define HAVE_NETDB_H 1
 #define HAVE_NETINET_IN_H 1
@@ -73,7 +72,6 @@
 #define SIZEOF_SIZE_T 4
 
 #define USE_MANUAL 1
-#define USE_OPENSSL 1
 #define CURL_DISABLE_LDAP 1
 
 #define OS "AmigaOS"

diff --git a/lib/makefile.amiga b/lib/makefile.amiga
index b09fee908677b858c8459fecd2ab6cb0d27315db..d5c8fe615e1315748537476c4164284ddde9598c 100644 (file)
--- a/lib/makefile.amiga
+++ b/lib/makefile.amiga
@@ -31,7 +31,7 @@ ATCPSDKI= /GG/netinclude
 
 
 CC = m68k-amigaos-gcc
-CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall
+CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall -DUSE_OPENSSL -DHAVE_LIBZ
 
 include Makefile.inc
 OBJS = $(CSOURCES:.c=.o)

diff --git a/src/makefile.amiga b/src/makefile.amiga
index 70ad277e01eef924cc92947f1d768b0fcb16cc1e..9aac7a0fb807d964bcf10c4ed185cec9a5630db4 100644 (file)
--- a/src/makefile.amiga
+++ b/src/makefile.amiga
@@ -31,7 +31,7 @@ ATCPSDKI= /GG/netinclude
 
 
 CC = m68k-amigaos-gcc
-CFLAGS  = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall
+CFLAGS  = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall -DUSE_OPENSSL -DHAVE_LIBZ
 LIBS    = ../lib/libcurl.a -lssl -lcrypto -lz
 MANPAGE = ../docs/curl.1
 README  = ../docs/MANUAL