httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0 acinclude.m4 configure.in CHANGES
Date Mon, 17 Feb 2003 02:32:20 GMT
jerenkrantz    2003/02/16 18:32:20

  Modified:    .        acinclude.m4 configure.in CHANGES
  Log:
  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
  
  Revision  Changes    Path
  1.136     +0 -70     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.135
  retrieving revision 1.136
  diff -u -u -r1.135 -r1.136
  --- acinclude.m4	19 Dec 2002 05:35:55 -0000	1.135
  +++ acinclude.m4	17 Feb 2003 02:32:19 -0000	1.136
  @@ -272,76 +272,6 @@
   ])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,[
  
  
  
  1.244     +1 -1      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.243
  retrieving revision 1.244
  diff -u -u -r1.243 -r1.244
  --- configure.in	17 Feb 2003 01:04:40 -0000	1.243
  +++ configure.in	17 Feb 2003 02:32:20 -0000	1.244
  @@ -24,7 +24,7 @@
   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
  
  
  
  1.1073    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1072
  retrieving revision 1.1073
  diff -u -u -r1.1072 -r1.1073
  --- CHANGES	17 Feb 2003 01:04:40 -0000	1.1072
  +++ CHANGES	17 Feb 2003 02:32:20 -0000	1.1073
  @@ -2,6 +2,9 @@
   
     [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]
   
  
  
  

Mime
View raw message