diff options
author | Ryan Bloom <rbb@apache.org> | 2001-04-02 18:15:31 +0200 |
---|---|---|
committer | Ryan Bloom <rbb@apache.org> | 2001-04-02 18:15:31 +0200 |
commit | e27ddf4facf833be616de615dec7fe9803490bb7 (patch) | |
tree | b0ec5f0aa9bdbd1aa2db2360582da944f54b1260 /acinclude.m4 | |
parent | Reformat declaration so make_export.awk will recognize them. Yes, I know this (diff) | |
download | apache2-e27ddf4facf833be616de615dec7fe9803490bb7.tar.xz apache2-e27ddf4facf833be616de615dec7fe9803490bb7.zip |
Fix --enable-layout processing on NetBSD. This makes us use a consistant
location for the config.layout file, and it makes us a bit more portable.
PR: 7482
Submitted by: jun-ichiro hagino <itojun@iijlab.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88647 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 352605f458..af5c56c195 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -291,11 +291,11 @@ dnl dnl APACHE_LAYOUT(configlayout, layoutname) AC_DEFUN(APACHE_LAYOUT,[ if test ! -f $srcdir/config.layout; then - echo "** Error: Layout file $srcdir/../config.layout not found" + echo "** Error: Layout file $srcdir/config.layout not found" echo "** Error: Cannot use undefined layout '$LAYOUT'" exit 1 fi - pldconf=config.pld + pldconf=./config.pld changequote({,}) sed -e "1,/[ ]*<[lL]ayout[ ]*$2[ ]*>[ ]*/d" \ -e '/[ ]*<\/Layout>[ ]*/,$d' \ @@ -354,7 +354,7 @@ if test -z "$LAYOUT"; then libexecdir='${prefix}/modules' layout_name=Apache else - APACHE_LAYOUT($srcdir/../config.layout, $LAYOUT) + APACHE_LAYOUT($srcdir/config.layout, $LAYOUT) fi AC_MSG_CHECKING(for chosen layout) |