--- configure.old	2007-12-11 11:53:36.000000000 -0800
+++ configure	2007-12-11 11:54:16.000000000 -0800
@@ -5794,8 +5794,8 @@
 
 else
   if test "${ac_cv_header_apr_1_0_apr_tables_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for apr-1.0/apr_tables.h" >&5
-echo $ECHO_N "checking for apr-1.0/apr_tables.h... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for apr-1/apr_tables.h" >&5
+echo $ECHO_N "checking for apr-1/apr_tables.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_apr_1_0_apr_tables_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
@@ -5803,8 +5803,8 @@
 echo "${ECHO_T}$ac_cv_header_apr_1_0_apr_tables_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking apr-1.0/apr_tables.h usability" >&5
-echo $ECHO_N "checking apr-1.0/apr_tables.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking apr-1/apr_tables.h usability" >&5
+echo $ECHO_N "checking apr-1/apr_tables.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5812,7 +5812,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <apr-1.0/apr_tables.h>
+#include <apr-1/apr_tables.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -5844,15 +5844,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking apr-1.0/apr_tables.h presence" >&5
-echo $ECHO_N "checking apr-1.0/apr_tables.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking apr-1/apr_tables.h presence" >&5
+echo $ECHO_N "checking apr-1/apr_tables.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <apr-1.0/apr_tables.h>
+#include <apr-1/apr_tables.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -5885,30 +5885,30 @@
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: apr-1.0/apr_tables.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: apr-1.0/apr_tables.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: apr-1/apr_tables.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: apr-1/apr_tables.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for apr-1.0/apr_tables.h" >&5
-echo $ECHO_N "checking for apr-1.0/apr_tables.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for apr-1/apr_tables.h" >&5
+echo $ECHO_N "checking for apr-1/apr_tables.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_apr_1_0_apr_tables_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else