From 4e92e713490bb405f601d2a1e4785b2da10487d6 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Wed, 2 Jul 2014 13:46:00 +0400 Subject: [PATCH] Resolver linux compilation issues Do not compile SSLPlugin by default due to external dependencies add #include --- Makefile.Linux | 8 ++++++-- src/3proxy.c | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.Linux b/Makefile.Linux index 9754446..3592af8 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -19,7 +19,9 @@ LDFLAGS = -Wall -O2 -pthread DLFLAGS = -shared DLSUFFICS = .ld.so # -lpthreads may be reuqired on some platforms instead of -pthreads -LIBS = -lcrypto -lssl -ldl +#LIBS = -lcrypto -lssl -ldl +# libcrypto and libssl are required for SSLPlugin +LIBS = -ldl LNOUT = -o EXESUFFICS = OBJSUFFICS = .o @@ -29,7 +31,9 @@ REMOVECOMMAND = rm -f TYPECOMMAND = cat COMPATLIBS = MAKEFILE = Makefile.Linux -PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin +#PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin +# SSLPlugin is not built by default because of external dependencies +PLUGINS = StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin include Makefile.inc diff --git a/src/3proxy.c b/src/3proxy.c index ad686a3..74a008c 100644 --- a/src/3proxy.c +++ b/src/3proxy.c @@ -9,6 +9,7 @@ #include "proxy.h" #ifndef _WIN32 +#include #ifndef NOPLUGINS #include #endif