Commit 651ae89c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r696006 from trunk:

* INSTALL: Add a blurb about --with-included-apr option.

Submitted by: Tim Bray
Tweaked by: jerenkrantz

Submitted by: jerenkrantz
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696748 13f79535-47bb-0310-9956-ffa450edef68
parent 07256b71
Loading
Loading
Loading
Loading
+13 −6
Changes for INSTALL: 13 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@
              might use "/usr/local/apache2" for PREFIX (without the
              quotes).

            * If you want to build a threaded MPM (for instance worker)
              on  FreeBSD, be aware that threads do not work well with
              Apache on FreeBSD versions before 5.4-RELEASE. If you wish
              to try a threaded Apache on an earlier version of FreeBSD,
              use the --enable-threads parameter to ./configure in
              addition to the --with-mpm parameter.
            * If you are a developer who will be linking your code with
              Apache or using a debugger to step through server code,
              ./configure's --with-included-apr option may be advantageous,
              as it removes the possibility of version or compile-option
              mismatches with APR and APR-util code.  (Many OSes now
              include their own version of APR and APR-util.)

            * If you are a developer building Apache directly from
              Subversion, you will need to run ./buildconf before running
@@ -31,6 +31,13 @@
              build Apache from a release tarball, you don't have to run
              buildconf.

            * If you want to build a threaded MPM (for instance worker)
              on  FreeBSD, be aware that threads do not work well with
              Apache on FreeBSD versions before 5.4-RELEASE. If you wish
              to try a threaded Apache on an earlier version of FreeBSD,
              use the --enable-threads parameter to ./configure in
              addition to the --with-mpm parameter.

            * If you are building directly from Subversion on Mac OS X
              (Darwin), make sure to use GNU Libtool 1.4.2 or newer. All
              recent versions of the developer tools on this platform
+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -161,12 +161,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   +1: chrisd
   -0: jim (would prefer to see in 2.4, and to push 2.4 out)

 * INSTALL: Provide a breadcrumb as to why you would use --with-included-apr
   Trunk version of patch:
     http://svn.apache.org/viewvc?rev=696006&view=rev
   Backport version for 2.2.x of patch:
      Trunk version of patch works
   +1: jerenkrantz, sctemme, jim

PATCHES/ISSUES THAT ARE STALLED