You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by jo...@apache.org on 2006/01/10 14:25:15 UTC

svn commit: r367594 - /apr/apr/trunk/build/apr_common.m4

Author: jorton
Date: Tue Jan 10 05:25:09 2006
New Revision: 367594

URL: http://svn.apache.org/viewcvs?rev=367594&view=rev
Log:
* build/apr_common.m4 (APR_LAYOUT): Catch invalid layout names which
otherwise cause sed script errors and user confusion a la PR 38209.

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

Modified: apr/apr/trunk/build/apr_common.m4
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/build/apr_common.m4?rev=367594&r1=367593&r2=367594&view=diff
==============================================================================
--- apr/apr/trunk/build/apr_common.m4 (original)
+++ apr/apr/trunk/build/apr_common.m4 Tue Jan 10 05:25:09 2006
@@ -720,6 +720,13 @@
     echo "** Error: Cannot use undefined layout '$LAYOUT'"
     exit 1
   fi
+  # Catch layout names including a slash which will otherwise
+  # confuse the heck out of the sed script.
+  case $2 in
+  */*) 
+    echo "** Error: $2 is not a valid layout name"
+    exit 1 ;;
+  esac
   pldconf=./config.pld
   changequote({,})
   sed -e "1s/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*//;1t" \