You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Blair Zajac <bl...@orcaware.com> on 2002/08/28 01:38:50 UTC
[PATCH] neon.mak fixes (was Re: svn commit: rev 3075 - trunk
trunk/build)
Joe,
The following patch fixes a bug in my recent neon.mak changes and
is needed for Subversion's build_neon.bat script to correctly build
neon 0.23.2.
The problem was that the WebDAV .c files were not being compiled if
EXPAT_SRC is not set, regardless if EXPAT_FLAGS is set, which
build_neon.bat does since it wants to specify the compile options to
link against APR's expat and not the binary Expat libraries I set
neon.mak up to by default.
Best,
Blair
--
Blair Zajac <bl...@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
--- ../../neon-0.23.2/neon.mak 2002-08-25 15:45:37.000000000 -0700
+++ neon.mak 2002-08-27 18:29:01.000000000 -0700
@@ -12,12 +12,14 @@
# 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
-# still set EXPAT_FLAGS to specify very specific complile behavior.
+# still set EXPAT_FLAGS to specify very specific compile behavior.
# If both EXPAT_SRC and EXPAT_FLAGS are not set, disable WebDAV
# support.
+BUILD_EXPAT = 1
!IF "$(EXPAT_SRC)" == ""
!IF "$(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
@@ -83,7 +85,7 @@
"$(INTDIR)\ne_uri.obj" \
"$(INTDIR)\ne_utils.obj"
-!IF "$(EXPAT_SRC)" != ""
+!IF "$(BUILD_EXPAT)" != ""
LIB32_OBJS= \
$(LIB32_OBJS) \
"$(INTDIR)\ne_207.obj" \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [neon] [PATCH] neon.mak fixes (was Re: svn commit: rev 3075 - trunk
trunk/build)
Posted by Blair Zajac <bl...@orcaware.com>.
Joe Orton wrote:
>
> On Tue, Aug 27, 2002 at 06:38:50PM -0700, Blair Zajac wrote:
> > Joe,
> >
> > The following patch fixes a bug in my recent neon.mak changes and
> > is needed for Subversion's build_neon.bat script to correctly build
> > neon 0.23.2.
> >
> > The problem was that the WebDAV .c files were not being compiled if
> > EXPAT_SRC is not set, regardless if EXPAT_FLAGS is set, which
> > build_neon.bat does since it wants to specify the compile options to
> > link against APR's expat and not the binary Expat libraries I set
> > neon.mak up to by default.
>
> Thanks Blair, both these patches are committed for the next release.
>
> Regards,
>
> joe
When is your next release scheduled?
Re: [neon] [PATCH] neon.mak fixes (was Re: svn commit: rev 3075 - trunk trunk/build)
Posted by Joe Orton <jo...@manyfish.co.uk>.
On Tue, Aug 27, 2002 at 06:38:50PM -0700, Blair Zajac wrote:
> Joe,
>
> The following patch fixes a bug in my recent neon.mak changes and
> is needed for Subversion's build_neon.bat script to correctly build
> neon 0.23.2.
>
> The problem was that the WebDAV .c files were not being compiled if
> EXPAT_SRC is not set, regardless if EXPAT_FLAGS is set, which
> build_neon.bat does since it wants to specify the compile options to
> link against APR's expat and not the binary Expat libraries I set
> neon.mak up to by default.
Thanks Blair, both these patches are committed for the next release.
Regards,
joe
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org