You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Marko Kreen <ma...@l-t.ee> on 2001/12/04 15:11:19 UTC
Makefile patch
I have Apache and Subversion under same tree, and when compiling
0.7 it picked up 0.6 headers. This fixes it.
--
marko
Index: ./Makefile.in
===================================================================
--- ./.svn/text-base/Makefile.in.svn-base Tue Dec 4 04:10:14 2001
+++ ./Makefile.in Tue Dec 4 17:06:41 2001
@@ -65,7 +65,7 @@
COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $<
-COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c $<
+COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(APACHE_INCLUDES) -o $@ -c $<
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(LDFLAGS) -rpath $(libdir)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Makefile patch
Posted by Marko Kreen <ma...@l-t.ee>.
On Tue, Dec 04, 2001 at 09:50:11AM -0600, Karl Fogel wrote:
> Marko Kreen <ma...@l-t.ee> writes:
> > I have Apache and Subversion under same tree, and when compiling
> > 0.7 it picked up 0.6 headers. This fixes it.
>
> Thanks. Could you describe the exact symptoms you saw, and how this
> patch changed them? We've been bitten before by not being careful
> enough with this stuff :-), so believe it or not, even a trivial patch
> such as this this will need to be thoroughly understood and tested
> before applying.
Well, the exact problem was this: the ./subversion/include
was not first -I in the path.
Now the problem - I cant give exact error message as I installed
0.7 already - but in ./subversion/mod_dav_svn/update.c line 460,
it complained the editor (svn_delta_edit_fns_t *editor;) does
not have a field open_root (and couple of other fields were
missing also - but I dont remember those). After switching
includes, it compiled.
> For example, Mike Pilato points out that maybe the reason
> $(APACHE_INCLUDES) come first is so they'll dominate when compiling on
> a system that has an older version of httpd installed somewhere (i.e.,
> using httpd 2.0 experimentally on a system where at least one earlier
> version of httpd is also installed, which is probably the majority of
> cases).
Ok, but when I have older subversion in the same tree as
APACHE_INCLUDES the older subversion headers tend to dominate
too... Same goes to Apr and other external packages - if they
come before ./subversion/include and it happens that there is
older subversion, then *boom*.
--
marko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Makefile patch
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Marko Kreen <ma...@l-t.ee> writes:
> I have Apache and Subversion under same tree, and when compiling
> 0.7 it picked up 0.6 headers. This fixes it.
Marko,
Thanks. Could you describe the exact symptoms you saw, and how this
patch changed them? We've been bitten before by not being careful
enough with this stuff :-), so believe it or not, even a trivial patch
such as this this will need to be thoroughly understood and tested
before applying.
For example, Mike Pilato points out that maybe the reason
$(APACHE_INCLUDES) come first is so they'll dominate when compiling on
a system that has an older version of httpd installed somewhere (i.e.,
using httpd 2.0 experimentally on a system where at least one earlier
version of httpd is also installed, which is probably the majority of
cases).
-Karl
> Index: ./Makefile.in
> ===================================================================
> --- ./.svn/text-base/Makefile.in.svn-base Tue Dec 4 04:10:14 2001
> +++ ./Makefile.in Tue Dec 4 17:06:41 2001
> @@ -65,7 +65,7 @@
> COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
> LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $<
>
> -COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c $<
> +COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(APACHE_INCLUDES) -o $@ -c $<
>
> LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(LDFLAGS) -rpath $(libdir)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org