You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ws...@apache.org on 2002/11/29 12:05:59 UTC
cvs commit: httpd-2.0/server .cvsignore Makefile.in
wsanchez 2002/11/29 03:05:59
Modified: . Tag: APACHE_2_0_BRANCH CHANGES acinclude.m4
buildconf configure.in
build Tag: APACHE_2_0_BRANCH binbuild.sh
modules/aaa Tag: APACHE_2_0_BRANCH config.m4
modules/filters Tag: APACHE_2_0_BRANCH config.m4
modules/mappers Tag: APACHE_2_0_BRANCH config9.m4
server Tag: APACHE_2_0_BRANCH .cvsignore Makefile.in
Added: build Tag: APACHE_2_0_BRANCH PrintPath config.guess
config.sub
Log:
Back-port changes to allow build without an in-tree apr and apr-util.
Revision Changes Path
No revision
No revision
1.988.2.2 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.1
retrieving revision 1.988.2.2
diff -u -r1.988.2.1 -r1.988.2.2
--- CHANGES 25 Nov 2002 19:41:06 -0000 1.988.2.1
+++ CHANGES 29 Nov 2002 11:05:56 -0000 1.988.2.2
@@ -1,5 +1,8 @@
Changes with Apache 2.0.44
+ *) build: './configure && make' now works without an in-tree
+ apr and apr-util. [Wilfredo Sanchez]
+
*) mod_negotiation: Set the appropriate mime response headers
(Content-Type, charset, Content-Language and Content-Encoding)
for negotated type-map "Body:" responses (such as the error
1.133.2.1 +2 -0 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.133
retrieving revision 1.133.2.1
diff -u -r1.133 -r1.133.2.1
--- acinclude.m4 14 Nov 2002 14:17:03 -0000 1.133
+++ acinclude.m4 29 Nov 2002 11:05:57 -0000 1.133.2.1
@@ -88,7 +88,9 @@
APACHE_SUBST(INSTALL_PROG_FLAGS)
APACHE_SUBST(DSO_MODULES)
APACHE_SUBST(APR_BINDIR)
+ APACHE_SUBST(APR_INCLUDEDIR)
APACHE_SUBST(APU_BINDIR)
+ APACHE_SUBST(APU_INCLUDEDIR)
abs_srcdir="`(cd $srcdir && pwd)`"
1.27.2.1 +5 -0 httpd-2.0/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/httpd-2.0/buildconf,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -r1.27 -r1.27.2.1
--- buildconf 2 Aug 2002 03:42:12 -0000 1.27
+++ buildconf 29 Nov 2002 11:05:57 -0000 1.27.2.1
@@ -117,6 +117,11 @@
exit 1
}
+echo copying build files
+cp srclib/apr/build/config.guess build
+cp srclib/apr/build/config.sub build
+cp srclib/apr/build/PrintPath build
+
echo rebuilding $pcre_configure
(cd srclib/pcre && ${AUTOCONF:-autoconf})
1.232.2.1 +5 -5 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.232
retrieving revision 1.232.2.1
diff -u -r1.232 -r1.232.2.1
--- configure.in 14 Nov 2002 14:17:03 -0000 1.232
+++ configure.in 29 Nov 2002 11:05:57 -0000 1.232.2.1
@@ -8,14 +8,12 @@
AC_INIT(ABOUT_APACHE)
AC_CONFIG_HEADER(include/ap_config_auto.h)
-AC_CONFIG_AUX_DIR(srclib/apr/build)
+AC_CONFIG_AUX_DIR(build)
dnl #
dnl # Include our own M4 macros along with those for APR and libtool
dnl #
sinclude(srclib/apr/build/apr_common.m4)
-sinclude(srclib/apr/build/apr_network.m4)
-sinclude(srclib/apr/build/apr_threads.m4)
sinclude(srclib/apr/build/find_apr.m4)
sinclude(srclib/apr-util/build/find_apu.m4)
sinclude(acinclude.m4)
@@ -63,7 +61,7 @@
echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
-APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr")
+APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1)
if test "$apr_found" = "no"; then
AC_MSG_ERROR([APR not found. Please read the documentation.])
@@ -82,10 +80,11 @@
APR_ADDTO(INCLUDES, `$apr_config --includes`)
SHLIBPATH_VAR=`$apr_config --shlib-path-var`
APR_BINDIR=`$apr_config --bindir`
+APR_INCLUDEDIR=`$apr_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util")
+APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1)
if test "$apu_found" = "no"; then
AC_MSG_ERROR([APR-util not found. Please read the documentation.])
@@ -101,6 +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|'`
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
No revision
No revision
1.40.2.1 +46 -37 httpd-2.0/build/binbuild.sh
Index: binbuild.sh
===================================================================
RCS file: /home/cvs/httpd-2.0/build/binbuild.sh,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -r1.40 -r1.40.2.1
--- binbuild.sh 12 Aug 2002 14:21:48 -0000 1.40
+++ binbuild.sh 29 Nov 2002 11:05:57 -0000 1.40.2.1
@@ -6,17 +6,25 @@
# This script falls under the Apache License.
# See http://www.apache.org/docs/LICENSE
-OS=`./srclib/apr/build/config.guess`
-BUILD_DIR="`pwd`/bindist"
+OS=`./build/config.guess`
+PRINTPATH="build/PrintPath"
+APFULLDIR=`pwd`
+BUILD_DIR="$APFULLDIR/bindist"
DEFAULT_DIR="/usr/local/apache2"
-APDIR=`pwd`
+APDIR="$APFULLDIR"
APDIR=`basename $APDIR`
-APFULLDIR=`pwd`
CONFIGPARAM="--enable-layout=Apache --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
-VER=`echo $APDIR |sed s/httpd-//`
-TAR="`srclib/apr/build/PrintPath tar`"
-GTAR="`srclib/apr/build/PrintPath gtar`"
-GZIP="`srclib/apr/build/PrintPath gzip`"
+VER=`echo $APDIR | sed s/httpd-//`
+TAR="`$PRINTPATH tar`"
+GZIP="`$PRINTPATH gzip`"
+COMPRESS="`$PRINTPATH compress`"
+MD5="`$PRINTPATH md5`"
+if [ x$MD5 = x ]; then
+ OPENSSL="`$PRINTPATH openssl`"
+ if [ x$OPENSSL != x ]; then
+ MD5="$OPENSSL md5"
+ fi
+fi
if [ x$1 != x ]; then
USER=$1
@@ -24,8 +32,7 @@
USER="`build/buildinfo.sh -n %u@%h%d`"
fi
-if [ ! -f ./ABOUT_APACHE ]
-then
+if [ ! -f ./ABOUT_APACHE ]; then
echo "ERROR: The current directory contains no valid Apache distribution."
echo "Please change the directory to the top level directory of a freshly"
echo "unpacked Apache 2.0 source distribution and re-execute the script"
@@ -33,8 +40,7 @@
exit 1;
fi
-if [ -d ./CVS ]
-then
+if [ -d ./CVS ]; then
echo "ERROR: The current directory is a CVS checkout of Apache."
echo "Only a standard Apache 2.0 source distribution should be used to"
echo "create a binary distribution."
@@ -60,8 +66,7 @@
echo "[EOF]" \
) 2>&1 | tee build.log
-if [ ! -f ./bindist/bin/httpd ]
-then
+if [ ! -f ./bindist/bin/httpd ]; then
echo "ERROR: Failed to build Apache. See \"build.log\" for details."
exit 1;
fi
@@ -144,41 +149,45 @@
echo "Creating distribution archive and readme file..."
-if [ ".`grep -i error build.log > /dev/null`" != . ]
-then
+if [ ".`grep -i error build.log > /dev/null`" != . ]; then
echo "ERROR: Failed to build Apache. See \"build.log\" for details."
exit 1;
else
- if [ "x$GTAR" != "x" ]
- then
- $GTAR -zcf ../httpd-$VER-$OS.tar.gz -C .. httpd-$VER
- else
- if [ "x$TAR" != "x" ]
- then
- case "x$OS" in
- x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
- *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
- esac
- if [ "x$GZIP" != "x" ]
- then
- $GZIP ../httpd-$VER-$OS.tar
- fi
+ if [ "x$TAR" != "x" ]; then
+ case "x$OS" in
+ x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
+ *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
+ esac
+ if [ "x$GZIP" != "x" ]; then
+ $GZIP -9 ../httpd-$VER-$OS.tar
+ ARCHIVE=../httpd-$VER-$OS.tar.gz
+ elif [ "x$COMPRESS" != "x" ]; then
+ $COMPRESS ../httpd-$VER-$OS.tar
+ ARCHIVE=../httpd-$VER-$OS.tar.Z
else
- echo "ERROR: Could not find a 'tar' program!"
- echo " Please execute the following commands manually:"
- echo " tar -cf ../httpd-$VER-$OS.tar ."
- echo " gzip ../httpd-$VER-$OS.tar"
+ echo "WARNING: Could not find a 'gzip' program!"
+ echo " tar archive is not compressed."
+ ARCHIVE=../httpd-$VER-$OS.tar
fi
+ else
+ echo "ERROR: Could not find a 'tar' program!"
+ echo " Please execute the following commands manually:"
+ echo " tar -cf ../httpd-$VER-$OS.tar ."
+ echo " gzip -9 ../httpd-$VER-$OS.tar"
+ fi
+
+ if [ "x$MD5" != "x" ]; then
+ $MD5 $ARCHIVE > $ARCHIVE.md5
fi
- if [ -f ../httpd-$VER-$OS.tar.gz ] && [ -f ../httpd-$VER-$OS.README ]
- then
+ if [ -f $ARCHIVE ] && [ -f ../httpd-$VER-$OS.README ]; then
echo "Ready."
- echo "You can find the binary archive (httpd-$VER-$OS.tar.gz)"
+ echo "You can find the binary archive ($ARCHIVE)"
echo "and the readme file (httpd-$VER-$OS.README) in the"
echo "parent directory."
exit 0;
else
+ echo "ERROR: Archive or README is missing."
exit 1;
fi
fi
No revision
No revision
1.4.2.1 +0 -0 httpd-2.0/build/PrintPath
Index: PrintPath
===================================================================
RCS file: /home/cvs/httpd-2.0/build/PrintPath,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
1.1.2.1 +0 -0 httpd-2.0/build/config.guess
Index: config.guess
===================================================================
RCS file: /home/cvs/httpd-2.0/build/config.guess,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 httpd-2.0/build/config.sub
Index: config.sub
===================================================================
RCS file: /home/cvs/httpd-2.0/build/config.sub,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.57.2.1 +1 -1 httpd-2.0/modules/aaa/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/config.m4,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -u -r1.57 -r1.57.2.1
--- config.m4 20 Sep 2002 00:57:49 -0000 1.57
+++ config.m4 29 Nov 2002 11:05:58 -0000 1.57.2.1
@@ -36,7 +36,7 @@
APACHE_MODULE(auth_basic, basic authentication, , , yes)
APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
ap_old_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
+ CPPFLAGS="$CPPFLAGS $INCLUDES"
AC_TRY_COMPILE([#include <apr.h>], [
#if !APR_HAS_RANDOM
#error You need APR random support to use mod_auth_digest.
No revision
No revision
1.9.2.1 +1 -1 httpd-2.0/modules/filters/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/config.m4,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- config.m4 14 Nov 2002 20:22:49 -0000 1.9
+++ config.m4 29 Nov 2002 11:05:58 -0000 1.9.2.1
@@ -42,7 +42,7 @@
if test "$ap_zlib_base" != "/usr"; then
APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work
- CPPFLAGS="$CPPFLAGS -I${ap_zlib_base}/include"
+ CPPFLAGS="$CPPFLAGS $INCLUDES"
APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib])
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])
No revision
No revision
1.12.2.1 +1 -1 httpd-2.0/modules/mappers/config9.m4
Index: config9.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/config9.m4,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- config9.m4 21 Aug 2002 19:47:15 -0000 1.12
+++ config9.m4 29 Nov 2002 11:05:58 -0000 1.12.2.1
@@ -23,7 +23,7 @@
fi
ap_old_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
+CPPFLAGS="$CPPFLAGS $INCLUDES"
AC_TRY_COMPILE([#include <apr.h>], [
#if !APR_HAS_DSO
#error You need APR DSO support to use mod_so.
No revision
No revision
1.15.2.1 +1 -0 httpd-2.0/server/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/httpd-2.0/server/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- .cvsignore 5 Jun 2002 14:56:45 -0000 1.15
+++ .cvsignore 29 Nov 2002 11:05:58 -0000 1.15.2.1
@@ -5,6 +5,7 @@
*.la
test_char.h
gen_test_char
+export_files
exports.c
export_vars.h
Debug
1.75.2.1 +23 -17 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.75
retrieving revision 1.75.2.1
diff -u -r1.75 -r1.75.2.1
--- Makefile.in 8 Oct 2002 15:12:43 -0000 1.75
+++ Makefile.in 29 Nov 2002 11:05:58 -0000 1.75.2.1
@@ -2,7 +2,7 @@
CLEAN_TARGETS = gen_test_char test_char.h gen_uri_delims uri_delims.h \
ApacheCoreOS2.def
DISTCLEAN_TARGETS = httpd.exp
-EXTRACLEAN_TARGETS = exports.c export_vars.h
+EXTRACLEAN_TARGETS = export_files exports.c export_vars.h
SUBDIRS = mpm
@@ -30,28 +30,34 @@
util.lo: test_char.h
-EXPORT_FILES = $(top_srcdir)/include/*.h \
- $(top_srcdir)/os/$(OS_DIR)/*.h \
- $(top_srcdir)/srclib/apr/include/*.h \
- $(top_srcdir)/srclib/apr-util/include/*.h \
- $(top_srcdir)/modules/http/*.h
+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$OS_DIR $APR_INCLUDEDIR $APU_INCLUDEDIR $(top_srcdir)/modules/http
-delete-exports:
+delete-exports: export_files
@if test -f exports.c; then \
- headers="`find $(EXPORT_FILES) -newer exports.c`" ; \
- if test -n "$$headers"; then \
- echo Found newer headers. Will rebuild exports.c. ; \
- echo rm -f exports.c ; \
- rm -f exports.c ; \
- fi \
+ files=`cat $<`; \
+ headers="`find $$files -newer exports.c`"; \
+ if test -n "$$headers"; then \
+ echo Found newer headers. Will rebuild exports.c.; \
+ echo rm -f exports.c; \
+ rm -f exports.c; \
+ fi; \
fi
+export_files:
+ tmp=export_files_unsorted.txt; \
+ rm -f $$tmp && touch $$tmp; \
+ for dir in $(EXPORT_DIRS); do \
+ find $$dir -maxdepth 1 -type f -name '*.h' >> $$tmp; \
+ done; \
+ cat $$tmp | sort | uniq > $@; \
+ rm -f $$tmp
+
# 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 $<` > $@
# wtf does this have to be explicit????
exports.lo: exports.c
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by "William A. Rowe, Jr." <wr...@apache.org>.
At 06:47 AM 12/2/2002, Jeff Trawick wrote:
>wsanchez@apache.org writes:
>
>> wsanchez 2002/11/29 03:05:59
>>
>> Modified: . Tag: APACHE_2_0_BRANCH CHANGES acinclude.m4
>> buildconf configure.in
>> build Tag: APACHE_2_0_BRANCH binbuild.sh
>> modules/aaa Tag: APACHE_2_0_BRANCH config.m4
>> modules/filters Tag: APACHE_2_0_BRANCH config.m4
>> modules/mappers Tag: APACHE_2_0_BRANCH config9.m4
>> server Tag: APACHE_2_0_BRANCH .cvsignore Makefile.in
>> Added: build Tag: APACHE_2_0_BRANCH PrintPath config.guess
>> config.sub
>> Log:
>> Back-port changes to allow build without an in-tree apr and apr-util.
>
>Why does the stable tree need this?
Because apache-2.0 is a long-lived version, and this will help builders
for many, many months to come...
>Why can't we wait more than a few hours to merge such extensive
>changes into the stable tree?
We can and should...
>At the moment it looks like we're at an impasse on whether or not to
>review before merging back to stable, but the very least people can do
>when it is not a trivial change, particularly for build issues, is
>wait a while to to see what blows up.
Agreed. It's good to discover problems on the sandbox before we move
them into stable. A couple (or three) days is probably good to let most
folks' autobuilds chew on cvs HEAD and discover new problems.
So I like the philosophy of Fred's patches for 2.0 as well, but it would
be good to iron them out in the sandbox before they are backported.
Bill
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/
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Joe Orton <jo...@manyfish.co.uk>.
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 Wilfredo Sánchez <ws...@wsanchez.net>.
Well, I appreciate that, and apologize if it was a bad thing.
As to why in stable... This wasn't a major change. It doesn't
change the build output, and enabled a new way to build which I and at
least some others think is important. That is, I think
that--particularly for the stable tree--we should stop building apr as
if it were part of httpd and use stable releases of apr. This is a
step in that direction.
That said, I agree it should have waited so as to let other people
give it a whirl. My bad. Bad Fred.
-wsv
On Monday, December 2, 2002, at 04:47 AM, Jeff Trawick wrote:
> Why does the stable tree need this?
>
> Why can't we wait more than a few hours to merge such extensive
> changes into the stable tree?
>
> At the moment it looks like we're at an impasse on whether or not to
> review before merging back to stable, but the very least people can do
> when it is not a trivial change, particularly for build issues, is
> wait a while to to see what blows up.
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Wilfredo Sánchez <ws...@wsanchez.net>.
Well, I appreciate that, and apologize if it was a bad thing.
As to why in stable... This wasn't a major change. It doesn't
change the build output, and enabled a new way to build which I and at
least some others think is important. That is, I think
that--particularly for the stable tree--we should stop building apr as
if it were part of httpd and use stable releases of apr. This is a
step in that direction.
That said, I agree it should have waited so as to let other people
give it a whirl. My bad. Bad Fred.
-wsv
On Monday, December 2, 2002, at 04:47 AM, Jeff Trawick wrote:
> Why does the stable tree need this?
>
> Why can't we wait more than a few hours to merge such extensive
> changes into the stable tree?
>
> At the moment it looks like we're at an impasse on whether or not to
> review before merging back to stable, but the very least people can do
> when it is not a trivial change, particularly for build issues, is
> wait a while to to see what blows up.
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Jeff Trawick <tr...@attglobal.net>.
wsanchez@apache.org writes:
> wsanchez 2002/11/29 03:05:59
>
> Modified: . Tag: APACHE_2_0_BRANCH CHANGES acinclude.m4
> buildconf configure.in
> build Tag: APACHE_2_0_BRANCH binbuild.sh
> modules/aaa Tag: APACHE_2_0_BRANCH config.m4
> modules/filters Tag: APACHE_2_0_BRANCH config.m4
> modules/mappers Tag: APACHE_2_0_BRANCH config9.m4
> server Tag: APACHE_2_0_BRANCH .cvsignore Makefile.in
> Added: build Tag: APACHE_2_0_BRANCH PrintPath config.guess
> config.sub
> Log:
> Back-port changes to allow build without an in-tree apr and apr-util.
Why does the stable tree need this?
Why can't we wait more than a few hours to merge such extensive
changes into the stable tree?
At the moment it looks like we're at an impasse on whether or not to
review before merging back to stable, but the very least people can do
when it is not a trivial change, particularly for build issues, is
wait a while to to see what blows up.
--
Jeff Trawick | trawick@attglobal.net
Born in Roswell... married an alien...
Re: cvs commit: httpd-2.0/server .cvsignore Makefile.in
Posted by Jeff Trawick <tr...@attglobal.net>.
wsanchez@apache.org writes:
> wsanchez 2002/11/29 03:05:59
>
> Modified: . Tag: APACHE_2_0_BRANCH CHANGES acinclude.m4
> buildconf configure.in
> build Tag: APACHE_2_0_BRANCH binbuild.sh
> modules/aaa Tag: APACHE_2_0_BRANCH config.m4
> modules/filters Tag: APACHE_2_0_BRANCH config.m4
> modules/mappers Tag: APACHE_2_0_BRANCH config9.m4
> server Tag: APACHE_2_0_BRANCH .cvsignore Makefile.in
> Added: build Tag: APACHE_2_0_BRANCH PrintPath config.guess
> config.sub
> Log:
> Back-port changes to allow build without an in-tree apr and apr-util.
Why does the stable tree need this?
Why can't we wait more than a few hours to merge such extensive
changes into the stable tree?
At the moment it looks like we're at an impasse on whether or not to
review before merging back to stable, but the very least people can do
when it is not a trivial change, particularly for build issues, is
wait a while to to see what blows up.
--
Jeff Trawick | trawick@attglobal.net
Born in Roswell... married an alien...