mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-07 02:06:57 +00:00
fd90671f79
- workaround apr detection. Now apache22 build his own apr, even if apr is installed, unless you define WITH_APR_FROM_PORTS. Reported by: pointyhat via kris [1]
55 lines
2.3 KiB
Plaintext
55 lines
2.3 KiB
Plaintext
--- configure.in.orig Sun Nov 13 06:33:15 2005
|
|
+++ configure.in Sat Dec 10 13:14:10 2005
|
|
@@ -67,9 +67,14 @@
|
|
AC_MSG_ERROR([APR not found. Please read the documentation.])
|
|
fi
|
|
|
|
+if test "x${USE_BUNDLED_APR}" != "x" ; then
|
|
+ apr_found=reconfig
|
|
+ apr_config=srclib/apr/apr-1-config
|
|
+fi
|
|
+
|
|
if test "$apr_found" = "reconfig"; then
|
|
APR_SUBDIR_CONFIG(srclib/apr,
|
|
- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
|
|
+ [$apache_apr_flags --prefix=$prefix],
|
|
[--enable-layout=*|\'--enable-layout=*])
|
|
dnl We must be the first to build and the last to be cleaned
|
|
AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
|
|
@@ -95,6 +100,11 @@
|
|
AC_MSG_ERROR([APR-util not found. Please read the documentation.])
|
|
fi
|
|
|
|
+if test "x${USE_BUNDLED_APR}" != "x" ; then
|
|
+ apu_found=reconfig
|
|
+ apu_config=srclib/apr-util/apu-1-config
|
|
+fi
|
|
+
|
|
# Catch some misconfigurations:
|
|
case ${apr_found}.${apu_found} in
|
|
reconfig.yes)
|
|
@@ -107,7 +117,7 @@
|
|
|
|
if test "$apu_found" = "reconfig"; then
|
|
APR_SUBDIR_CONFIG(srclib/apr-util,
|
|
- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
|
|
+ [--with-apr=../apr --prefix=$prefix],
|
|
[--enable-layout=*|\'--enable-layout=*])
|
|
dnl We must be the last to build and the first to be cleaned
|
|
AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
|
|
@@ -617,8 +627,14 @@
|
|
[Root directory of the Apache install area])
|
|
AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
|
|
[Location of the config file, relative to the Apache root directory])
|
|
+AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log",
|
|
+ [Location of error log file])
|
|
+AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status",
|
|
+ [Location of ScoreBoard file])
|
|
AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
|
|
[Location of the MIME types config file, relative to the Apache root directory])
|
|
+AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}",
|
|
+ [Location of document root])
|
|
AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
|
|
[Location of the source for the current MPM])
|
|
|