Commit 68fc700e authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent f0a5a8d8

acinclude.m4

+1 −0
Original line number Diff line number Diff line
@@ -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,[

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -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

hints.m4

0 → 100644
+50 −0
Original line number Diff line number Diff line 
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

])