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 2005/12/11 00:20:23 UTC
svn commit: r355825 [3/3] - in /incubator/mod_ftp/trunk: ./ build/ include/
modules/ src/
Propchange: incubator/mod_ftp/trunk/aclocal.m4
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/mod_ftp/trunk/build/apache20_check.m4
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/build/apache20_check.m4?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/build/apache20_check.m4 (added)
+++ incubator/mod_ftp/trunk/build/apache20_check.m4 Sat Dec 10 16:20:17 2005
@@ -0,0 +1,147 @@
+dnl
+dnl COVL_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
+
+AC_DEFUN([COVL_CHECK_PCRE_INTERNAL],[
+ AC_MSG_CHECKING(for PCRE)
+
+ searchfile="$1/pcreposix.h"
+ if test -f "$searchfile" ; then
+ PCRE_DIR=`cd $1; pwd`
+ PCRE_CPPFLAGS="-I$PCRE_DIR"
+ AC_MSG_RESULT(found PCRE)
+ else
+ $2
+ fi
+
+ AC_SUBST(PCRE_DIR)
+ AC_SUBST(PCRE_CPPFLAGS)
+])
+
+dnl
+dnl COVL_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
+
+AC_DEFUN([COVL_CHECK_APU_INTERNAL],[
+ AC_MSG_CHECKING(for APU)
+
+ searchfile="$1/apu-config"
+ if test -f "$searchfile" ; then
+ APU_DIR=`cd $1; pwd`
+ APU_SRCDIR=`$searchfile --srcdir`
+ APU_CPPFLAGS=`$searchfile --includes`
+ APU_EXTRA_LIBS=`$searchfile --libs`
+ AC_MSG_RESULT(found apr-util)
+ else
+ $2
+ fi
+
+ AC_SUBST(APU_DIR)
+ AC_SUBST(APU_SRCDIR)
+ AC_SUBST(APU_CPPFLAGS)
+ AC_SUBST(APU_EXTRA_LIBS)
+])
+
+dnl
+dnl COVL_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
+
+AC_DEFUN([COVL_CHECK_APR_INTERNAL],[
+ AC_MSG_CHECKING(for APR)
+
+ searchfile="$1/apr-config"
+ if test -f "$searchfile" ; then
+ APR_DIR=`cd $1; pwd`
+ APR_SRCDIR=`$searchfile --srcdir`
+ APR_CPPFLAGS=`$searchfile --cppflags --includes`
+ APR_CFLAGS=`$searchfile --cflags`
+ APR_EXTRA_LIBS=`$searchfile --libs`
+ AC_MSG_RESULT(found apr)
+ else
+ $2
+ fi
+
+ AC_SUBST(APR_DIR)
+ AC_SUBST(APR_SRCDIR)
+ AC_SUBST(APR_CPPFLAGS)
+ AC_SUBST(APR_CFLAGS)
+ AC_SUBST(APR_EXTRA_LIBS)
+])
+
+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
+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
+
+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 ],
+[
+ if test ! -f $withval/build/config_vars.mk; then
+ AC_MSG_ERROR($withval not a valid source or vpath dir)
+ fi
+
+ dnl In a vpath-build setup, httpd.h is in the real source
+ dnl directory, and config_vars.mk is in the vpath directory
+
+ if test -f $withval/include/httpd.h; then
+ AC_MSG_RESULT(found SOURCE dir $withval)
+ APACHE20_SRCDIR=`cd $withval; pwd`
+ APACHE20_BLDDIR="$APACHE20_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`
+ 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"
+ fi
+
+ if grep AP_DEBUG "$withval/build/config_vars.mk" > /dev/null; then
+ APACHE20_CPPFLAGS="$APACHE20_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"
+ fi
+
+ AC_SUBST(APACHE20_SRCDIR)
+ AC_SUBST(APACHE20_BLDDIR)
+ AC_SUBST(APACHE20_CPPFLAGS)
+
+ COVL_CHECK_APR_INTERNAL([$APACHE20_BLDDIR/srclib/apr],[
+ COVL_CHECK_APR_INTERNAL([$APACHE20_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],[
+ AC_MSG_ERROR(Strange anomaly -- not found)])])
+ COVL_CHECK_PCRE_INTERNAL([$APACHE20_BLDDIR/srclib/pcre],[
+ COVL_CHECK_PCRE_INTERNAL([$APACHE20_BLDDIR/include],[
+ AC_MSG_ERROR(Strange anomaly -- not found)])])
+],[
+ AC_MSG_ERROR(--with-apache20 is a required build flag)
+])
+])
Propchange: incubator/mod_ftp/trunk/build/apache20_check.m4
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/mod_ftp/trunk/build/cflags_check.m4
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/build/cflags_check.m4?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/build/cflags_check.m4 (added)
+++ incubator/mod_ftp/trunk/build/cflags_check.m4 Sat Dec 10 16:20:17 2005
@@ -0,0 +1,12 @@
+dnl
+dnl FILE: $Id: cflags_check.m4,v 1.1 2001/10/17 21:35:39 jtravis Exp $
+dnl
+dnl PURPOSE: COVL_CFLAGS_CHECK
+dnl check to see if certain C compiler flags are recognized
+dnl
+
+AC_DEFUN([COVL_CFLAGS_CHECK],[
+ ac_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_TRY_COMPILE([], [], [], [CFLAGS="$ac_save_cflags"])
+])
Propchange: incubator/mod_ftp/trunk/build/cflags_check.m4
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/mod_ftp/trunk/build/config_nice.m4
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/build/config_nice.m4?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/build/config_nice.m4 (added)
+++ incubator/mod_ftp/trunk/build/config_nice.m4 Sat Dec 10 16:20:17 2005
@@ -0,0 +1,21 @@
+dnl
+dnl COVL_CONFIG_NICE - Automatic generation of a config.nice file
+dnl
+dnl Usage: COVL_CONFIG_NICE(config.nice)
+dnl
+AC_DEFUN(COVL_CONFIG_NICE,[
+ rm -f $1
+ cat >$1<<EOF
+#! /bin/sh
+#
+# Created by configure
+EOF
+
+ echo "\"[$]0\" \\" >> $1
+ for arg in [$]ac_configure_args; do
+ echo "\"[$]arg\" \\" >> $1
+ done
+
+ echo '"[$]@"' >> $1
+ chmod +x $1
+])
Propchange: incubator/mod_ftp/trunk/build/config_nice.m4
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/mod_ftp/trunk/build/config_nice.m4
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/mod_ftp/trunk/build/maintainer_mode.m4
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/build/maintainer_mode.m4?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/build/maintainer_mode.m4 (added)
+++ incubator/mod_ftp/trunk/build/maintainer_mode.m4 Sat Dec 10 16:20:17 2005
@@ -0,0 +1,22 @@
+dnl
+dnl FILE: $Id: maintainer_mode.m4,v 1.8 2002/01/04 21:48:21 jtravis Exp $
+dnl
+dnl PURPOSE: COVL_MAINTAINER_MODE
+dnl - Implement the '--enable-maintainer' configure flag,
+dnl setting the CFLAGS for maintainence builds.
+dnl
+dnl CFLAGS is adjusted to contain flags necessary for
+dnl compiling in maintaier mode.
+dnl
+dnl AUTHOR: Cody Sherr, csherr@covalent.net
+dnl
+
+AC_DEFUN([COVL_MAINTAINER_MODE],[
+AM_MAINTAINER_MODE
+ if test ${USE_MAINTAINER_MODE}x = yesx && test ${GCC}x = yesx ; then
+ COVL_CFLAGS_CHECK([-Werror])
+ COVL_CFLAGS_CHECK([-Wall])
+ COVL_CFLAGS_CHECK([-Wmissing-prototypes])
+ COVL_CFLAGS_CHECK([-Wmissing-declarations])
+ fi
+])
Propchange: incubator/mod_ftp/trunk/build/maintainer_mode.m4
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/mod_ftp/trunk/build/maintainer_mode.m4
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/mod_ftp/trunk/build/pytest.m4
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/build/pytest.m4?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/build/pytest.m4 (added)
+++ incubator/mod_ftp/trunk/build/pytest.m4 Sat Dec 10 16:20:17 2005
@@ -0,0 +1,13 @@
+dnl
+dnl COVL_CHECK_PYTEST - Configure to use the Python test suite from handy
+dnl
+dnl Substitutions: PYTESTDIR = Location of the Python testsuite directory used
+dnl
+
+AC_DEFUN([COVL_CHECK_PYTEST],[
+ COVL_CHECK_TESTBIN
+ AM_CONDITIONAL(HAVE_TESTSUITE, test "$TESTBIN" != "")
+ PYTESTDIR=`pwd`/$1
+ AC_SUBST(PYTESTDIR)
+])
+
Propchange: incubator/mod_ftp/trunk/build/pytest.m4
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/mod_ftp/trunk/build/pytest.m4
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/mod_ftp/trunk/build/testbin.m4
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/build/testbin.m4?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/build/testbin.m4 (added)
+++ incubator/mod_ftp/trunk/build/testbin.m4 Sat Dec 10 16:20:17 2005
@@ -0,0 +1,22 @@
+dnl
+dnl COVL_TESTBIN - Implement the --with-testbin configure option.
+dnl
+dnl Substitutions: TESTBIN = contains the value used with --with-testbin
+dnl
+
+AC_DEFUN([COVL_CHECK_TESTBIN],[
+AC_MSG_CHECKING(for Apache binary to test with)
+AC_ARG_WITH(testbin,
+[ --with-testbin=apache_bin Path to an Apache binary with which to test ],
+[
+ if test -x "$withval" ; then
+ TESTBIN="$withval"
+ AC_MSG_RESULT(using $TESTBIN)
+ else
+ AC_MSG_ERROR($withval not found)
+ fi
+ AC_SUBST(TESTBIN)
+],[
+ AC_MSG_RESULT(--with-testbin not given)
+])
+])
Propchange: incubator/mod_ftp/trunk/build/testbin.m4
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/mod_ftp/trunk/build/testbin.m4
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/mod_ftp/trunk/buildconf
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/buildconf?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/buildconf (added)
+++ incubator/mod_ftp/trunk/buildconf Sat Dec 10 16:20:17 2005
@@ -0,0 +1,124 @@
+#!/bin/sh
+#
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# buildconf: Build the support scripts needed to compile from a
+# checked-out version of the source code.
+
+# set a couple of defaults for where we should be looking for our support libs.
+# can be overridden with --with-apr=[dir] --with-apr-util=[dir] and with
+# --with-httpd=[dir]
+
+httpd_src_dir="../httpd"
+
+while test $# -gt 0
+do
+ # Normalize
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --with-httpd=*)
+ httpd_src_dir=$optarg
+ ;;
+ esac
+
+ shift
+done
+
+#
+# Check to be sure that we have the srclib dependencies checked-out
+#
+
+should_exit=0
+httpd_found=0
+
+for dir in $httpd_src_dir
+do
+ if [ -d "${dir}" -a -f "${dir}/build/apr_common.m4" ]; then
+ echo "found httpd source: ${dir}"
+ httpd_src_dir=$dir
+ httpd_found=1
+ break
+ fi
+done
+
+if [ $httpd_found -lt 1 ]; then
+ echo ""
+ echo "You don't have a copy of the httpd source configured in $dir. "
+ echo "Please get the source using the following instructions,"
+ echo "or specify the location of the source with "
+ echo "--with-httpd=[path to httpd] :"
+ echo ""
+ echo " svn co http://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr"
+ echo ""
+ should_exit=1
+fi
+
+if [ $should_exit -gt 0 ]; then
+ exit 1
+fi
+
+# These are temporary until Roy finishes the other build changes
+#
+touch .deps
+rm -f aclocal.m4
+rm -f generated_lists
+
+# Remove autoconf 2.5x cache directories
+rm -rf autom4te*.cache
+
+case "`uname`" in
+*BSD/OS*)
+ $httpd_src_dir/build/bsd_makefile;;
+esac
+#
+# end temporary stuff
+
+cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
+
+echo copying build files
+cp $httpd_src_dir/build/config.guess $httpd_src_dir/build/config.sub \
+ $httpd_src_dir/build/PrintPath $httpd_src_dir/build/apr_common.m4 \
+ $httpd_src_dir/build/find_apr.m4 $httpd_src_dir/build/find_apu.m4 build
+
+# Remove any libtool files so one can switch between libtool 1.3
+# and libtool 1.4 by simply rerunning the buildconf script.
+(cd build ; rm -f ltconfig ltmain.sh)
+
+# Optionally copy libtool-1.3.x files
+if [ -f $apr_src_dir/build/ltconfig ]; then
+ cp $apr_src_dir/build/ltconfig build
+fi
+if [ -f $apr_src_dir/build/ltmain.sh ]; then
+ cp $apr_src_dir/build/ltmain.sh build
+fi
+
+echo rebuilding $config_h_in
+rm -f $config_h_in
+${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
+
+echo rebuilding configure
+rm -f config.cache
+${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
+
+# Remove autoconf 2.5x cache directories
+rm -rf autom4te*.cache
+
+exit 0
Propchange: incubator/mod_ftp/trunk/buildconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/mod_ftp/trunk/buildconf
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/mod_ftp/trunk/configure.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/configure.in?rev=355825&r1=355824&r2=355825&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/configure.in (original)
+++ incubator/mod_ftp/trunk/configure.in Sat Dec 10 16:20:17 2005
@@ -1,6 +1,6 @@
AC_INIT(src/mod_ftp.c)
-AM_INIT_AUTOMAKE(covalent_ftp, 3.0.2)
-AM_CONFIG_HEADER(include/ftp_config.h:config.in)
+AM_INIT_AUTOMAKE(mod_ftp, 3.0.2)
+AM_CONFIG_HEADER(include/ftp_config.h:include/ftp_config.h.in)
AM_MAINTAINER_MODE
AM_PROG_LIBTOOL
@@ -19,10 +19,7 @@
COVL_MAINTAINER_MODE
COVL_CONFIG_NICE(config.nice)
COVL_CHECK_APACHE20
-COVL_CHECK_LICENSE
-COVL_CHECK_BEAVER([],AC_MSG_RESULT(--with-beaver not given))
COVL_CHECK_PYTEST(tests)
-COVL_CHECK_SNMP
FTPDIR=`pwd`
Added: incubator/mod_ftp/trunk/include/ftp_config.h.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/include/ftp_config.h.in?rev=355825&view=auto
==============================================================================
--- incubator/mod_ftp/trunk/include/ftp_config.h.in (added)
+++ incubator/mod_ftp/trunk/include/ftp_config.h.in Sat Dec 10 16:20:17 2005
@@ -0,0 +1,67 @@
+/* include/ftp_config.h.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `fchmod' function. */
+#undef HAVE_FCHMOD
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
Propchange: incubator/mod_ftp/trunk/include/ftp_config.h.in
------------------------------------------------------------------------------
svn:eol-style = native