diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2004-10-02 19:38:59 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2004-10-02 19:38:59 +0000 |
| commit | 3283fd5d9bdc734fed8276dd4675833e02670cfe (patch) | |
| tree | 51e55a698b4d698ff8835cd383661c964865897a /neon.mak | |
| parent | 08c4265e806d73805c51fa67b64aa33861740679 (diff) | |
| download | neon-3283fd5d9bdc734fed8276dd4675833e02670cfe.tar.gz | |
Merge trunk up to current neon CVS HEAD.
git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@256 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'neon.mak')
| -rw-r--r-- | neon.mak | 36 |
1 files changed, 25 insertions, 11 deletions
@@ -10,19 +10,33 @@ NULL=nul ######## # Support for Expat integration -# IF EXPAT_SRC is set, then assume compiling against a pre-built -# binary Expat 1.95.X. If EXPAT_SRC is not set, then the user can +# +# If EXPAT_SRC or EXPAT_INC are set, then assume compiling against a +# pre-built binary Expat 1.95.X. You can use either EXPAT_SRC +# to specify the top-level Expat directory, or EXPAT_INC to directly +# specify the Expat include directory. (If both are set, EXPAT_SRC +# is ignored). +# +# If EXPAT_SRC and EXPAT_INC are not set, then the user can # still set EXPAT_FLAGS to specify very specific compile behavior. -# If both EXPAT_SRC and EXPAT_FLAGS are not set, disable WebDAV -# support. +# +# If none of EXPAT_SRC, EXPAT_INC and EXPAT_FLAGS are set, disable +# WebDAV support. + +!IF "$(EXPAT_INC)" == "" +!IF "$(EXPAT_SRC)" != "" +EXPAT_INC = $(EXPAT_SRC)\Source\Lib +!ENDIF +!ENDIF + BUILD_EXPAT = 1 -!IF "$(EXPAT_SRC)" == "" -!IF "$(EXPAT_FLAGS)" == "" +!IF "$(EXPAT_INC)" == "" +!IFNDEF EXPAT_FLAGS EXPAT_FLAGS = /D NEON_NODAV BUILD_EXPAT = !ENDIF !ELSE -EXPAT_FLAGS = /I "$(EXPAT_SRC)\Source\Lib" /D HAVE_EXPAT /D HAVE_EXPAT_H +EXPAT_FLAGS = /I "$(EXPAT_INC)" /D HAVE_EXPAT /D HAVE_EXPAT_H !ENDIF @@ -99,11 +113,11 @@ LIB32_OBJS= \ !IF "$(OPENSSL_SRC)" != "" LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\ne_openssl.obj" !IFDEF OPENSSL_STATIC -LIB32_OBJS = $(LIB32_OBJS) $(OPENSSL_SRC)\out32\libeay32.lib \ - $(OPENSSL_SRC)\out32\ssleay32.lib +LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32\libeay32.lib" \ + "$(OPENSSL_SRC)\out32\ssleay32.lib" !ELSE -LIB32_OBJS = $(LIB32_OBJS) $(OPENSSL_SRC)\out32dll\libeay32.lib \ - $(OPENSSL_SRC)\out32dll\ssleay32.lib +LIB32_OBJS = $(LIB32_OBJS) "$(OPENSSL_SRC)\out32dll\libeay32.lib" \ + "$(OPENSSL_SRC)\out32dll\ssleay32.lib" !ENDIF !ELSE # Provide ABI-compatibility stubs for SSL interface |