From 8441f05fd9879d5699ca032342c07aee6413fbde Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Mon, 9 Jul 2001 02:31:09 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89517 13f79535-47bb-0310-9956-ffa450edef68 --- configure.in | 4 ++-- server/Makefile.in | 4 ++-- support/Makefile.in | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index cc4c0b9ebe..a95ce36415 100644 --- a/configure.in +++ b/configure.in @@ -296,10 +296,10 @@ AC_ARG_WITH(suexec-umask, 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) diff --git a/server/Makefile.in b/server/Makefile.in index 2980d5af88..0d9864ded7 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -32,8 +32,8 @@ test_char.h: gen_test_char 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: diff --git a/support/Makefile.in b/support/Makefile.in index 3a74435ea0..dba34417d7 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -6,8 +6,8 @@ TARGETS = $(PROGRAMS) 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 -- 2.50.1