diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | acinclude.m4 | 70 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 4 insertions, 71 deletions
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) Use APR_LAYOUT instead of APACHE_LAYOUT in configure. PR 15679. + [Justin Erenkrantz] + *) Remove files on 'make distclean' that should be. PR 15592. [Justin Erenkrantz] diff --git a/acinclude.m4 b/acinclude.m4 index cb12792a14..f0ef66fb02 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -272,76 +272,6 @@ AC_DEFUN(APACHE_MODULE,[ ])dnl dnl -dnl APACHE_LAYOUT(configlayout, layoutname) -dnl -AC_DEFUN(APACHE_LAYOUT,[ - if test ! -f $srcdir/config.layout; then - echo "** Error: Layout file $srcdir/config.layout not found" - echo "** Error: Cannot use undefined layout '$LAYOUT'" - exit 1 - fi - pldconf=./config.pld - changequote({,}) - sed -e "1,/[ ]*<[lL]ayout[ ]*$2[ ]*>[ ]*/d" \ - -e '/[ ]*<\/Layout>[ ]*/,$d' \ - -e "s/^[ ]*//g" \ - -e "s/:[ ]*/=\'/g" \ - -e "s/[ ]*$/'/g" \ - $1 > $pldconf - layout_name=$2 - . $pldconf - rm $pldconf - for var in prefix exec_prefix bindir sbindir libexecdir mandir \ - sysconfdir datadir errordir iconsdir htdocsdir cgidir \ - includedir localstatedir runtimedir logfiledir libdir \ - manualdir proxycachedir installbuilddir; do - eval "val=\"\$$var\"" - case $val in - *+) - val=`echo $val | sed -e 's;\+$;;'` - eval "$var=\"\$val\"" - autosuffix=yes - ;; - *) - autosuffix=no - ;; - esac - val=`echo $val | sed -e 's:\(.\)/*$:\1:'` - val=`echo $val | sed -e 's:[\$]\([a-z_]*\):${\1}:g'` - if test "$autosuffix" = "yes"; then - if echo $val | grep apache >/dev/null; then - addtarget=no - else - addtarget=yes - fi - if test "$addtarget" = "yes"; then - val="$val/apache2" - fi - fi - eval "$var='$val'" - done - changequote([,]) -])dnl - -dnl -dnl APACHE_ENABLE_LAYOUT -dnl -AC_DEFUN(APACHE_ENABLE_LAYOUT,[ -AC_ARG_ENABLE(layout, -[ --enable-layout=LAYOUT],[ - LAYOUT=$enableval -]) - -if test -z "$LAYOUT"; then - LAYOUT="Apache" -fi -APACHE_LAYOUT($srcdir/config.layout, $LAYOUT) - -AC_MSG_CHECKING(for chosen layout) -AC_MSG_RESULT($layout_name) -]) - -dnl dnl APACHE_ENABLE_MODULES dnl AC_DEFUN(APACHE_ENABLE_MODULES,[ diff --git a/configure.in b/configure.in index f4a59d5d1e..d7e23c662d 100644 --- a/configure.in +++ b/configure.in @@ -24,7 +24,7 @@ dnl Something seems broken here. AC_PREFIX_DEFAULT(/usr/local/apache2) dnl Get the layout here, so we can pass the required variables to apr -APACHE_ENABLE_LAYOUT +APR_ENABLE_LAYOUT(Apache, [errordir iconsdir htdocsdir cgidir]) dnl reparse the configure arguments. APR_PARSE_ARGUMENTS |