diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
| commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
| tree | 950d062f9e183873d64b06e212568a3b0968bb58 /neon | |
| parent | WaE: declaration of 'rand' shadows a global declaration (diff) | |
| download | core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.tar.gz core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.zip | |
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'neon')
| -rw-r--r-- | neon/neon.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/neon/neon.patch b/neon/neon.patch index b7a3f8514335..cbb2db110856 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,96 @@ +@@ -1,1 +1,89 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -523,13 +523,6 @@ +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 \ |