You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Joe Orton <jo...@manyfish.co.uk> on 2002/11/29 12:44:41 UTC
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
On Fri, Nov 29, 2002 at 11:05:59AM -0000, wsanchez@apache.org wrote:
> # full path required to keep BSD make happy
> -$(top_builddir)/server/exports.c:
> - $(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@
> +$(top_builddir)/server/exports.c: export_files
> + $(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $<` > $@
>
> -export_vars.h:
> - $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@
> +export_vars.h: export_files
> + $(AWK) -f $(top_srcdir)/build/make_var_export.awk `cat $<` > $@
Those will both break with non-GNU make, needs s/$</export_files/
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Justin Erenkrantz <je...@apache.org>.
--On Saturday, December 7, 2002 8:54 AM -0800 Aaron Bannert
<aa...@clove.org> wrote:
> --includes)
> if test "$location" = "installed"; then
> flags="$flags -I$includedir $INCLUDES"
> elif test "$location" = "source"; then
> flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
> else
> flags="$flags -I$thisdir/include -I$APU_SOURCE_DIR/include
> $INCLUDES" fi
> ;;
>
>
> (Also, while we're on the topic: what is the else case for?)
VPATH builds. -- justin
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Aaron Bannert <aa...@clove.org>.
On Friday, December 6, 2002, at 10:06 PM, Wilfredo Sánchez wrote:
> Is this because expat is in a directory containing "apr" in the path?
>
> What does "apu-config --includes" output for you? Yeah, mine is:
>
> -I/usr/local/apache/include/apr-0 -I/usr/local/BerkeleyDB.4.1/include
> -I/usr/local/include
>
> because I build expat separately and put it in /usr/local.
>
> I'm a little worried about this patch because since you switched it
> to only scan away preceding spaces, this only works so long at apr's
> include dir is first, but it looks like that's always the case unless
> we change apu-config, so OK.
I was going to go into apu-config.in and comment the requirement
that apr's include dir always end up first, and although I probably
don't understand what you guys are trying to fix, it doesn't look
to me like it'll always be apr's include dir first:
--includes)
if test "$location" = "installed"; then
flags="$flags -I$includedir $INCLUDES"
elif test "$location" = "source"; then
flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
else
flags="$flags -I$thisdir/include -I$APU_SOURCE_DIR/include
$INCLUDES"
fi
;;
(Also, while we're on the topic: what is the else case for?)
-aaron
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Brian Havard <br...@kheldar.apana.org.au>.
On Fri, 6 Dec 2002 22:06:11 -0800, Wilfredo Sánchez wrote:
> Is this because expat is in a directory containing "apr" in the path?
Quite possibly.
> What does "apu-config --includes" output for you? Yeah, mine is:
I did actually include this in my post:
>> My apu-config --include prints:
>>
>> -I/Apache/httpd-2.0/srclib/apr-util/include
>> -I/Apache/httpd-2.0/srclib/apr-util/xml/expat/lib
> -I/usr/local/apache/include/apr-0 -I/usr/local/BerkeleyDB.4.1/include
>-I/usr/local/include
>
>because I build expat separately and put it in /usr/local.
>
> I'm a little worried about this patch because since you switched it
>to only scan away preceding spaces, this only works so long at apr's
>include dir is first, but it looks like that's always the case unless
>we change apu-config, so OK.
I wasn't sure about it either, that's why I posted a "this works for me"
patch rather than just commiting it.
>On Tuesday, December 3, 2002, at 05:59 AM, Brian Havard wrote:
>
>> On Tue, 03 Dec 2002 23:24:46 +1000 (EST), Brian Havard wrote:
>>
>>> On Fri, 29 Nov 2002 12:09:55 -0800, Wilfredo Sánchez wrote:
>>>
>>>> Yuck OK. $< is used for the ApacheCoreOS2.def, though I suppose
>>>> that
>>>> only matters for OS/2. I won't touch it.
>>>
>>> That should be fine as only gnu make is used to build on OS/2. There's
>>> another problem though that breaks the OS/2 build & I'm not sure what
>>> the
>>> right fix is. What's happening is that exports.c tries to #include
>>> "winconfig.h" which it finds in apr-util/xml/expat/lib/winconfig.h
>>> which
>>> fails as that tries to #include windows.h.
>>>
>>> I don't think the expat library headers should be included by
>>> EXPORT_DIRS,
>>> I can't see any reason to force all expat functions into the Apache
>>> core.
>>
>> On further investigation it appears the culprit is in configure.in
>> where:
>>
>> APU_INCLUDEDIR=`$apu_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^
>> ]]*\).*$|\1|'`
>>
>> which extracts the LAST -I directory when it needs to extract the
>> first.
>> My apu-config --include prints:
>>
>> -I/Apache/httpd-2.0/srclib/apr-util/include
>> -I/Apache/httpd-2.0/srclib/apr-util/xml/expat/lib
>>
>> so I get the expat headers which I don't want & I don't get the
>> apr-util
>> headers which I do want. This fixes it for me:
>>
>> Index: configure.in
>> ===================================================================
>> RCS file: /home/cvs/httpd-2.0/configure.in,v
>> retrieving revision 1.236
>> diff -u -r1.236 configure.in
>> --- configure.in 29 Nov 2002 07:34:20 -0000 1.236
>> +++ configure.in 3 Dec 2002 12:52:21 -0000
>> @@ -100,7 +100,7 @@
>> APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
>> APR_ADDTO(INCLUDES, `$apu_config --includes`)
>> APU_BINDIR=`$apu_config --bindir`
>> -APU_INCLUDEDIR=`$apu_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^
>> ]]*\).*$|\1|'`
>> +APU_INCLUDEDIR=`$apu_config --includes | sed 's|^ *-I\([[^ ]]*apr[[^
>> ]]*\).*$|\1|'`
>>
>> echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
>>
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Wilfredo Sánchez <ws...@wsanchez.net>.
Is this because expat is in a directory containing "apr" in the path?
What does "apu-config --includes" output for you? Yeah, mine is:
-I/usr/local/apache/include/apr-0 -I/usr/local/BerkeleyDB.4.1/include
-I/usr/local/include
because I build expat separately and put it in /usr/local.
I'm a little worried about this patch because since you switched it
to only scan away preceding spaces, this only works so long at apr's
include dir is first, but it looks like that's always the case unless
we change apu-config, so OK.
-wsv
On Tuesday, December 3, 2002, at 05:59 AM, Brian Havard wrote:
> On Tue, 03 Dec 2002 23:24:46 +1000 (EST), Brian Havard wrote:
>
>> On Fri, 29 Nov 2002 12:09:55 -0800, Wilfredo Sánchez wrote:
>>
>>> Yuck OK. $< is used for the ApacheCoreOS2.def, though I suppose
>>> that
>>> only matters for OS/2. I won't touch it.
>>
>> That should be fine as only gnu make is used to build on OS/2. There's
>> another problem though that breaks the OS/2 build & I'm not sure what
>> the
>> right fix is. What's happening is that exports.c tries to #include
>> "winconfig.h" which it finds in apr-util/xml/expat/lib/winconfig.h
>> which
>> fails as that tries to #include windows.h.
>>
>> I don't think the expat library headers should be included by
>> EXPORT_DIRS,
>> I can't see any reason to force all expat functions into the Apache
>> core.
>
> On further investigation it appears the culprit is in configure.in
> where:
>
> APU_INCLUDEDIR=`$apu_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^
> ]]*\).*$|\1|'`
>
> which extracts the LAST -I directory when it needs to extract the
> first.
> My apu-config --include prints:
>
> -I/Apache/httpd-2.0/srclib/apr-util/include
> -I/Apache/httpd-2.0/srclib/apr-util/xml/expat/lib
>
> so I get the expat headers which I don't want & I don't get the
> apr-util
> headers which I do want. This fixes it for me:
>
> Index: configure.in
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/configure.in,v
> retrieving revision 1.236
> diff -u -r1.236 configure.in
> --- configure.in 29 Nov 2002 07:34:20 -0000 1.236
> +++ configure.in 3 Dec 2002 12:52:21 -0000
> @@ -100,7 +100,7 @@
> APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
> APR_ADDTO(INCLUDES, `$apu_config --includes`)
> APU_BINDIR=`$apu_config --bindir`
> -APU_INCLUDEDIR=`$apu_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^
> ]]*\).*$|\1|'`
> +APU_INCLUDEDIR=`$apu_config --includes | sed 's|^ *-I\([[^ ]]*apr[[^
> ]]*\).*$|\1|'`
>
> echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
>
>
> --
>
> _______________________________________________________________________
> _______
> | Brian Havard | "He is not the messiah!
> |
> | brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life
> of Brian |
>
> -----------------------------------------------------------------------
> -------
>
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Brian Havard <br...@kheldar.apana.org.au>.
On Tue, 03 Dec 2002 23:24:46 +1000 (EST), Brian Havard wrote:
>On Fri, 29 Nov 2002 12:09:55 -0800, Wilfredo Sánchez wrote:
>
>> Yuck OK. $< is used for the ApacheCoreOS2.def, though I suppose that
>>only matters for OS/2. I won't touch it.
>
>That should be fine as only gnu make is used to build on OS/2. There's
>another problem though that breaks the OS/2 build & I'm not sure what the
>right fix is. What's happening is that exports.c tries to #include
>"winconfig.h" which it finds in apr-util/xml/expat/lib/winconfig.h which
>fails as that tries to #include windows.h.
>
>I don't think the expat library headers should be included by EXPORT_DIRS,
>I can't see any reason to force all expat functions into the Apache core.
On further investigation it appears the culprit is in configure.in where:
APU_INCLUDEDIR=`$apu_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
which extracts the LAST -I directory when it needs to extract the first.
My apu-config --include prints:
-I/Apache/httpd-2.0/srclib/apr-util/include -I/Apache/httpd-2.0/srclib/apr-util/xml/expat/lib
so I get the expat headers which I don't want & I don't get the apr-util
headers which I do want. This fixes it for me:
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.236
diff -u -r1.236 configure.in
--- configure.in 29 Nov 2002 07:34:20 -0000 1.236
+++ configure.in 3 Dec 2002 12:52:21 -0000
@@ -100,7 +100,7 @@
APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
APR_ADDTO(INCLUDES, `$apu_config --includes`)
APU_BINDIR=`$apu_config --bindir`
-APU_INCLUDEDIR=`$apu_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
+APU_INCLUDEDIR=`$apu_config --includes | sed 's|^ *-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Brian Havard <br...@kheldar.apana.org.au>.
On Fri, 29 Nov 2002 12:09:55 -0800, Wilfredo Sánchez wrote:
> Yuck OK. $< is used for the ApacheCoreOS2.def, though I suppose that
>only matters for OS/2. I won't touch it.
That should be fine as only gnu make is used to build on OS/2. There's
another problem though that breaks the OS/2 build & I'm not sure what the
right fix is. What's happening is that exports.c tries to #include
"winconfig.h" which it finds in apr-util/xml/expat/lib/winconfig.h which
fails as that tries to #include windows.h.
I don't think the expat library headers should be included by EXPORT_DIRS,
I can't see any reason to force all expat functions into the Apache core.
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Wilfredo Sánchez <ws...@wsanchez.net>.
Yuck OK. $< is used for the ApacheCoreOS2.def, though I suppose that
only matters for OS/2. I won't touch it.
-wsv
On Friday, November 29, 2002, at 03:44 AM, Joe Orton wrote:
> Those will both break with non-GNU make, needs s/$</export_files/