You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2003/01/30 17:50:12 UTC
cvs commit: httpd-2.0 configure.in buildconf CHANGES
jerenkrantz 2003/01/30 08:50:12
Modified: . configure.in buildconf CHANGES
Log:
Make buildconf work with out-of-tree apr and apr-util by adding --with-apr
and --with-apr-util flags.
Submitted by: Thom May <th...@planetarytramp.net>
Reviewed by: Justin Erenkrantz (with minor stylistic nit)
Revision Changes Path
1.239 +5 -5 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -u -r1.238 -r1.239
--- configure.in 19 Dec 2002 05:28:16 -0000 1.238
+++ configure.in 30 Jan 2003 16:50:11 -0000 1.239
@@ -13,9 +13,9 @@
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/find_apr.m4)
-sinclude(srclib/apr-util/build/find_apu.m4)
+sinclude(build/apr_common.m4)
+sinclude(build/find_apr.m4)
+sinclude(build/find_apu.m4)
sinclude(acinclude.m4)
dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in
@@ -80,7 +80,7 @@
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|'`
+APR_INCLUDEDIR=`$apr_config --includedir`
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
@@ -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 --includedir`
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
1.30 +59 -19 httpd-2.0/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/httpd-2.0/buildconf,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -u -r1.29 -r1.30
--- buildconf 8 Jan 2003 09:50:09 -0000 1.29
+++ buildconf 30 Jan 2003 16:50:11 -0000 1.30
@@ -56,12 +56,45 @@
# buildconf: Build the support scripts needed to compile from a
# checked-out version of the source code.
+# set a couple of defaults for where we should be looking for our support libs.
+# can be overridden with --with-apr=[dir] and --with-apr-util=[dir]
+
+apr_src_dir=srclib/apr
+apu_src_dir=srclib/apr-util
+
+while test $# -gt 0
+do
+ # Normalize
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --with-apr=*)
+ apr_src_dir=$optarg
+ ;;
+ esac
+
+ case "$1" in
+ --with-apr-util=*)
+ apu_src_dir=$optarg
+ ;;
+ esac
+
+ shift
+done
+
#
# Check to be sure that we have the srclib dependencies checked-out
#
-if [ ! -d srclib/apr -o ! -f srclib/apr/build/apr_common.m4 ]; then
+
+if [ ! -d "$apr_src_dir" -o ! -f "$apr_src_dir/build/apr_common.m4" ]; then
echo ""
- echo "You don't have a srclib/apr/ subdirectory. Please get one:"
+ echo "You don't have a copy of the apr source in $apr_src_dir. "
+ echo "Please get the source using the following instructions,"
+ echo "or specify the location of the source with "
+ echo "--with-apr=[path to apr] :"
echo ""
echo " cd srclib"
echo " cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login"
@@ -70,9 +103,12 @@
echo ""
exit 1
fi
-if [ ! -d srclib/apr-util -o ! -f srclib/apr-util/Makefile.in ]; then
+if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/Makefile.in" ]; then
echo ""
- echo "You don't have a srclib/apr-util/ subdirectory. Please get one:"
+ echo "You don't have a copy of the apr-util source in $apu_src_dir. "
+ echo "Please get one the source using the following instructions, "
+ echo "or specify the location of the source with "
+ echo "--with-apr-util=[path to apr-util]:"
echo ""
echo " cd srclib"
echo " cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login"
@@ -98,29 +134,33 @@
#
# end temporary stuff
-apr_configure="srclib/apr/configure"
-aprutil_configure="srclib/apr-util/configure"
+apr_configure="$apr_src_dir/configure"
+aprutil_configure="$apu_src_dir/configure"
pcre_configure="srclib/pcre/configure"
config_h_in="include/ap_config_auto.h.in"
cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
-echo rebuilding $apr_configure
-(cd srclib/apr && ./buildconf) || {
- echo "./buildconf failed for apr"
- exit 1
-}
+if [ -d srclib/apr ]; then
+ echo rebuilding $apr_configure
+ (cd srclib/apr && ./buildconf) || {
+ echo "./buildconf failed for apr"
+ exit 1
+ }
+fi
-echo rebuilding $aprutil_configure
-(cd srclib/apr-util && ./buildconf) || {
- echo "./buildconf failed for apr-util"
- exit 1
-}
+if [ -d srclib/apr-util ]; then
+ echo rebuilding $aprutil_configure
+ (cd srclib/apr-util && ./buildconf) || {
+ echo "./buildconf failed for apr-util"
+ exit 1
+ }
+fi
echo copying build files
-cp srclib/apr/build/config.guess build
-cp srclib/apr/build/config.sub build
-cp srclib/apr/build/PrintPath build
+cp $apr_src_dir/build/config.guess $apr_src_dir/build/config.sub \
+ $apr_src_dir/build/PrintPath $apr_src_dir/build/apr_common.m4 \
+ $apr_src_dir/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
# Optionally copy libtool-1.3.x files
if [ -f srclib/apr/build/ltconfig ]; then
1.1050 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1049
retrieving revision 1.1050
diff -u -u -r1.1049 -r1.1050
--- CHANGES 30 Jan 2003 16:43:39 -0000 1.1049
+++ CHANGES 30 Jan 2003 16:50:11 -0000 1.1050
@@ -2,6 +2,9 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) Modify buildconf to copy all required files into httpd's tree.
+ [Thom May <th...@planetarytramp.net>]
+
*) Allow mod_dav to do weak entity comparison functions.
[Justin Erenkrantz]
Re: cvs commit: httpd-2.0 configure.in buildconf CHANGES
Posted by Justin Erenkrantz <je...@apache.org>.
--On Thursday, January 30, 2003 4:50 PM +0000 jerenkrantz@apache.org
wrote:
> jerenkrantz 2003/01/30 08:50:12
>
> Modified: . configure.in buildconf CHANGES
> Log:
> Make buildconf work with out-of-tree apr and apr-util by adding
> --with-apr and --with-apr-util flags.
>
> Submitted by: Thom May <th...@planetarytramp.net>
> Reviewed by: Justin Erenkrantz (with minor stylistic nit)
>
> Revision Changes Path
> 1.239 +5 -5 httpd-2.0/configure.in
>
> Index: configure.in
>
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/configure.in,v
> retrieving revision 1.238
> retrieving revision 1.239
> diff -u -u -r1.238 -r1.239
> --- configure.in 19 Dec 2002 05:28:16 -0000 1.238
> +++ configure.in 30 Jan 2003 16:50:11 -0000 1.239
> @@ -80,7 +80,7 @@
> 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|'`
>+APR_INCLUDEDIR=`$apr_config --includedir`
>
> echo $ac_n "${nl}Configuring Apache Portable Runtime Utility
> library...${nl}"
> @@ -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 --includedir`
>
> echo $ac_n "${nl}Configuring PCRE regular expression library
> ...${nl}"
Oh, darn. That shouldn't have been there. Well, we probably need it
anyway. I'll commit the apr/apr-util changes right now that go with
this. -- justin