You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_ftp-commits@incubator.apache.org by wr...@apache.org on 2006/06/27 16:49:10 UTC
svn commit: r417510 - /incubator/mod_ftp/trunk/build/apache20_check.m4
Author: wrowe
Date: Tue Jun 27 09:49:10 2006
New Revision: 417510
URL: http://svn.apache.org/viewvc?rev=417510&view=rev
Log:
s/APACHE20/APACHE2/
Modified:
incubator/mod_ftp/trunk/build/apache20_check.m4
Modified: incubator/mod_ftp/trunk/build/apache20_check.m4
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/build/apache20_check.m4?rev=417510&r1=417509&r2=417510&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/build/apache20_check.m4 (original)
+++ incubator/mod_ftp/trunk/build/apache20_check.m4 Tue Jun 27 09:49:10 2006
@@ -1,11 +1,11 @@
dnl
-dnl COVL_CHECK_PCRE_INTERNAL: Get PCRE variables setup without using a
+dnl CHECK_PCRE_INTERNAL: Get PCRE variables setup without using a
dnl --with-pcre flag
dnl
-dnl COVL_CHECK_PCRE_INTERNAL(/path/to/pcre,[what_to_do_if_not_found])
+dnl CHECK_PCRE_INTERNAL(/path/to/pcre,[what_to_do_if_not_found])
dnl
-AC_DEFUN([COVL_CHECK_PCRE_INTERNAL],[
+AC_DEFUN([CHECK_PCRE_INTERNAL],[
AC_MSG_CHECKING(for PCRE)
searchfile="$1/pcreposix.h"
@@ -22,13 +22,13 @@
])
dnl
-dnl COVL_CHECK_APU_INTERNAL: Get APU variables setup without using a
+dnl CHECK_APU_INTERNAL: Get APU variables setup without using a
dnl --with-apu flag
dnl
-dnl COVL_CHECK_APU_INTERNAL(/path/to/apu,[what_to_do_if_not_found])
+dnl CHECK_APU_INTERNAL(/path/to/apu,[what_to_do_if_not_found])
dnl
-AC_DEFUN([COVL_CHECK_APU_INTERNAL],[
+AC_DEFUN([CHECK_APU_INTERNAL],[
AC_MSG_CHECKING(for APU)
searchfile="$1/apu-config"
@@ -49,13 +49,13 @@
])
dnl
-dnl COVL_CHECK_APR_INTERNAL: Get APR variables setup without using a
+dnl CHECK_APR_INTERNAL: Get APR variables setup without using a
dnl --with-apr flag
dnl
-dnl COVL_CHECK_APR_INTERNAL(/path/to/apr,[what_to_do_if_not_found])
+dnl CHECK_APR_INTERNAL(/path/to/apr,[what_to_do_if_not_found])
dnl
-AC_DEFUN([COVL_CHECK_APR_INTERNAL],[
+AC_DEFUN([CHECK_APR_INTERNAL],[
AC_MSG_CHECKING(for APR)
searchfile="$1/apr-config"
@@ -78,20 +78,20 @@
])
dnl
-dnl COVL_CHECK_APACHE20 - Implement the '--with-apache20' configuration
-dnl flag which figures out 'All Things Apache.'
-dnl It may be called with either a genuine Apache
-dnl souce directory, or a vpath build directory.
+dnl CHECK_APACHE2 - Implement the '--with-apache2' configuration
+dnl flag which figures out 'All Things Apache.'
+dnl It may be called with either a genuine Apache
+dnl souce directory, or a vpath build directory.
dnl
-dnl Substitutions: APACHE20_SRCDIR = source directory for Apache 2.0
-dnl APACHE20_BLDDIR = build directory for Apache 2.0 (if fnd)
-dnl APACHE20_CPPFLAGS = CPPFLAGS to use when building
-dnl modules against Apache 2.0
+dnl Substitutions: APACHE2_SRCDIR = source directory for Apache 2.x
+dnl APACHE2_BLDDIR = build directory for Apache 2.x (if fnd)
+dnl APACHE2_CPPFLAGS = CPPFLAGS to use when building
+dnl modules against Apache 2.x
dnl
-AC_DEFUN([COVL_CHECK_APACHE20],[
-AC_MSG_CHECKING(for Apache 2.0 source dir)
-AC_ARG_WITH(apache20, [ --with-apache20 Specify path to Apache source directory ],
+AC_DEFUN([CHECK_APACHE2],[
+AC_MSG_CHECKING(for Apache 2.x source dir)
+AC_ARG_WITH(apache2, [ --with-apache2 Specify path to Apache 2.x source directory ],
[
if test ! -f $withval/build/config_vars.mk; then
AC_MSG_ERROR($withval not a valid source or vpath dir)
@@ -102,46 +102,46 @@
if test -f $withval/include/httpd.h; then
AC_MSG_RESULT(found SOURCE dir $withval)
- APACHE20_SRCDIR=`cd $withval; pwd`
- APACHE20_BLDDIR="$APACHE20_SRCDIR"
+ APACHE2_SRCDIR=`cd $withval; pwd`
+ APACHE2_BLDDIR="$APACHE2_SRCDIR"
else
AC_MSG_RESULT(found VPATH dir $withval)
dnl Set the 'abs_srcdir' contained in the config_vars.mk
abs_srcdir=`grep abs_srcdir $withval/build/config_vars.mk | awk '{print $(3)}'`
- APACHE20_SRCDIR=$abs_srcdir
- APACHE20_BLDDIR=`cd $withval; pwd`
+ APACHE2_SRCDIR=$abs_srcdir
+ APACHE2_BLDDIR=`cd $withval; pwd`
fi
- APACHE20_CPPFLAGS="-I$APACHE20_SRCDIR/include"
- APACHE20_CPPFLAGS="$APACHE20_CPPFLAGS -I$APACHE20_SRCDIR/os/unix"
- if test "$APACHE20_SRCDIR" != "$APACHE20_BLDDIR" ; then
- APACHE20_CPPFLAGS="$APACHE20_CPPFLAGS -I$APACHE20_BLDDIR/os/unix"
- APACHE20_CPPFLAGS="$APACHE20_CPPFLAGS -I$APACHE20_BLDDIR/include"
+ APACHE2_CPPFLAGS="-I$APACHE2_SRCDIR/include"
+ APACHE2_CPPFLAGS="$APACHE2_CPPFLAGS -I$APACHE2_SRCDIR/os/unix"
+ if test "$APACHE2_SRCDIR" != "$APACHE2_BLDDIR" ; then
+ APACHE2_CPPFLAGS="$APACHE2_CPPFLAGS -I$APACHE2_BLDDIR/os/unix"
+ APACHE2_CPPFLAGS="$APACHE2_CPPFLAGS -I$APACHE2_BLDDIR/include"
fi
if grep AP_DEBUG "$withval/build/config_vars.mk" > /dev/null; then
- APACHE20_CPPFLAGS="$APACHE20_CPPFLAGS -DAP_DEBUG"
+ APACHE2_CPPFLAGS="$APACHE2_CPPFLAGS -DAP_DEBUG"
fi
if grep AP_HAVE_DESIGNATED_INITIALIZER "$withval/build/config_vars.mk" > /dev/null; then
- APACHE20_CPPFLAGS="$APACHE20_CPPFLAGS -DAP_HAVE_DESIGNATED_INITIALIZER"
+ APACHE2_CPPFLAGS="$APACHE2_CPPFLAGS -DAP_HAVE_DESIGNATED_INITIALIZER"
fi
- AC_SUBST(APACHE20_SRCDIR)
- AC_SUBST(APACHE20_BLDDIR)
- AC_SUBST(APACHE20_CPPFLAGS)
+ AC_SUBST(APACHE2_SRCDIR)
+ AC_SUBST(APACHE2_BLDDIR)
+ AC_SUBST(APACHE2_CPPFLAGS)
- COVL_CHECK_APR_INTERNAL([$APACHE20_BLDDIR/srclib/apr],[
- COVL_CHECK_APR_INTERNAL([$APACHE20_BLDDIR/bin],[
+ CHECK_APR_INTERNAL([$APACHE2_BLDDIR/srclib/apr],[
+ CHECK_APR_INTERNAL([$APACHE2_BLDDIR/bin],[
AC_MSG_ERROR(Strange anomaly -- not found)])])
- COVL_CHECK_APU_INTERNAL([$APACHE20_BLDDIR/srclib/apr-util],[
- COVL_CHECK_APU_INTERNAL([$APACHE20_BLDDIR/bin],[
+ CHECK_APU_INTERNAL([$APACHE2_BLDDIR/srclib/apr-util],[
+ CHECK_APU_INTERNAL([$APACHE2_BLDDIR/bin],[
AC_MSG_ERROR(Strange anomaly -- not found)])])
- COVL_CHECK_PCRE_INTERNAL([$APACHE20_BLDDIR/srclib/pcre],[
- COVL_CHECK_PCRE_INTERNAL([$APACHE20_BLDDIR/include],[
+ CHECK_PCRE_INTERNAL([$APACHE2_BLDDIR/srclib/pcre],[
+ CHECK_PCRE_INTERNAL([$APACHE2_BLDDIR/include],[
AC_MSG_ERROR(Strange anomaly -- not found)])])
],[
- AC_MSG_ERROR(--with-apache20 is a required build flag)
+ AC_MSG_ERROR(--with-apache2 is a required build flag)
])
])