Sfoglia il codice sorgente

Resolver linux compilation issues

Do not compile SSLPlugin by default due to external dependencies
add #include <sys/resources.h>
z3APA3A 11 anni fa
parent
commit
4e92e71349
2 ha cambiato i file con 7 aggiunte e 2 eliminazioni
  1. 6 2
      Makefile.Linux
  2. 1 0
      src/3proxy.c

+ 6 - 2
Makefile.Linux

@@ -19,7 +19,9 @@ LDFLAGS = -Wall -O2 -pthread
 DLFLAGS = -shared
 DLFLAGS = -shared
 DLSUFFICS = .ld.so
 DLSUFFICS = .ld.so
 # -lpthreads may be reuqired on some platforms instead of -pthreads
 # -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 
 LNOUT = -o 
 EXESUFFICS =
 EXESUFFICS =
 OBJSUFFICS = .o
 OBJSUFFICS = .o
@@ -29,7 +31,9 @@ REMOVECOMMAND = rm -f
 TYPECOMMAND = cat
 TYPECOMMAND = cat
 COMPATLIBS =
 COMPATLIBS =
 MAKEFILE = Makefile.Linux
 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
 include Makefile.inc
 
 

+ 1 - 0
src/3proxy.c

@@ -9,6 +9,7 @@
 
 
 #include "proxy.h"
 #include "proxy.h"
 #ifndef _WIN32
 #ifndef _WIN32
+#include <sys/resource.h>
 #ifndef NOPLUGINS
 #ifndef NOPLUGINS
 #include <dlfcn.h>
 #include <dlfcn.h>
 #endif
 #endif