diff options
| -rw-r--r-- | config.hw.in | 4 | ||||
| -rw-r--r-- | neon.mak | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/config.hw.in b/config.hw.in index 7b4ab63..5a5fe1b 100644 --- a/config.hw.in +++ b/config.hw.in @@ -37,10 +37,6 @@ #define HAVE_MEMCPY #define HAVE_SETSOCKOPT -#ifndef NEON_NODAV -#define USE_DAV_LOCKS -#endif - #define NE_FMT_SIZE_T "u" #define NE_FMT_SSIZE_T "d" #define NE_FMT_OFF_T "ld" @@ -44,11 +44,11 @@ EXPAT_INC = $(EXPAT_SRC)\Source\Lib BUILD_EXPAT = 1 !IF "$(EXPAT_INC)" == "" !IFNDEF EXPAT_FLAGS -EXPAT_FLAGS = /D NEON_NODAV +EXPAT_FLAGS = BUILD_EXPAT = !ENDIF !ELSE -EXPAT_FLAGS = /I "$(EXPAT_INC)" /D HAVE_EXPAT /D HAVE_EXPAT_H +EXPAT_FLAGS = /I "$(EXPAT_INC)" /D HAVE_EXPAT /D HAVE_EXPAT_H /D NE_HAVE_DAV !ENDIF ######## @@ -56,7 +56,7 @@ EXPAT_FLAGS = /I "$(EXPAT_INC)" /D HAVE_EXPAT /D HAVE_EXPAT_H !IF "$(OPENSSL_SRC)" == "" OPENSSL_FLAGS = !ELSE -OPENSSL_FLAGS = /I "$(OPENSSL_SRC)\inc32" /D NEON_SSL +OPENSSL_FLAGS = /I "$(OPENSSL_SRC)\inc32" /D NE_HAVE_SSL /D HAVE_OPENSSL !ENDIF ######## @@ -78,7 +78,7 @@ ZLIB_SHAREDLIB = zlib1_d.dll ZLIB_IMPLIB = zdll_d.lib ZLIB_LDFLAGS = /nologo /debug !ENDIF -ZLIB_FLAGS = /I "$(ZLIB_SRC)" /D NEON_ZLIB +ZLIB_FLAGS = /I "$(ZLIB_SRC)" /D NE_HAVE_ZLIB !IF "$(ZLIB_DLL)" == "" ZLIB_LIBS = "$(ZLIB_SRC)\$(ZLIB_STATICLIB)" !ELSE |