You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2001/07/09 04:31:11 UTC
cvs commit: httpd-2.0/support Makefile.in
rbb 01/07/08 19:31:11
Modified: . configure.in
server Makefile.in
. APRVARS.in configure.in
. configure.in
build apu-conf.m4 rules.mk.in
uri Makefile.in
xml/expat configure.in
xml/expat/lib Makefile.in
support Makefile.in
Log:
Allow all parts of Apache 2.0 to build when --srcdir is used. This
required exposing a build directory and a source directory to all parts
of Apache's build system. It also required a small hack in APR-util, if
we are using the bundled Expat, and we are using VPATH support, then we
have hard-coded the xml/expat location. I couldn't figure out how to
allow the configure script to determine the correct location. I added a
comment, but if somebody else figures it out, we should fix that at some
point.
PR: 7630
Revision Changes Path
1.165 +2 -2 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -b -w -u -r1.164 -r1.165
--- configure.in 2001/07/08 03:27:18 1.164
+++ configure.in 2001/07/09 02:30:37 1.165
@@ -296,10 +296,10 @@
dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
dnl AP_LIBS specifies the actual libraries. note we have some required libs.
-AP_LIBS="$abs_srcdir/srclib/pcre/libpcre.la $abs_srcdir/srclib/apr-util/libaprutil.la $AP_LIBS"
+AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $abs_builddir/srclib/apr-util/libaprutil.la $AP_LIBS"
dnl APR should go after the other libs, so the right symbols can be picked up
-AP_LIBS="$AP_LIBS $abs_srcdir/srclib/apr/libapr.la"
+AP_LIBS="$AP_LIBS $abs_builddir/srclib/apr/libapr.la"
APACHE_SUBST(AP_LIB_DIRS)
APACHE_SUBST(AP_LIBS)
1.61 +2 -2 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -b -w -u -r1.60 -r1.61
--- Makefile.in 2001/06/27 17:11:52 1.60
+++ Makefile.in 2001/07/09 02:30:41 1.61
@@ -32,8 +32,8 @@
util.lo: test_char.h
-EXPORT_FILES = $(top_srcdir)/srclib/apr/apr.exports \
- $(top_srcdir)/srclib/apr-util/aprutil.exports \
+EXPORT_FILES = $(top_builddir)/srclib/apr/apr.exports \
+ $(top_builddir)/srclib/apr-util/aprutil.exports \
$(TARGET_EXPORTS)
delete-exports:
1.9 +1 -0 apr/APRVARS.in
Index: APRVARS.in
===================================================================
RCS file: /home/cvs/apr/APRVARS.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -b -w -u -r1.8 -r1.9
--- APRVARS.in 2001/05/11 06:49:19 1.8
+++ APRVARS.in 2001/07/09 02:30:43 1.9
@@ -7,3 +7,4 @@
EXTRA_LIBS="@EXTRA_LIBS@"
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
LIBTOOL_LIBS="@LIBTOOL_LIBS@"
+APR_SOURCE_DIR="@abs_srcdir@"
1.332 +1 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -b -w -u -r1.331 -r1.332
--- configure.in 2001/07/08 02:48:53 1.331
+++ configure.in 2001/07/09 02:30:44 1.332
@@ -53,6 +53,7 @@
dnl
top_builddir="$abs_builddir"
AC_SUBST(top_builddir)
+AC_SUBST(abs_srcdir)
dnl Directory containing apr build macros, helpers, and make rules
dnl NOTE: make rules (rules.mk) will be in the builddir for vpath
1.26 +37 -24 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -b -w -u -r1.25 -r1.26
--- configure.in 2001/06/08 01:30:15 1.25
+++ configure.in 2001/07/09 02:30:51 1.26
@@ -12,18 +12,31 @@
AC_PROG_AWK
AC_CHECK_PROG(RM, rm, rm)
+dnl Absolute source/build directory
+abs_srcdir=`(cd $srcdir && pwd)`
+abs_builddir=`pwd`
+
+if test "$abs_builddir" != "$abs_srcdir"; then
+ USE_VPATH=1
+fi
+
dnl
dnl compute the top directory of the build
dnl note: this is needed for LIBTOOL and exporting the bundled Expat
dnl
-top_builddir="`cd $srcdir ; pwd`"
+top_builddir="$abs_builddir"
AC_SUBST(top_builddir)
+AC_SUBST(abs_srcdir)
dnl
dnl set up the compilation flags and stuff
dnl
INCLUDES="$INCLUDES -I\$(top_builddir)/include/private -I\$(top_builddir)/include"
+if test -n "$USE_VPATH"; then
+ INCLUDES="$INCLUDES -I\$(top_srcdir)/include"
+fi
+
dnl
dnl 1. Find the APR includes directory and (possibly) the source (base) dir.
dnl 2. Determine what DBM backend type to use.
@@ -33,7 +46,7 @@
APU_CHECK_DBM
APU_FIND_EXPAT
-INCLUDES="$INCLUDES -I$APR_INCLUDES"
+INCLUDES="$INCLUDES $APR_INCLUDES"
dnl
dnl prep libtool
@@ -96,16 +109,6 @@
AC_SUBST(EXPAT_LINK)
dnl
-dnl grab flags from APR.
-dnl ### APR doesn't have "nice" names for its exports (yet), but it isn't
-dnl ### a problem to deal with them right here
-dnl
-. "$APR_SOURCE_DIR/APRVARS"
-APR_EXPORT_CPPFLAGS="$EXTRA_CPPFLAGS"
-APR_EXPORT_CFLAGS="$EXTRA_CFLAGS"
-APR_EXPORT_LIBS="$EXTRA_LIBS"
-
-dnl
dnl Prep all the flags and stuff for compilation and export to other builds
dnl
CFLAGS="$CFLAGS $INCLUDES $APR_EXPORT_CFLAGS $APR_EXPORT_CPPFLAGS"
@@ -133,21 +136,31 @@
dnl
dnl everthing is done.
+MAKEFILES=" Makefile build/Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile uri/Makefile xml/Makefile misc/Makefile $test_Makefile"
AC_OUTPUT([
- Makefile
export_vars.sh
- build/Makefile
build/rules.mk
include/private/apu_select_dbm.h
include/apu.h
- buckets/Makefile
- crypto/Makefile
- dbm/Makefile
- dbm/sdbm/Makefile
- encoding/Makefile
- hooks/Makefile
- uri/Makefile
- xml/Makefile
- misc/Makefile
- $test_Makefile
+ $MAKEFILES
])
+
+dnl #----------------------------- Fixup Makefiles for VPATH support
+
+changequote({,})
+
+if test -n "$USE_VPATH"; then
+ for makefile in $MAKEFILES; do
+ dir=`echo $makefile|sed 's%[^/][^/]*$%%'`
+ (cat <<EOF
+srcdir = $abs_srcdir/$dir
+VPATH = $abs_srcdir/$dir
+
+EOF
+) | cat - $makefile > tmp
+ cp tmp $makefile
+ done
+ rm -f tmp
+fi
+
+changequote([,])
1.10 +37 -10 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -b -w -u -r1.9 -r1.10
--- apu-conf.m4 2001/04/03 22:46:48 1.9
+++ apu-conf.m4 2001/07/09 02:30:54 1.10
@@ -15,28 +15,46 @@
AC_MSG_ERROR(You need to specify a directory with --with-apr)
fi
absdir="`cd $withval ; pwd`"
- if test -f "$absdir/apr_pools.h"; then
+ if test -f "$absdir/apr.h"; then
APR_INCLUDES="$absdir"
- elif test -f "$absdir/include/apr_pools.h"; then
- APR_SOURCE_DIR="$absdir"
+ elif test -f "$absdir/include/apr.h"; then
+ APR_BUILD_DIR="$absdir"
fi
],[
dnl see if we can find APR
- if test -f "$srcdir/apr/include/apr_pools.h"; then
- APR_SOURCE_DIR="$srcdir/apr"
- elif test -f "$srcdir/../apr/include/apr_pools.h"; then
- APR_SOURCE_DIR="`cd $srcdir/../apr ; pwd`"
+ if test -f "$srcdir/apr/include/apr.h"; then
+ APR_BUILD_DIR="$srcdir/apr"
+ elif test -f "$srcdir/../apr/include/apr.h"; then
+ APR_BUILD_DIR="`cd $srcdir/../apr ; pwd`"
fi
])
-if test -n "$APR_SOURCE_DIR"; then
- APR_INCLUDES="$APR_SOURCE_DIR/include"
+
+dnl
+dnl grab flags from APR.
+dnl ### APR doesn't have "nice" names for its exports (yet), but it isn't
+dnl ### a problem to deal with them right here
+dnl
+
+. "$APR_BUILD_DIR/APRVARS"
+APR_EXPORT_CPPFLAGS="$EXTRA_CPPFLAGS"
+APR_EXPORT_CFLAGS="$EXTRA_CFLAGS"
+APR_EXPORT_LIBS="$EXTRA_LIBS"
+
+if test -n "$APR_BUILD_DIR"; then
+ APR_INCLUDES="-I$APR_BUILD_DIR/include"
+ if test "$APR_BUILD_DIR" != "$APR_SOURCE_DIR"; then
+ APR_INCLUDES="$APR_INCLUDES -I$APR_SOURCE_DIR/include"
+ fi
fi
+
if test -z "$APR_INCLUDES"; then
AC_MSG_RESULT(not found)
AC_MSG_ERROR(APR could not be located. Please use the --with-apr option.)
fi
+
AC_MSG_RESULT($APR_INCLUDES)
+AC_SUBST(APR_BUILD_DIR)
AC_SUBST(APR_SOURCE_DIR)
])
@@ -353,7 +371,7 @@
])
if test -z "$expat_include_dir"; then
- for d in /usr /usr/local xml/expat-cvs xml/expat ; do
+ for d in /usr /usr/local xml/expat-cvs xml/expat $srcdir/xml/expat ; do
APU_TEST_EXPAT($d)
if test -n "$expat_include_dir"; then
break
@@ -371,6 +389,15 @@
dnl special-case the bundled distribution (use absolute dirs)
if test "$expat_include_dir" = "xml/expat/lib" -o "$expat_include_dir" = "xml/expat-cvs/lib"; then
bundled_subdir="`echo $expat_include_dir | sed -e 's%/lib%%'`"
+ APU_SUBDIR_CONFIG($bundled_subdir)
+ expat_include_dir=$top_builddir/$bundled_subdir/lib
+ expat_libs=$top_builddir/$bundled_subdir/lib/libexpat.la
+ APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
+fi
+if test "$expat_include_dir" = "$srcdir/xml/expat/include" -o "$expat_include_dir" = "$srcdir/xml/expat/lib"; then
+ dnl This is a bit of a hack. This only works because we know that
+ dnl we are working with the bundled version of the software.
+ bundled_subdir="xml/expat"
APU_SUBDIR_CONFIG($bundled_subdir)
expat_include_dir=$top_builddir/$bundled_subdir/lib
expat_libs=$top_builddir/$bundled_subdir/lib/libexpat.la
1.13 +2 -0 apr-util/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr-util/build/rules.mk.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -b -w -u -r1.12 -r1.13
--- rules.mk.in 2001/05/17 23:21:58 1.12
+++ rules.mk.in 2001/07/09 02:30:56 1.13
@@ -60,6 +60,8 @@
# Configuration variables
#
top_builddir=@top_builddir@
+top_srcdir=@top_srcdir@
+APR_BUILD_DIR=@APR_BUILD_DIR@
APR_SOURCE_DIR=@APR_SOURCE_DIR@
CC=@CC@
1.7 +1 -1 apr-util/uri/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/uri/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -b -w -u -r1.6 -r1.7
--- Makefile.in 2001/07/03 20:51:02 1.6
+++ Makefile.in 2001/07/09 02:31:00 1.7
@@ -11,4 +11,4 @@
apr_uri.lo: uri_delims.h
uri_delims.h: gen_uri_delims
- ./gen_uri_delims > uri_delims.h
+ ./gen_uri_delims > $(top_builddir)/include/private/uri_delims.h
1.6 +3 -0 apr-util/xml/expat/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -b -w -u -r1.5 -r1.6
--- configure.in 2001/06/09 09:08:25 1.5
+++ configure.in 2001/07/09 02:31:04 1.6
@@ -58,6 +58,9 @@
;;
esac
+blddir=`pwd`
+AC_SUBST(blddir)
+
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_SUBST(EXPAT_MAJOR_VERSION)
1.4 +2 -1 apr-util/xml/expat/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/lib/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -w -u -r1.3 -r1.4
--- Makefile.in 2001/04/11 06:42:25 1.3
+++ Makefile.in 2001/07/09 02:31:06 1.4
@@ -27,6 +27,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+blddir = @blddir@/lib
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
@@ -77,7 +78,7 @@
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-INCLUDES = -I$(srcdir) -I..
+INCLUDES = -I$(srcdir) -I.. -I$(blddir)
DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"'
CPPFLAGS = @CPPFLAGS@
1.20 +2 -2 httpd-2.0/support/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -b -w -u -r1.19 -r1.20
--- Makefile.in 2001/06/08 15:02:25 1.19
+++ Makefile.in 2001/07/09 02:31:09 1.20
@@ -6,8 +6,8 @@
PROGRAM_LDADD = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
PROGRAM_DEPENDENCIES = \
- $(top_srcdir)/srclib/apr-util/libaprutil.la \
- $(top_srcdir)/srclib/apr/libapr.la
+ $(top_builddir)/srclib/apr-util/libaprutil.la \
+ $(top_builddir)/srclib/apr/libapr.la
include $(top_srcdir)/build/rules.mk