|  | @@ -56,8 +56,8 @@ endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  # only set main compile options if none were chosen
 |  |  # only set main compile options if none were chosen
 | 
											
												
													
														|  |  CFLAGS += -W -Wall -O2 -D$(TARGET_OS) -Iinclude $(COPT) -DUSE_STACK_SIZE=102400
 |  |  CFLAGS += -W -Wall -O2 -D$(TARGET_OS) -Iinclude $(COPT) -DUSE_STACK_SIZE=102400
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -LIBS = -lpthread -lm
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +LIBS = -lpthread -lm
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ifdef WITH_DEBUG
 |  |  ifdef WITH_DEBUG
 | 
											
												
													
														|  |    CFLAGS += -g -DDEBUG_ENABLED
 |  |    CFLAGS += -g -DDEBUG_ENABLED
 | 
											
										
											
												
													
														|  | @@ -71,10 +71,10 @@ ifdef WITH_CPP
 | 
											
												
													
														|  |  else
 |  |  else
 | 
											
												
													
														|  |    LCC = $(CC)
 |  |    LCC = $(CC)
 | 
											
												
													
														|  |  endif
 |  |  endif
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -ifdef WITH_LUA_SHARED
 |  | 
 | 
											
												
													
														|  | -  WITH_LUA = 1
 |  | 
 | 
											
												
													
														|  | -endif
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +ifdef WITH_LUA_SHARED
 | 
											
												
													
														|  | 
 |  | +  WITH_LUA = 1
 | 
											
												
													
														|  | 
 |  | +endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ifdef WITH_LUA
 |  |  ifdef WITH_LUA
 | 
											
												
													
														|  |    include resources/Makefile.in-lua
 |  |    include resources/Makefile.in-lua
 | 
											
										
											
												
													
														|  | @@ -85,10 +85,10 @@ ifdef WITH_IPV6
 | 
											
												
													
														|  |  endif
 |  |  endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ifdef WITH_WEBSOCKET
 |  |  ifdef WITH_WEBSOCKET
 | 
											
												
													
														|  | -  CFLAGS += -DUSE_WEBSOCKET
 |  | 
 | 
											
												
													
														|  | -  ifdef WITH_LUA
 |  | 
 | 
											
												
													
														|  | -    CFLAGS += -DUSE_TIMERS
 |  | 
 | 
											
												
													
														|  | -    LIBS += -lrt
 |  | 
 | 
											
												
													
														|  | 
 |  | +  CFLAGS += -DUSE_WEBSOCKET
 | 
											
												
													
														|  | 
 |  | +  ifdef WITH_LUA
 | 
											
												
													
														|  | 
 |  | +    CFLAGS += -DUSE_TIMERS
 | 
											
												
													
														|  | 
 |  | +    LIBS += -lrt
 | 
											
												
													
														|  |    endif
 |  |    endif
 | 
											
												
													
														|  |  endif
 |  |  endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -119,10 +119,10 @@ endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ifeq ($(TARGET_OS),LINUX)
 |  |  ifeq ($(TARGET_OS),LINUX)
 | 
											
												
													
														|  |    CAN_INSTALL = 1
 |  |    CAN_INSTALL = 1
 | 
											
												
													
														|  | -endif
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -ifdef WITH_LUA_SHARED
 |  | 
 | 
											
												
													
														|  | -  LIBS += -llua5.2
 |  | 
 | 
											
												
													
														|  | 
 |  | +endif
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +ifdef WITH_LUA_SHARED
 | 
											
												
													
														|  | 
 |  | +  LIBS += -llua5.2
 | 
											
												
													
														|  |  endif
 |  |  endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  ifneq (, $(findstring MINGW32, $(UNAME)))
 |  |  ifneq (, $(findstring MINGW32, $(UNAME)))
 | 
											
										
											
												
													
														|  | @@ -165,7 +165,7 @@ help:
 | 
											
												
													
														|  |  	@echo "   NO_CGI                disable CGI support"
 |  |  	@echo "   NO_CGI                disable CGI support"
 | 
											
												
													
														|  |  	@echo "   NO_SSL                disable SSL functionality"
 |  |  	@echo "   NO_SSL                disable SSL functionality"
 | 
											
												
													
														|  |  	@echo "   NO_SSL_DL             link against system libssl library"
 |  |  	@echo "   NO_SSL_DL             link against system libssl library"
 | 
											
												
													
														|  | -    @echo "   NO_FILES              do not serve files from a directory"
 |  | 
 | 
											
												
													
														|  | 
 |  | +	@echo "   NO_FILES              do not serve files from a directory"
 | 
											
												
													
														|  |  	@echo "   MAX_REQUEST_SIZE      maximum header size, default 16384"
 |  |  	@echo "   MAX_REQUEST_SIZE      maximum header size, default 16384"
 | 
											
												
													
														|  |  	@echo ""
 |  |  	@echo ""
 | 
											
												
													
														|  |  	@echo " Variables"
 |  |  	@echo " Variables"
 |