httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Brian Havard" <bri...@kheldar.apana.org.au>
Subject Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Date Tue, 03 Dec 2002 13:59:48 GMT
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 |
 ------------------------------------------------------------------------------


Mime
View raw message