Use APR_LAYOUT instead of APACHE_LAYOUT in configure.

(We need a bug fix in this code, so let's merge the macro first.)

PR: 15679

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98685 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d24ebdae52817ab28ca582ae986b820eb3ced1cf..7c6f5f40525f93bb3f777462a62b1c8f5a45e6d8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 cb12792a141045f2a4d8e690e223e0368e9376e2..f0ef66fb02161e4b20b6b9736e68fd966c104cc4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -271,76 +271,6 @@ AC_DEFUN(APACHE_MODULE,[
   fi
 ])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

diff --git a/configure.in b/configure.in
index f4a59d5d1e39599d76ed170139930799e56e43a4..d7e23c662d0f19a4ce2a2b79a7cb1113578ce753 100644 (file)
--- 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