diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:55 +0100 |
| commit | 3934efe28c70b1c21a60f38fe726a935c15f4e99 (patch) | |
| tree | c322f38a215b05ff0c457366e08fab9255b64114 /neon | |
| parent | 134fe756a1659e352c96d0a6da34dd3c7d23e3a9 (diff) | |
sigh, need a 64bit zlib too on windows, reverting
Diffstat (limited to 'neon')
| -rw-r--r-- | neon/neon.patch | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/neon/neon.patch b/neon/neon.patch index cbb2db110856..b7a3f8514335 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -492,7 +492,7 @@ +#endif --- misc/neon-0.29.5/src/makefile.mk 2011-02-03 10:32:38.000000000 +0100 +++ misc/build/neon-0.29.5/src/makefile.mk 2011-02-03 10:26:19.000000000 +0100 -@@ -1,1 +1,89 @@ +@@ -1,1 +1,96 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -523,6 +523,13 @@ +CFLAGS+= $(OPENSSL_CFLAGS) +.ENDIF + ++.IF "$(SYSTEM_ZLIB)" == "YES" ++CFLAGS+=-DSYSTEM_ZLIB ++.ELSE ++ZLIBINCDIR=external$/zlib ++CFLAGS+=-I$(SOLARINCDIR)$/$(ZLIBINCDIR) ++.ENDIF ++ +SLOFILES= \ + $(SLO)$/ne_207.obj \ + $(SLO)$/ne_acl3744.obj \ |