Bug#374160: Fix for apache2 FTBFS bug

[Daniel Schepler <schepler@math.berkeley.edu>]

tags 374160 + patch
thanks

I finally tracked down this bug to the fact that APR_PARSE_ARGUMENTS is 
assuming the command line is still in $*, which is no longer necessarily the 
case with the current version of autoconf.  So prefix etc aren't correctly 
getting restored to their correct values after having values read from the 
default layout.  I've attached a patch which fixes this by restoring the 
original command line before running the rest; just drop it into 
debian/patches.
-- 
Daniel Schepler

--- build-tree/apache2/build/apr_common.m4
+++ build-tree/apache2/build/apr_common.m4
@@ -827,6 +827,8 @@
 dnl used here to allow us to co-exist layouts and argument based
 dnl set ups.
 AC_DEFUN(APR_PARSE_ARGUMENTS,[
+eval "set x $ac_configure_args"
+shift
 ac_prev=
 for ac_option
 do
--- build-tree/apache2/srclib/apr/build/apr_common.m4
+++ build-tree/apache2/srclib/apr/build/apr_common.m4
@@ -827,6 +827,8 @@
 dnl used here to allow us to co-exist layouts and argument based
 dnl set ups.
 AC_DEFUN(APR_PARSE_ARGUMENTS,[
+eval "set x $ac_configure_args"
+shift
 ac_prev=
 for ac_option
 do
--- build-tree/apache2/srclib/apr-util/build/apr_common.m4
+++ build-tree/apache2/srclib/apr-util/build/apr_common.m4
@@ -827,6 +827,8 @@
 dnl used here to allow us to co-exist layouts and argument based
 dnl set ups.
 AC_DEFUN(APR_PARSE_ARGUMENTS,[
+eval "set $ac_configure_args"
+shift
 ac_prev=
 for ac_option
 do