diff options
| author | Joe Orton <jorton@apache.org> | 2006-01-10 13:25:09 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2006-01-10 13:25:09 +0000 |
| commit | d1b19777e825bbc5d45affb52a25d7bfec28f757 (patch) | |
| tree | d7ed1f3d648b9c4bd6777bd395fd25bc2352c09a /build/apr_common.m4 | |
| parent | 5fa5939a35126f44ce10f6beb28b93df2d3b9a97 (diff) | |
| download | apr-d1b19777e825bbc5d45affb52a25d7bfec28f757.tar.gz | |
* build/apr_common.m4 (APR_LAYOUT): Catch invalid layout names which
otherwise cause sed script errors and user confusion a la PR 38209.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@367594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/apr_common.m4')
| -rw-r--r-- | build/apr_common.m4 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/apr_common.m4 b/build/apr_common.m4 index 3be28c128..9c169d988 100644 --- a/build/apr_common.m4 +++ b/build/apr_common.m4 @@ -720,6 +720,13 @@ AC_DEFUN([APR_LAYOUT], [ 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" \ |