2556N/APatch origin: in-house

2556N/APatch status: Part 1: Solaris-specific; not suitable for upstream

2556N/APatch status: Part 2: https://issues.apache.org/bugzilla/show_bug.cgi?id=56090

2556N/A

2556N/A--- config.layout 2004-11-24 14:51:51.000000000 -0800

2556N/A+++ config.layout 2014-01-27 06:21:54.767926309 -0800

2556N/A@@ -179,21 +179,56 @@

2556N/A runtimedir: ${localstatedir}/run

2556N/A </Layout>

2556N/A

2556N/A-# Solaris 8 Layout

2556N/A+# Solaris Layout

2556N/A <Layout Solaris>

2556N/A- prefix: /usr/apr

2556N/A+ prefix: /usr/apr/1.5

2556N/A exec_prefix: ${prefix}

2556N/A bindir: ${exec_prefix}/bin

2556N/A sbindir: ${exec_prefix}/bin

2556N/A libdir: ${exec_prefix}/lib

2556N/A libexecdir: ${exec_prefix}/libexec

2556N/A mandir: ${exec_prefix}/man

2556N/A- sysconfdir: /etc/apr

2556N/A- datadir: /var/apr

2556N/A- installbuilddir: ${datadir}/build

2556N/A+ sysconfdir: /etc/apr/1.5

2556N/A+ datadir: /var/apr/1.5

2556N/A+ installbuilddir: ${prefix}/build

2556N/A includedir: ${exec_prefix}/include

2556N/A localstatedir: ${prefix}

2556N/A- runtimedir: /var/run

2556N/A+ runtimedir: /var/run/apr/1.5

2556N/A+ libsuffix: -${APR_MAJOR_VERSION}

2556N/A+</Layout>

2556N/A+

2556N/A+<Layout Solaris-amd64>

2556N/A+ prefix: /usr/apr/1.5

2556N/A+ exec_prefix: ${prefix}

2556N/A+ bindir: ${exec_prefix}/bin/amd64

2556N/A+ sbindir: ${exec_prefix}/bin/amd64

2556N/A+ libdir: ${exec_prefix}/lib/amd64

2556N/A+ libexecdir: ${exec_prefix}/libexec/amd64

2556N/A+ mandir: ${exec_prefix}/man

2556N/A+ sysconfdir: /etc/apr/1.5

2556N/A+ datadir: /var/apr/1.5

2556N/A+ installbuilddir: ${prefix}/build/amd64

2556N/A+ includedir: ${exec_prefix}/include

2556N/A+ localstatedir: ${prefix}

2556N/A+ runtimedir: /var/run/apr/1.5

2556N/A+ libsuffix: -${APR_MAJOR_VERSION}

2556N/A+</Layout>

2556N/A+

2556N/A+<Layout Solaris-sparcv9>

2556N/A+ prefix: /usr/apr/1.5

2556N/A+ exec_prefix: ${prefix}

2556N/A+ bindir: ${exec_prefix}/bin/sparcv9

2556N/A+ sbindir: ${exec_prefix}/bin/sparcv9

2556N/A+ libdir: ${exec_prefix}/lib/sparcv9

2556N/A+ libexecdir: ${exec_prefix}/libexec/sparcv9

2556N/A+ mandir: ${exec_prefix}/man

2556N/A+ sysconfdir: /etc/apr/1.5

2556N/A+ datadir: /var/apr/1.5

2556N/A+ installbuilddir: ${prefix}/build/sparcv9

2556N/A+ includedir: ${exec_prefix}/include

2556N/A+ localstatedir: ${prefix}

2556N/A+ runtimedir: /var/run/apr/1.5

2556N/A+ libsuffix: -${APR_MAJOR_VERSION}

2556N/A </Layout>

2556N/A

2556N/A # OpenBSD Layout

2556N/A--- configure.in 2013-11-13 04:15:56.000000000 -0800

2556N/A+++ configure.in 2014-01-30 04:26:55.991256430 -0800

2556N/A@@ -167,6 +167,10 @@

2556N/A

2556N/A echo "APR Version: ${APR_DOTTED_VERSION}"

2556N/A

2556N/A+AC_ARG_WITH(installbuilddir, [ --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],

2556N/A+ [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )

2556N/A+AC_SUBST(installbuilddir)

2556N/A+

2556N/A dnl Enable the layout handling code, then reparse the prefix-style

2556N/A dnl arguments due to autoconf being a PITA.

2556N/A APR_ENABLE_LAYOUT(apr)

2556N/A@@ -272,10 +276,6 @@

2556N/A ;;

2556N/A esac

2556N/A

2556N/A-AC_ARG_WITH(installbuilddir, [ --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],

2556N/A- [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )

2556N/A-AC_SUBST(installbuilddir)

2556N/A-

2556N/A AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the library],

2556N/A [ use_libtool=$withval ], [ use_libtool="yes" ] )

2556N/A