diff options
| author | Ryan Bloom <rbb@apache.org> | 2000-11-28 22:31:51 +0100 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2000-11-28 22:31:51 +0100 |
| commit | 8726697160843240247be8c0b54a9dca3e2c6e49 (patch) | |
| tree | 32ea5963fc7c932cc0036d2e01b7a7a5ce2b3c3b | |
| parent | Pulled the aprlib base address out of Apache's baseaddr file (aprlib is hard (diff) | |
| download | apache2-8726697160843240247be8c0b54a9dca3e2c6e49.tar.xz apache2-8726697160843240247be8c0b54a9dca3e2c6e49.zip | |
Split the hints file into two files, one in APR and one in Apache. The APR
hints file just sets build variables, the Apache hints file just sets
Apache variables. This is meant to clean up parts of APR, so that they
don't include Apache information.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87107 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | hints.m4 | 50 |
3 files changed, 52 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8468961ccb..9fd9aedce9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -175,6 +175,7 @@ AC_DEFUN(APACHE_ONCE,[ sinclude(lib/apr/apr_common.m4) sinclude(lib/apr/hints.m4) +sinclude(hints.m4) AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[ AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[ diff --git a/configure.in b/configure.in index f8ab13dc4e..5573f5cbe6 100644 --- a/configure.in +++ b/configure.in @@ -35,6 +35,7 @@ AC_CANONICAL_SYSTEM dnl dnl ## Preload our OS configuration APR_PRELOAD +APACHE_PRELOAD dnl dnl Process command line arguments. This is done early in the process so the diff --git a/hints.m4 b/hints.m4 new file mode 100644 index 0000000000..e2a6d50ea3 --- /dev/null +++ b/hints.m4 @@ -0,0 +1,50 @@ +dnl +dnl APR_PRELOAD +dnl +dnl Preload various ENV/makefile paramsm such as CC, CFLAGS, etc +dnl based on outside knowledge +dnl +AC_DEFUN(APACHE_PRELOAD, [ +echo "Applying hints file rules for $host" + +case "$host" in + *-apple-aux3*) + APR_SETVAR(APACHE_MPM, [prefork]) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + *os2_emx*) + APR_SETVAR(APACHE_MPM, [spmt_os2]) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + *-linux-*) + case `uname -r` in + 2.2* ) APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + * ) + ;; + esac + ;; + *486-*-bsdi*) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + *-netbsd*) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + *-freebsd*) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; +dnl *-apple-rhapsody*) +dnl APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) +dnl ;; + *-apple-darwin*) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + *-dec-osf*) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; + *-qnx) + APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1]) + ;; +esac +APR_DOEXTRA +]) |