X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fnixio%2FMakefile;h=fb91388d0d9652bc2924cc1543acd30cd7d28c18;hb=0d73b6d411026fbd9a949b493ff4cb1080547835;hp=044764e92a8d285477cda644498f5091c045001d;hpb=988eeb8ff1409ac4afe6c95bd65d9b1f54f55768;p=project%2Fluci.git

diff --git a/libs/nixio/Makefile b/libs/nixio/Makefile
index 044764e92..fb91388d0 100644
--- a/libs/nixio/Makefile
+++ b/libs/nixio/Makefile
@@ -10,13 +10,20 @@ AXTLS_VERSION = 1.2.1
 AXTLS_DIR     = axTLS
 AXTLS_FILE    = $(AXTLS_DIR)-$(AXTLS_VERSION).tar.gz
 NIXIO_TLS    ?= openssl
-NIXIO_LDFLAGS = -lcrypt
+NIXIO_SHADOW ?= $(shell echo 'int main(void){ return !getspnam("root"); }' | $(CC) -include shadow.h -xc -o/dev/null - 2>/dev/null && echo yes)
 NIXIO_SO      = nixio.so
+NIXIO_LDFLAGS =
+
+ifeq (,$(findstring Darwin,$(OS)))
+	NIXIO_LDFLAGS += -lcrypt
+else
+	EXTRA_CFLAGS += -D__DARWIN__
+endif
 
 NIXIO_OBJ = src/nixio.o src/socket.o src/sockopt.o src/bind.o src/address.o \
 	    src/poll.o src/io.o src/file.o src/splice.o src/process.o src/syslog.o \
 	    src/bit.o src/binary.o src/fs.o src/user.o \
-	    src/tls-crypto.o src/tls-context.o src/tls-socket.o
+	    $(if $(NIXIO_TLS),src/tls-crypto.o src/tls-context.o src/tls-socket.o,)
 
 ifeq ($(NIXIO_TLS),axtls)
 	TLS_CFLAGS = -IaxTLS/ssl -IaxTLS/crypto -IaxTLS/config -include src/axtls-compat.h
@@ -35,6 +42,14 @@ ifeq ($(NIXIO_TLS),cyassl)
 	NIXIO_OBJ += src/cyassl-compat.o
 endif
 
+ifeq ($(NIXIO_TLS),)
+	NIXIO_CFLAGS += -DNO_TLS
+endif
+
+ifneq ($(NIXIO_SHADOW),yes)
+	NIXIO_CFLAGS += -DNO_SHADOW
+endif
+
 
 ifeq ($(OS),SunOS)
 	NIXIO_LDFLAGS += -lsocket -lnsl -lsendfile
@@ -58,6 +73,7 @@ endif
 %.o: %.c
 	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
 
+ifneq ($(NIXIO_TLS),)
 src/tls-crypto.o: $(TLS_DEPENDS) src/tls-crypto.c
 	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-crypto.c
 
@@ -71,7 +87,7 @@ src/axtls-compat.o: src/libaxtls.a src/axtls-compat.c
 	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/axtls-compat.c
 	mkdir -p dist
 	cp -pR axtls-root/* dist/
-	
+endif	
 
 compile: $(NIXIO_OBJ)
 	$(LINK) $(SHLIB_FLAGS) $(NIXIO_LDFLAGS) -o src/$(NIXIO_SO) $(NIXIO_OBJ) $(NIXIO_LDFLAGS_POST)
@@ -87,6 +103,18 @@ $(AXTLS_DIR)/.prepared:
 src/libaxtls.a: $(AXTLS_DIR)/.prepared
 	$(MAKE) -C $(AXTLS_DIR) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS) $(FPIC) -Wall -pedantic -I../config -I../ssl -I../crypto" LDFLAGS="$(LDFLAGS)" OS="$(OS)" clean all
 	cp -p $(AXTLS_DIR)/_stage/libaxtls.a src
+	# *************************************************************************
+	#
+	#
+	#
+	# *** WARNING ***
+	# The use of the axTLS cryptographical provider is discouraged!
+	# Please switch to either CyaSSL or OpenSSL.
+	# Support for axTLS might be removed in the near future.
+	#
+	#
+	#
+	#**************************************************************************
 
 clean: luaclean
 	rm -f src/*.o src/*.so src/*.a src/*.dll