added new m4 directory

12 files changed, 875 insertions, 2 deletions

diff --git a/m4/apache.m4 b/m4/apache.m4
new file mode 100644
index 0000000..6051821
--- /dev/null
+++ b/m4/apache.m4
@@ -0,0 +1,151 @@
+
+dnl CHECK_APACHE([MINIMUM13-VERSION [, MINIMUM20-VERSION [, 
+dnl            ACTION-IF-FOUND13 [, ACTION-IF-FOUND20 [, ACTION-IF-NOT-FOUND]]])
+dnl Test for Apache apxs, APR, and APU
+
+AC_DEFUN([CHECK_APACHE],
+[dnl
+AC_ARG_WITH(
+    apxs,
+    [AC_HELP_STRING([--with-apxs=PATH],[Path to apxs])],
+    apxs_prefix="$withval",
+    apxs_prefix="/usr"
+    )
+
+AC_ARG_ENABLE(
+        apachetest,
+        [AC_HELP_STRING([--disable-apxstest],[Do not try to compile and run apache version test program])],
+        ,
+        enable_apachetest=yes
+    )
+
+    if test -x $apxs_prefix -a ! -d $apxs_prefix; then
+        APXS_BIN=$apxs_prefix
+    else
+        test_paths="$apxs_prefix:$apxs_prefix/bin:$apxs_prefix/sbin"
+        test_paths="${test_paths}:/usr/bin:/usr/sbin"
+        test_paths="${test_paths}:/usr/local/bin:/usr/local/sbin:/usr/local/apache2/bin"
+        AC_PATH_PROG(APXS_BIN, apxs, no, [$test_paths])
+    fi
+    min_apache13_version=ifelse([$1], ,no,$1)
+    min_apache20_version=ifelse([$2], ,no,$2)
+    no_apxs=""
+    if test "$APXS_BIN" = "no"; then
+        AC_MSG_ERROR([*** The apxs binary installed by apache could not be found!])
+        AC_MSG_ERROR([*** Use the --with-apxs option with the full path to apxs])
+    else
+        AP_INCLUDES="-I`$APXS_BIN -q INCLUDEDIR 2>/dev/null`"
+        AP_INCLUDEDIR="`$APXS_BIN -q INCLUDEDIR 2>/dev/null`"
+
+        AP_PREFIX="`$APXS_BIN -q prefix 2>/dev/null`"
+
+        AP_BINDIR="`$APXS_BIN -q bindir 2>/dev/null`"
+        AP_SBINDIR="`$APXS_BIN -q sbindir 2>/dev/null`"
+        AP_SYSCONFDIR="`$APXS_BIN -q sysconfdir 2>/dev/null`"
+
+        APXS_CFLAGS=""
+        for flag in CFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS NOTEST_CFLAGS; do
+            APXS_CFLAGS="$APXS_CFLAGS `$APXS_BIN -q $flag 2>/dev/null`"
+        done
+
+        AP_CPPFLAGS="$APXS_CPPFLAGS $AP_INCLUDES"
+        AP_CFLAGS="$APXS_CFLAGS $AP_INCLUDES"
+
+        AP_LIBEXECDIR=`$APXS_BIN -q LIBEXECDIR 2>/dev/null`
+
+        if test "x$enable_apachetest" = "xyes" ; then
+            if test "$min_apache20_version" != "no"; then
+                APR_CONFIG="`$APXS_BIN -q APR_BINDIR 2>/dev/null`/apr-1-config"
+                if test ! -x $APR_CONFIG; then
+                    APR_CONFIG="`$APXS_BIN -q APR_BINDIR 2>/dev/null`/apr-config"
+                fi
+                APR_INCLUDES=`$APR_CONFIG --includes 2>/dev/null`
+                APR_LDFLAGS=`$APR_CONFIG --link-ld 2>/dev/null`
+                APR_LIBS=`$APR_CONFIG --libs 2>/dev/null`
+                APR_LIBTOOL=`$APR_CONFIG --link-libtool 2>/dev/null`
+                APR_CPPFLAGS=`$APR_CONFIG --cppflags 2>/dev/null`
+                APR_CFLAGS=`$APR_CONFIG --cflags 2>/dev/null`
+                APR_VERSION=`$APR_CONFIG --version 2>/dev/null`
+                APU_CONFIG="`$APXS_BIN -q APU_BINDIR 2>/dev/null`/apu-1-config"
+                if test ! -x $APU_CONFIG; then
+                    APU_CONFIG="`$APXS_BIN -q APU_BINDIR 2>/dev/null`/apu-config"
+                fi
+                APU_INCLUDES=`$APU_CONFIG --includes 2>/dev/null`
+                APU_LDFLAGS=`$APU_CONFIG --link-ld 2>/dev/null`
+                APU_LIBS=`$APU_CONFIG --libs 2>/dev/null`
+                APU_LIBTOOL=`$APU_CONFIG --link-libtool 2>/dev/null`
+                APU_VERSION=`$APU_CONFIG --version 2>/dev/null`
+
+                AC_MSG_CHECKING(for Apache 2.0 version >= $min_apache20_version)
+                TEST_APACHE_VERSION(20,$min_apache20_version,
+                    AC_MSG_RESULT(yes)
+                    AC_DEFINE(WITH_APACHE20,1,[Define to 1 if we are compiling with Apache 2.0.x])
+                    AP_VERSION="2.0"
+                    APXS_EXTENSION=.la
+                    if test -f `$APXS_BIN -q INCLUDEDIR`/mod_status.h; then
+                        AC_DEFINE(HAVE_MOD_STATUS_H,1,[Define to 1 if mod_status.h and the mod_Status hook are available])
+                    fi
+                    AP_CFLAGS="$AP_CFLAGS $APU_INCLUDES $APR_INCLUDES"
+                    AP_CPPFLAGS="$AP_CPPFLAGS $APU_INCLUDES $APR_INCLUDES"
+                    AP_DEFS="-DWITH_APACHE20"
+                    ifelse([$4], , , $4),
+                    AC_MSG_RESULT(no)
+                    if test "x$min_apache13_version" = "xno"; then
+                        ifelse([$5], , , $5)
+                    fi
+                )
+            fi
+            if test "$min_apache13_version" != "no" -a "x$AP_VERSION" = "x"; then
+                APR_INCLUDES=""
+                APR_VERSION=""
+                APR_LDFLAGS=""
+                APR_LIBS=""
+                APR_LIBTOOL=""
+                APR_CFLAGS=""
+                APR_CPPFLAGS=""
+                APU_INCLUDES=""
+                APU_VERSION=""
+                APU_LDFLAGS=""
+                APU_LIBS=""
+                APU_LIBTOOL=""
+                AC_MSG_CHECKING(for Apache 1.3 version >= $min_apache13_version)
+                TEST_APACHE_VERSION(13,$min_apache13_version,
+                    AC_MSG_RESULT(yes)
+                    AC_DEFINE(WITH_APACHE13,1,[Define to 1 if we are compiling with Apache 1.3.x])
+                    AP_VERSION="1.3"
+                    APXS_EXTENSION=.so
+                    AP_CFLAGS="-g $AP_CFLAGS"
+                    AP_DEFS="-DWITH_APACHE13"
+                    ifelse([$3], , , $3),
+                    AC_MSG_RESULT(no)
+                    ifelse([$5], , , $5)
+                )
+            fi
+        fi
+        AC_CHECK_DECL([DEFAULT_EXP_LIBEXECDIR],,[AC_DEFINE_UNQUOTED([DEFAULT_EXP_LIBEXECDIR],["$AP_LIBEXECDIR"],[Default Module LibExec directory])])
+        AC_SUBST(AP_DEFS)
+        AC_SUBST(AP_PREFIX)
+        AC_SUBST(AP_CFLAGS)
+        AC_SUBST(AP_CPPFLAGS)
+        AC_SUBST(AP_INCLUDES)
+        AC_SUBST(AP_INCLUDEDIR)
+        AC_SUBST(AP_LIBEXECDIR)
+        AC_SUBST(AP_VERSION)
+        AC_SUBST(AP_SYSCONFDIR)
+        AC_SUBST(AP_BINDIR)
+        AC_SUBST(AP_SBINDIR)
+        AC_SUBST(APR_INCLUDES)
+        AC_SUBST(APR_LDFLAGS)
+        AC_SUBST(APR_LIBS)
+        AC_SUBST(APR_LIBTOOL)
+        AC_SUBST(APR_CPPFLAGS)
+        AC_SUBST(APR_CFLAGS)
+        AC_SUBST(APU_INCLUDES)
+        AC_SUBST(APU_LDFLAGS)
+        AC_SUBST(APU_LIBS)
+        AC_SUBST(APU_LIBTOOL)
+        AC_SUBST(APXS_EXTENSION)
+        AC_SUBST(APXS_BIN)
+        AC_SUBST(APXS_CFLAGS)
+    fi
+])
diff --git a/m4/apache_test.m4 b/m4/apache_test.m4
new file mode 100644
index 0000000..8c91adf
--- /dev/null
+++ b/m4/apache_test.m4
@@ -0,0 +1,96 @@
+dnl TEST_APACHE_VERSION(RELEASE, [MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for Apache
+dnl
+AC_DEFUN([TEST_APACHE_VERSION],
+[dnl
+    AC_REQUIRE([AC_CANONICAL_TARGET])
+    releasetest=$1
+    min_apache_version="$2"
+    no_apache=""
+    ac_save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $AP_CFLAGS"
+    if test $releasetest -eq 20; then
+        CFLAGS="$CFLAGS $APU_INCLUDES $APR_INCLUDES"
+    fi
+    AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "httpd.h"
+
+#ifndef AP_SERVER_BASEREVISION
+    #define AP_SERVER_BASEREVISION SERVER_BASEREVISION
+#endif
+        
+char* my_strdup (char *str)
+{
+    char *new_str;
+
+    if (str) {
+        new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+        strcpy (new_str, str);
+    } else
+        new_str = NULL;
+
+    return new_str;
+}
+
+int main (int argc, char *argv[])
+{
+    int major1, minor1, micro1;
+    int major2, minor2, micro2;
+    char *tmp_version;
+
+    { FILE *fp = fopen("conf.apachetest", "a"); if ( fp ) fclose(fp); }
+
+    tmp_version = my_strdup("$min_apache_version");
+    if (sscanf(tmp_version, "%d.%d.%d", &major1, &minor1, &micro1) != 3) {
+        printf("%s, bad version string\n", "$min_apache_version");
+        exit(1);
+    }
+    tmp_version = my_strdup(AP_SERVER_BASEREVISION);
+    if (sscanf(tmp_version, "%d.%d.%d", &major2, &minor2, &micro2) != 3) {
+        printf("%s, bad version string\n", AP_SERVER_BASEREVISION);
+        exit(1);
+    }
+
+    if ( (major2 == major1) &&
+        ( (minor2 > minor1) ||
+        ((minor2 == minor1) && (micro2 >= micro1)) ) ) {
+        exit(0);
+    } else {
+        exit(1);
+    }
+}
+
+],, no_apache=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+    CFLAGS="$ac_save_CFLAGS"
+
+    if test "x$no_apache" = x ; then
+        ifelse([$3], , :, [$3])
+       else
+        if test -f conf.apachetest ; then
+            :
+        else
+            echo "*** Could not run Apache test program, checking why..."
+            CFLAGS="$CFLAGS $AP_CFLAGS"
+            if test $releasetest -eq 20; then
+                CFLAGS="$CFLAGS $APU_INCLUDES $APR_INCLUDES"
+            fi
+            AC_TRY_LINK([
+#include <stdio.h>
+#include "httpd.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef main
+#define main K_and_R_C_main
+],                [ return 0; ],
+                [ echo "*** The test program compiled, but failed to run. Check config.log" ],
+                [ echo "*** The test program failed to compile or link. Check config.log" ])
+            CFLAGS="$ac_save_CFLAGS"
+        fi
+         ifelse([$4], , :, [$4])
+      fi
+      rm -f conf.apachetest
+])
diff --git a/m4/apr_memcache.m4 b/m4/apr_memcache.m4
new file mode 100644
index 0000000..71ab2b6
--- /dev/null
+++ b/m4/apr_memcache.m4
@@ -0,0 +1,56 @@
+dnl Check for memcache client libraries
+dnl CHECK_APR_MEMCACHE(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
+dnl Sets:
+dnl  APR_MEMCACHE_LIBS
+AC_DEFUN([CHECK_APR_MEMCACHE],
+[dnl
+
+AC_ARG_WITH(
+    apr-memcache-prefix,
+    [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])],
+    apr_memcache_prefix="$withval",
+    apr_memcache_prefix="/usr",
+    :)
+AC_ARG_WITH(
+    apr-memcache-libs,
+    [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])],
+    apr_memcache_libs="$withval",
+    apr_memcache_libs="$apr_memcache_prefix/lib"
+    :)
+AC_ARG_WITH(
+    apr-memcache-includes,
+    [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])],
+    apr_memcache_includes="$withval",
+    apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0"
+    :)
+
+
+AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+dnl # Determine memcache lib directory
+save_CFLAGS=$CFLAGS
+save_LDFLAGS=$LDFLAGS
+CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS"
+LDFLAGS="-L$apr_memcache_libs $LDFLAGS"
+AC_CHECK_LIB(
+    apr_memcache,
+    apr_memcache_create,
+    [
+        APR_MEMCACHE_LIBS="-R$apr_memcache_libs -L$apr_memcache_libs -lapr_memcache"
+        APR_MEMCACHE_CFLAGS="-I$apr_memcache_includes"
+    ]
+)
+CFLAGS=$save_CFLAGS
+LDFLAGS=$save_LDFLAGS
+
+AC_SUBST(APR_MEMCACHE_LIBS)
+AC_SUBST(APR_MEMCACHE_CFLAGS)
+
+if test -z "${APR_MEMCACHE_LIBS}"; then
+  AC_MSG_NOTICE([*** memcache library not found.])
+  ifelse([$2], , AC_MSG_ERROR([memcache library is required]), $2)
+else
+  AC_MSG_NOTICE([using '${APR_MEMCACHE_LIBS}' for memcache])
+  ifelse([$1], , , $1) 
+fi 
+])
diff --git a/m4/apreq.m4 b/m4/apreq.m4
new file mode 100644
index 0000000..b457e02
--- /dev/null
+++ b/m4/apreq.m4
@@ -0,0 +1,43 @@
+dnl Check for apreq2 libraries
+dnl CHECK_APREQ2(MINIMUM-VERSION, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
+AC_DEFUN([CHECK_APREQ2],
+[dnl
+
+AC_ARG_WITH(
+    apreq2,
+    [AC_HELP_STRING([--with-apreq2=PATH],[Path to your apreq2-config])],
+    ap_path="$withval",
+    ap_path="/usr"
+    )
+
+    if test -x $ap_path -a ! -d $ap_path; then
+        AP_BIN=$ap_path
+    else
+        test_paths="$ap_path:$ap_path/bin:$ap_path/sbin"
+
+        dnl Search the Apache Binary Directories too. Since we should set these in apache.m4
+        if test -d $AP_BINDIR; then
+            test_paths="${test_paths}:${AP_BINDIR}"
+        fi
+        if test -d $AP_SBINDIR; then
+            test_paths="${test_paths}:${AP_SBINDIR}"
+        fi
+
+        test_paths="${test_paths}:/usr/bin:/usr/sbin"
+        test_paths="${test_paths}:/usr/local/bin:/usr/local/sbin"
+        AC_PATH_PROG(AP_BIN, apreq2-config, no, [$test_paths])
+    fi
+
+    if test "$AP_BIN" = "no"; then
+        AC_MSG_ERROR([*** The apreq2-config  binary installed by apreq2 could not be found!])
+        AC_MSG_ERROR([*** Use the --with-apreq2 option with the full path to apreq2-config])
+        ifelse([$3], , AC_MSG_ERROR([apreq2 >=$1 is not installed.]), $3)
+    else
+        dnl TODO: Do a apreq2-config  Version check here...
+        APREQ_LIBS="`$AP_BIN --link-ld --ldflags --libs  2>/dev/null`"
+        APREQ_CFLAGS="`$AP_BIN  --includes   2>/dev/null`"
+        AC_SUBST(APREQ_LIBS)
+        AC_SUBST(APREQ_CFLAGS)
+        ifelse([$2], , AC_MSG_RESULT([yes]), $2)
+    fi
+])
diff --git a/m4/buildconf.py b/m4/buildconf.py
new file mode 100755
index 0000000..9ba621f
--- /dev/null
+++ b/m4/buildconf.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+#
+#  buildconf.py: Runs Autotools on a project.
+#
+#  Copyright 2004 Edward Rudd and Paul Querna
+#
+#  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.
+#
+
+import os
+import sys
+import popen2
+from optparse import OptionParser
+
+cmd = {}
+
+def run_cmd(command, args=""):
+        global cmd
+        rp = popen2.Popen4("%s %s" % (cmd[command], args))
+        sout = rp.fromchild.readlines()
+        for line in sout:
+                sys.stdout.write(line)
+        rv = rp.wait()
+        if rv != 0:
+                print "Error: '%s %s' returned %d" % (cmd[command], args, rv)
+                sys.exit(-1)
+
+def select_cmd(command, list, args = "--version"):
+        global cmd
+        cmd[command] = None
+        for x in list:
+                # rv = os.spawnlp(os.P_WAIT, x, args)
+                rp = popen2.Popen4("%s %s" % (x, args))
+                rv = rp.wait()
+                if rv == 0:
+                        cmd[command] = x
+                        break
+        if cmd[command] == None:
+                print "Errpr: Could not find suitable version for '%s', tried running: %s" % (command, list)
+                sys.exit(-1)            
+
+parser = OptionParser()
+
+parser.add_option("--libtoolize", action="store_true", dest="libtoolize", default=False)
+parser.add_option("--aclocal", action="store_true", dest="aclocal", default=False)
+parser.add_option("--automake", action="store_true", dest="automake", default=False)
+parser.add_option("--autoconf", action="store_true", dest="autoconf", default=False)
+parser.add_option("--autoheader", action="store_true", dest="autoheader", default=False)
+
+(options, args) = parser.parse_args()
+
+if options.libtoolize:
+        select_cmd("libtoolize", ['libtoolize14','glibtoolize','libtoolize']) 
+if options.aclocal:
+        select_cmd("aclocal", ['aclocal-1.9','aclocal-1.8','aclocal-1.7','aclocal-1.6','aclocal']) 
+if options.autoheader:
+        select_cmd("autoheader", ['autoheader259','autoheader257','autoheader']) 
+if options.automake:
+        select_cmd("automake", ['automake-1.9','automake-1.8','automake-1.7','automake-1.6','automake']) 
+if options.autoconf:
+        select_cmd("autoconf", ['autoconf259','autoconf257','autoconf']) 
+
+if options.libtoolize:
+        run_cmd("libtoolize", "--force --copy") 
+if options.aclocal:
+        run_cmd("aclocal", "-I m4") 
+if options.autoheader:
+        run_cmd("autoheader") 
+if options.automake:
+        run_cmd("automake", "--add-missing --copy --foreign") 
+if options.autoconf:
+        run_cmd("autoconf") 
+
diff --git a/m4/find_apr.m4 b/m4/find_apr.m4
new file mode 100644
index 0000000..9228c76
--- /dev/null
+++ b/m4/find_apr.m4
@@ -0,0 +1,166 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Copyright 2000-2005 The Apache Software Foundation
+dnl
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl find_apr.m4 : locate the APR include files and libraries
+dnl
+dnl This macro file can be used by applications to find and use the APR
+dnl library. It provides a standardized mechanism for using APR. It supports
+dnl embedding APR into the application source, or locating an installed
+dnl copy of APR.
+dnl
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl
+dnl   where srcdir is the location of the bundled APR source directory, or
+dnl   empty if source is not bundled.
+dnl
+dnl   where builddir is the location where the bundled APR will will be built,
+dnl   or empty if the build will occur in the srcdir.
+dnl
+dnl   where implicit-install-check set to 1 indicates if there is no
+dnl   --with-apr option specified, we will look for installed copies.
+dnl
+dnl   where acceptable-majors is a space separated list of acceptable major
+dnl   version numbers. Often only a single major version will be acceptable.
+dnl   If multiple versions are specified, and --with-apr=PREFIX or the
+dnl   implicit installed search are used, then the first (leftmost) version
+dnl   in the list that is found will be used.  Currently defaults to [0 1].
+dnl
+dnl Sets the following variables on exit:
+dnl
+dnl   apr_found : "yes", "no", "reconfig"
+dnl
+dnl   apr_config : If the apr-config tool exists, this refers to it. If
+dnl                apr_found is "reconfig", then the bundled directory
+dnl                should be reconfigured *before* using apr_config.
+dnl
+dnl Note: this macro file assumes that apr-config has been installed; it
+dnl       is normally considered a required part of an APR installation.
+dnl
+dnl If a bundled source directory is available and needs to be (re)configured,
+dnl then apr_found is set to "reconfig". The caller should reconfigure the
+dnl (passed-in) source directory, placing the result in the build directory,
+dnl as appropriate.
+dnl
+dnl If apr_found is "yes" or "reconfig", then the caller should use the
+dnl value of apr_config to fetch any necessary build/link information.
+dnl
+
+AC_DEFUN([APR_FIND_APR], [
+  apr_found="no"
+
+  if test "$ac_cv_emxos2" = "yes"; then
+    # Scripts don't pass test -x on OS/2
+    TEST_X="test -f"
+  else
+    TEST_X="test -x"
+  fi
+
+  ifelse([$4], [], [
+         ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x]))
+         acceptable_majors="0 1"],
+         [acceptable_majors="$4"])
+
+  apr_temp_acceptable_apr_config=""
+  for apr_temp_major in $acceptable_majors
+  do
+    case $apr_temp_major in
+      0)
+      apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config"
+      ;;
+      *)
+      apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config"
+      ;;
+    esac
+  done
+
+  AC_MSG_CHECKING(for APR)
+  AC_ARG_WITH(apr,
+  [  --with-apr=PATH         prefix for installed APR, path to APR build tree,
+                          or the full path to apr-config],
+  [
+    if test "$withval" = "no" || test "$withval" = "yes"; then
+      AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
+    fi
+
+    for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+    do
+      for lookdir in "$withval/bin" "$withval"
+      do
+        if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
+          apr_found="yes"
+          apr_config="$lookdir/$apr_temp_apr_config_file"
+          break 2
+        fi
+      done
+    done
+
+    if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
+      apr_found="yes"
+      apr_config="$withval"
+    fi
+
+    dnl if --with-apr is used, it is a fatal error for its argument
+    dnl to be invalid
+    if test "$apr_found" != "yes"; then
+      AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.])
+    fi
+  ],[
+    dnl If we allow installed copies, check those before using bundled copy.
+    if test -n "$3" && test "$3" = "1"; then
+      for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+      do
+        if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
+          apr_found="yes"
+          apr_config="$apr_temp_apr_config_file"
+          break
+        else
+          dnl look in some standard places
+          for lookdir in /usr /usr/local /usr/local/apr /opt/apr /usr/local/apache2; do
+            if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
+              apr_found="yes"
+              apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+              break 2
+            fi
+          done
+        fi
+      done
+    fi
+    dnl if we have not found anything yet and have bundled source, use that
+    if test "$apr_found" = "no" && test -d "$1"; then
+      apr_temp_abs_srcdir="`cd $1 && pwd`"
+      apr_found="reconfig"
+      apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`"
+      case $apr_bundled_major in
+        "")
+          AC_MSG_ERROR([failed to find major version of bundled APR])
+        ;;
+        0)
+          apr_temp_apr_config_file="apr-config"
+        ;;
+        *)
+          apr_temp_apr_config_file="apr-$apr_bundled_major-config"
+        ;;
+      esac
+      if test -n "$2"; then
+        apr_config="$2/$apr_temp_apr_config_file"
+      else
+        apr_config="$1/$apr_temp_apr_config_file"
+      fi
+    fi
+  ])
+
+  AC_MSG_RESULT($apr_found)
+])
diff --git a/libgnutls.m4 b/m4/libgnutls.m4
index dd86431..960bb2a 100644
--- a/libgnutls.m4
+++ b/m4/libgnutls.m4
@@ -156,13 +156,13 @@ main ()
   rm -f conf.libgnutlstest
   AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
   AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
-  
+
   LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS
   LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS
   LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`
   LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`"
   GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
-  
+
   AC_SUBST(LIBGNUTLS_CFLAGS)
   AC_SUBST(LIBGNUTLS_LIBS)
   AC_SUBST(LIBGNUTLS_VERSION)
diff --git a/m4/libmemcache.m4 b/m4/libmemcache.m4
new file mode 100644
index 0000000..95e630b
--- /dev/null
+++ b/m4/libmemcache.m4
@@ -0,0 +1,46 @@
+dnl Check for memcache client libraries
+dnl CHECK_MEMCACHE(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
+AC_DEFUN([CHECK_MEMCACHE],
+[dnl
+
+AC_ARG_WITH(
+    memcache,
+    [AC_HELP_STRING([--with-memcache=PATH],[Path memcache libraries])],
+    mc_path="$withval",
+    :)
+
+dnl # Determine memcache lib directory
+if test -z $mc_path; then
+    test_paths="/usr/lib /usr/local/lib"
+else
+    test_paths="${mc_path}/lib"
+fi
+
+for x in $test_paths ; do
+    AC_MSG_CHECKING([for memcache library in ${x}])
+    if test -f ${x}/libmemcache.so.1.0; then
+        AC_MSG_RESULT([yes])
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS"
+        LDFLAGS="-L$x $LDFLAGS"
+        AC_CHECK_LIB(memcache, mc_server_add,
+            LIBMEMCACHE_LIBS="-L$x -lmemcache")
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        break
+    else
+        AC_MSG_RESULT([no])
+    fi
+done
+
+AC_SUBST(LIBMEMCACHE_LIBS)
+
+if test -z "${LIBMEMCACHE_LIBS}"; then
+  AC_MSG_NOTICE([*** memcache library not found.])
+  ifelse([$2], , AC_MSG_ERROR([memcache library is required]), $2)
+else
+  AC_MSG_NOTICE([using '${LIBMEMCACHE_LIBS}' for memcache])
+  ifelse([$1], , , $1) 
+fi 
+])
diff --git a/m4/librsvg.m4 b/m4/librsvg.m4
new file mode 100644
index 0000000..c8d2bf0
--- /dev/null
+++ b/m4/librsvg.m4
@@ -0,0 +1,29 @@
+dnl Check for librsvg libraries
+dnl CHECK_RSVG(MINIMUM-VERSION, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
+AC_DEFUN([CHECK_RSVG],
+[dnl
+
+pname=librsvg-2.0
+
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+if test x$PKG_CONFIG = xno ; then
+  ifelse([$3], , AC_MSG_ERROR([pkg-config not found. pkg-config is required for librsvg]), $3)
+fi
+
+AC_MSG_CHECKING(for librsvg - version >= $1)
+
+if $PKG_CONFIG --atleast-version=$1 $pname; then
+  RSVG_LDFLAGS=`$PKG_CONFIG $pname --libs-only-L`
+  RSVG_LIBS=`$PKG_CONFIG $pname --libs-only-l --libs-only-other`
+  RSVG_CFLAGS=`$PKG_CONFIG $pname --cflags`
+  RSVG_VERSION=`$PKG_CONFIG $pname --modversion`
+  AC_SUBST(RSVG_LDFLAGS)
+  AC_SUBST(RSVG_LIBS)
+  AC_SUBST(RSVG_CFLAGS)
+  AC_SUBST(RSVG_VERSION)
+  ifelse([$2], , AC_MSG_RESULT([yes]), $2)
+else
+  ifelse([$3], , AC_MSG_ERROR([librsvg >=$1 is not installed.]), $3)
+fi
+])
diff --git a/m4/lua.m4 b/m4/lua.m4
new file mode 100644
index 0000000..beae980
--- /dev/null
+++ b/m4/lua.m4
@@ -0,0 +1,71 @@
+dnl Check for Lua 5.0 Libraries
+dnl CHECK_LUA(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
+dnl Sets:
+dnl  LUA_CFLAGS
+dnl  LUA_LIBS
+AC_DEFUN([CHECK_LUA],
+[dnl
+
+AC_ARG_WITH(
+    lua,
+    [AC_HELP_STRING([--with-lua=PATH],[Path to the Lua 5.0 prefix])],
+    lua_path="$withval",
+    :)
+
+dnl # Determine memcache lib directory
+if test -z $mc_path; then
+    test_paths="/usr/local /usr"
+else
+    test_paths="${lua_path}"
+fi
+
+for x in $test_paths ; do
+    AC_MSG_CHECKING([for lua.h in ${x}/include/lua50])
+    if test -f ${x}/include/lua50/lua.h; then
+        AC_MSG_RESULT([yes])
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS"
+        LDFLAGS="-L$x/lib $LDFLAGS"
+        AC_CHECK_LIB(lua50, lua_open,
+            [
+            LUA_LIBS="-L$x/lib -llua50 -llualib50"
+            LUA_CFLAGS="-I$x/include/lua50"
+            ])
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        break
+    else
+        AC_MSG_RESULT([no])
+    fi
+    AC_MSG_CHECKING([for lua.h in ${x}/include])
+    if test -f ${x}/include/lua.h; then
+        AC_MSG_RESULT([yes])
+        save_CFLAGS=$CFLAGS
+        save_LDFLAGS=$LDFLAGS
+        CFLAGS="$CFLAGS"
+        LDFLAGS="-L$x/lib $LDFLAGS"
+        AC_CHECK_LIB(lua, lua_open,
+            [
+            LUA_LIBS="-L$x/lib -llua -llualib"
+            LUA_CFLAGS="-I$x/include/lua50"
+            ])
+        CFLAGS=$save_CFLAGS
+        LDFLAGS=$save_LDFLAGS
+        break
+    else
+        AC_MSG_RESULT([no])
+    fi
+done
+
+AC_SUBST(LUA_LIBS)
+AC_SUBST(LUA_CFLAGS)
+
+if test -z "${LUA_LIBS}"; then
+  AC_MSG_NOTICE([*** Lua 5.0 library not found.])
+  ifelse([$2], , AC_MSG_ERROR([Lua 5.0 library is required]), $2)
+else
+  AC_MSG_NOTICE([using '${LUA_LIBS}' for Lua Library])
+  ifelse([$1], , , $1) 
+fi 
+])
diff --git a/m4/mod_ftpd_providers.m4 b/m4/mod_ftpd_providers.m4
new file mode 100644
index 0000000..e018666
--- /dev/null
+++ b/m4/mod_ftpd_providers.m4
@@ -0,0 +1,96 @@
+dnl This file is Copyright 2003,2004 Edward Rudd
+dnl Usage, modification, and distribution of this file in other projects is
+dnl allowed and encouraged so long as this copyright notice is retained.
+dnl You are encouraged to send any patches to the me at 
+dnl urkle <at> outoforder <dot> cc, but this is not a requirement
+
+dnl
+dnl MOD_FTPD_OUTPUT(file)
+dnl adds "file" to the list of files generated by AC_OUPUT
+AC_DEFUN([MOD_FTP_OUTPUT], [
+    MOD_FTPD_OUTPUT_FILES="$MOD_FTPD_OUTPUT_FILES $1"
+])dnl
+
+dnl
+dnl MOD_FTPD_PROVIDER(name, helptext[, default[, config]]]])
+dnl default is one of:
+dnl   yes    -- enabled by default. user must explicitly disable.
+dnl   no     -- disabled under default, most, all. user must explicitly enable.
+dnl   most   -- disabled by default. enabled explicitly or with most or all.
+dnl   ""     -- disabled under default, most. enabled explicitly or with all.
+dnl
+dnl basically: yes/no is a hard setting. "most" means follow the "most"
+dnl            setting. otherwise, fall under the "all" setting.
+dnl            explicit yes/no always overrides.
+dnl
+AC_DEFUN([MOD_FTPD_PROVIDER],[
+    AC_MSG_CHECKING(whether to enable mod_ftpd_$1)
+    define([optname],[--]ifelse($3,yes,disable,enable)[-]translit($1,_,-))dnl
+    AC_ARG_ENABLE(translit($1,_,-),AC_HELP_STRING(optname(),$2),,enable_$1=ifelse($3,,maybe-all,$3))
+    undefine([optname])dnl
+    _apmod_extra_msg=""
+
+    if test "$provider_selection" = "most" -a "$enable_$1" = "most"; then
+    _apmod_error_fatal=no
+    else
+    _apmod_error_fatal=yes
+    fi
+
+    if test "$enable_$1" = "yes"; then
+        _apmod_extra_msg=" ($provider_selection)"
+    elif test "$enable_$1" = "most"; then
+    if test "$provider_selection" = "most" -o "$provider_selection" = "all"; then
+        enable_$1=yes
+        _apmod_extra_msg=" ($provider_selection)"
+    elif test "$enable_$1" != "yes"; then
+        enable_$1=no
+    fi
+    elif test "$enable_$1" = "maybe-all"; then
+    if test "$provider_selection" = "all"; then
+        enable_$1=yes
+        _apmod_extra_msg=" (all)"
+    else
+        enable_$1=no
+    fi
+    fi
+    if test "$enable_$1" != "no"; then
+    ifelse([$4],,:,[AC_MSG_RESULT([checking dependencies])
+            $4
+            AC_MSG_CHECKING(whether to enable mod_$1)
+            if test "$enable_$1" = "no"; then
+                if test "$_apmod_error_fatal" = "no"; then
+                _apmod_extra_msg=" (disabled)"
+                else
+                AC_MSG_ERROR([mod_ftpd_$1 has been requested by can not be build due to prerequisite failure])
+                fi
+            fi])
+    fi
+    AC_MSG_RESULT($enable_$1$_apmod_extra_msg)
+    if test "$enable_$1" != "no"; then
+    PROVIDER_LIST="$PROVIDER_LIST $provider_dir/$1"
+    fi
+])dnl
+
+dnl
+dnl MOD_FTPD_INCLUDE_PROVIDERS(directory)
+dnl searches directory for mod_ftpd provider config.m4 files
+dnl
+AC_DEFUN([MOD_FTPD_INCLUDE_PROVIDERS],[
+    AC_ARG_ENABLE(providers,
+    AC_HELP_STRING([--enable-providers=PROVIDER-LIST],[Providers to enable]),[
+    for i in $enableval; do
+        if test "$i" = "all" -o "$i" = "most"; then
+        provider_selection=$i
+        else
+        eval "enable_$i=yes"
+        fi
+    done
+        ],
+    provider_selection=most
+    )
+
+    provider_dir=$1
+    esyscmd(./config-stubs $provider_dir)
+
+    AC_CONFIG_SUBDIRS($PROVIDER_LIST)
+])dnl
diff --git a/m4/outoforder.m4 b/m4/outoforder.m4
new file mode 100644
index 0000000..7add221
--- /dev/null
+++ b/m4/outoforder.m4
@@ -0,0 +1,36 @@
+dnl m4 for utility macros used by all out of order projects
+
+dnl this writes a "config.nice" file which reinvokes ./configure with all
+dnl of the arguments. this is different from config.status which simply
+dnl regenerates the output files. config.nice is useful after you rebuild
+dnl ./configure (via autoconf or autogen.sh)
+AC_DEFUN([OOO_CONFIG_NICE],[
+  echo configure: creating $1
+  rm -f $1
+  cat >$1<<EOF
+#! /bin/sh
+#
+# Created by configure
+
+EOF
+
+  for arg in [$]0 "[$]@"; do
+    if test "[$]arg" != "--no-create" -a "[$]arg" != "--no-recursion"; then
+        echo "\"[$]arg\" \\" >> $1
+    fi
+  done
+  echo '"[$]@"' >> $1
+  chmod +x $1
+])
+
+dnl this macro adds a maintainer mode option to enable programmer specific
+dnl  code in makefiles
+AC_DEFUN([OOO_MAINTAIN_MODE],[
+  AC_ARG_ENABLE(
+        maintainer,
+        [AC_HELP_STRING([--enable-maintainer],[Enable maintainer mode for this project])],
+        AC_MSG_RESULT([Enabling Maintainer Mode!!])
+        OOO_MAINTAIN=1,
+        OOO_MAINTAIN=0)
+  AC_SUBST(OOO_MAINTAIN)
+])