svn commit: r1183686 - in /apr/apr/trunk: CHANGES build/apr_common.m4

[sf...@apache.org]

Author: sf
Date: Sat Oct 15 20:47:58 2011
New Revision: 1183686

URL: http://svn.apache.org/viewvc?rev=1183686&view=rev
Log:
Fix APR_RESTORE_THE_ENVIRONMENT if the original variable was a single space

Autoconf selects a POSIX shell for us, so we can get rid of sed, here.

PR 50334
Submitted by:  Nathan Phillip Brink <binki gentoo org>

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/build/apr_common.m4

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1183686&r1=1183685&r2=1183686&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Sat Oct 15 20:47:58 2011
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 2.0.0
 
+  *) configure: Fix APR_RESTORE_THE_ENVIRONMENT if the original variable was
+     a single space. PR 50334. [Nathan Phillip Brink <binki gentoo org>]
+
   *) apr_proc_create: Don't close any of the new stdin/stdout/stderr in the
      child if it already has the correct FD. PR 51995.
      [Dan Ports <drkp csail mit edu>]

Modified: apr/apr/trunk/build/apr_common.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apr_common.m4?rev=1183686&r1=1183685&r2=1183686&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_common.m4 (original)
+++ apr/apr/trunk/build/apr_common.m4 Sat Oct 15 20:47:58 2011
@@ -209,7 +209,7 @@ else
   if test "x$apr_ste_save_$1" = "x$$1"; then
     $2$1=
   else
-    $2$1=`echo $$1 | sed -e "s%${apr_ste_save_$1}%%"`
+    $2$1="${$1#"${apr_ste_save_$1}"}"
     $1="$apr_ste_save_$1"
   fi
 fi