- Force devel/apr0. Bundled srclib/apr is never used now.

With Hat:   apache@

1 files changed, 19 insertions, 19 deletions

diff --git a/www/apache20/files/patch-configure.in b/www/apache20/files/patch-configure.in
index c09a104796f0..844028703975 100644
--- a/www/apache20/files/patch-configure.in
+++ b/www/apache20/files/patch-configure.in
@@ -1,23 +1,5 @@
 --- ./configure.in.orig	2005-09-12 16:41:34.000000000 -0400
-+++ ./configure.in	2010-05-06 17:30:34.855458994 -0400
-@@ -69,7 +69,7 @@
- 
- 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 --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-                     [--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"
-@@ -106,7 +106,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 --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir],
-                     [--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"
++++ ./configure.in	2010-05-13 18:12:08.745593083 -0400
 @@ -124,11 +124,6 @@
  AC_PROG_CC
  AC_PROG_CPP
@@ -39,3 +21,21 @@
                SH_LIBTOOL='$(LIBTOOL)'
                SHLTCFLAGS="-prefer-pic"
                LTCFLAGS="-prefer-non-pic -static"
+@@ -485,7 +480,7 @@
+   AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
+ 
+ dnl AP_LIBS specifies the actual libraries. note we have some required libs.
+-AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS"
++AP_LIBS="$a/usr/local/lib/libpcre.la $AP_LIBS"
+ 
+ dnl APR should go after the other libs, so the right symbols can be picked up
+ AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
+@@ -526,7 +521,7 @@
+ APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) 
+ APACHE_FAST_OUTPUT(os/beos/Makefile os/os2/Makefile os/Makefile)
+ APACHE_FAST_OUTPUT(os/unix/Makefile server/Makefile)
+-APACHE_FAST_OUTPUT(support/Makefile srclib/pcre/Makefile)
++APACHE_FAST_OUTPUT(support/Makefile) 
+ 
+ if test -d ./test; then
+     APACHE_FAST_OUTPUT(test/Makefile)