diff --git a/bootstrap.sh b/bootstrap.sh
index 9cfdfad648..ae66c38ceb 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+##### -*- mode:shell-script; indent-tabs-mode:nil; sh-basic-offset:2 -*-
+##### bootstrap FreeSWITCH and FreeSWITCH libraries
+
 echo "bootstrap: checking installation..."
 
 BGJOB=false
@@ -12,291 +15,313 @@ while getopts 'jhd:' o; do
     j) BGJOB=true;;
     d) SUBDIRS="$OPTARG";;
     h) echo "Usage: $0 <options>"
-       echo "  Options:"
-       echo "           -d 'library1 library2'"
-       echo "             => Override directories to bootstrap"
-       echo "           -j => Run Jobs in Background"
-       exit;;
+      echo "  Options:"
+      echo "           -d 'library1 library2'"
+      echo "             => Override directories to bootstrap"
+      echo "           -j => Run Jobs in Background"
+      exit;;
   esac
 done
 
-if [ ! -f modules.conf ]; then 
+setup_modules() {
+  if [ ! -f modules.conf ]; then 
     cp build/modules.conf.in modules.conf
-fi
+  fi
+}
 
-# keep automake from making us magically GPL, and to stop complaining about missing files.
-cp -f docs/COPYING .
-cp -f docs/AUTHORS .
-cp -f docs/ChangeLog .
-touch NEWS
-touch README
+setup_gnu() {
+  # keep automake from making us magically GPL, and to stop
+  # complaining about missing files.
+  cp -f docs/COPYING .
+  cp -f docs/AUTHORS .
+  cp -f docs/ChangeLog .
+  touch NEWS
+  touch README
+}
 
-# autoconf 2.59 or newer
-ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
-if test -z "$ac_version"; then
-echo "bootstrap: autoconf not found."
-echo "           You need autoconf version 2.59 or newer installed"
-echo "           to build FreeSWITCH from source."
-exit 1
-fi
+check_ac_ver() {
+  # autoconf 2.59 or newer
+  ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
+  if test -z "$ac_version"; then
+    echo "bootstrap: autoconf not found."
+    echo "           You need autoconf version 2.59 or newer installed"
+    echo "           to build FreeSWITCH from source."
+    exit 1
+  fi
+  if test `uname -s` = "OpenBSD" && test "$ac_version" = "2.62"; then
+    echo "Autoconf 2.62 is broken on OpenBSD, please try another version"
+    exit 1
+  fi
+  IFS=_; set $ac_version; IFS=' '
+  ac_version=$1
+  IFS=.; set $ac_version; IFS=' '
+  if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then
+    echo "bootstrap: autoconf version $ac_version found."
+    echo "           You need autoconf version 2.59 or newer installed"
+    echo "           to build FreeSWITCH from source."
+    exit 1
+  else
+    echo "bootstrap: autoconf version $ac_version (ok)"
+  fi
+}
 
-if test `uname -s` = "OpenBSD" && test "$ac_version" = "2.62"; then
-echo "Autoconf 2.62 is broken on OpenBSD, please try another version"
-exit 1
-fi
+check_am_ver() {
+  # automake 1.7 or newer
+  am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
+  if test -z "$am_version"; then
+    echo "bootstrap: automake not found."
+    echo "           You need automake version 1.7 or newer installed"
+    echo "           to build FreeSWITCH from source."
+    exit 1
+  fi
+  IFS=_; set $am_version; IFS=' '
+  am_version=$1
+  IFS=.; set $am_version; IFS=' '
+  if test "$1" = "1" -a "$2" -lt "7"; then
+    echo "bootstrap: automake version $am_version found."
+    echo "           You need automake version 1.7 or newer installed"
+    echo "           to build FreeSWITCH from source."
+    exit 1
+  else
+    echo "bootstrap: automake version $am_version (ok)"
+  fi
+}
 
-IFS=_; set $ac_version; IFS=' '
-ac_version=$1
-IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then
-echo "bootstrap: autoconf version $ac_version found."
-echo "           You need autoconf version 2.59 or newer installed"
-echo "           to build FreeSWITCH from source."
-exit 1
-else
-echo "bootstrap: autoconf version $ac_version (ok)"
-fi
+check_acl_ver() {
+  # aclocal 1.7 or newer
+  acl_version=`${ACLOCAL:-aclocal} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
+  if test -z "$acl_version"; then
+    echo "bootstrap: aclocal not found."
+    echo "           You need aclocal version 1.7 or newer installed"
+    echo "           to build FreeSWITCH from source."
+    exit 1
+  fi
+  IFS=_; set $acl_version; IFS=' '
+  acl_version=$1
+  IFS=.; set $acl_version; IFS=' '
+  if test "$1" = "1" -a "$2" -lt "7"; then
+    echo "bootstrap: aclocal version $acl_version found."
+    echo "           You need aclocal version 1.7 or newer installed"
+    echo "           to build FreeSWITCH from source."
+    exit 1
+  else
+    echo "bootstrap: aclocal version $acl_version (ok)"
+  fi
+}
 
+check_lt_ver() {
+  # Sample libtool --version outputs:
+  # ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
+  # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
+  # output is multiline from 1.5 onwards
 
-# automake 1.7 or newer
+  # Require libtool 1.4 or newer
+  libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool22 libtool15 libtool14`}
+  lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+  if test -z "$lt_pversion"; then
+    echo "bootstrap: libtool not found."
+    echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from source."
+    exit 1
+  fi
+  lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+  IFS=.; set $lt_version; IFS=' '
+  lt_status="good"
 
-am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
-if test -z "$am_version"; then
-echo "bootstrap: automake not found."
-echo "           You need automake version 1.7 or newer installed"
-echo "           to build FreeSWITCH from source."
-exit 1
-fi
-IFS=_; set $am_version; IFS=' '
-am_version=$1
-IFS=.; set $am_version; IFS=' '
-if test "$1" = "1" -a "$2" -lt "7"; then
-echo "bootstrap: automake version $am_version found."
-echo "           You need automake version 1.7 or newer installed"
-echo "           to build FreeSWITCH from source."
-exit 1
-else
-echo "bootstrap: automake version $am_version (ok)"
-fi
+  if test -z "$1"; then a=0 ; else a=$1;fi
+  if test -z "$2"; then b=0 ; else b=$2;fi
+  if test -z "$3"; then c=0 ; else c=$3;fi
+  lt_major=$a
 
-# aclocal 1.7 or newer
-
-acl_version=`${ACLOCAL:-aclocal} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
-if test -z "$acl_version"; then
-echo "bootstrap: aclocal not found."
-echo "           You need aclocal version 1.7 or newer installed"
-echo "           to build FreeSWITCH from source."
-exit 1
-fi
-IFS=_; set $acl_version; IFS=' '
-acl_version=$1
-IFS=.; set $acl_version; IFS=' '
-if test "$1" = "1" -a "$2" -lt "7"; then
-echo "bootstrap: aclocal version $acl_version found."
-echo "           You need aclocal version 1.7 or newer installed"
-echo "           to build FreeSWITCH from source."
-exit 1
-else
-echo "bootstrap: aclocal version $acl_version (ok)"
-fi
-
-# Sample libtool --version outputs:
-# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
-# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
-# output is multiline from 1.5 onwards
-
-# Require libtool 1.4 or newer
-libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool22 libtool15 libtool14`}
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-if test -z "$lt_pversion"; then
-   echo "bootstrap: libtool not found."
-   echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from source."
-   exit 1
-fi
-lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-IFS=.; set $lt_version; IFS=' '
-lt_status="good"
-
-if test -z "$1"; then a=0 ; else a=$1;fi
-if test -z "$2"; then b=0 ; else b=$2;fi
-if test -z "$3"; then c=0 ; else c=$3;fi
-lt_major=$a
-
-if test "$a" -eq "2"; then
-   lt_status="good"
-elif test "$a" -lt "2"; then
-   if test "$b" -lt "5" -o "$b" =  "5" -a "$c" -lt "14" ; then
+  if test "$a" -eq "2"; then
+    lt_status="good"
+  elif test "$a" -lt "2"; then
+    if test "$b" -lt "5" -o "$b" =  "5" -a "$c" -lt "14" ; then
       lt_status="bad"
-   fi
-else
+    fi
+  else
     lt_status="bad"
-fi
-if test $lt_status = "good"; then
-   echo "bootstrap: libtool version $lt_pversion (ok)"
-else
-   echo "bootstrap: libtool version $lt_pversion found."
-   echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from source."
-   exit 1
-fi
+  fi
+  if test $lt_status = "good"; then
+    echo "bootstrap: libtool version $lt_pversion (ok)"
+  else
+    echo "bootstrap: libtool version $lt_pversion found."
+    echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from source."
+    exit 1
+  fi
+}
 
-# check libtoolize availability
-if [ -n "${LIBTOOL}" ]; then
+check_libtoolize() {
+  # check libtoolize availability
+  if [ -n "${LIBTOOL}" ]; then
     libtoolize=${LIBTOOLIZE:-`dirname "${libtool}"`/libtoolize}
-else
+  else
     libtoolize=${LIBTOOLIZE:-`${LIBDIR}/apr/build/PrintPath glibtoolize libtoolize libtoolize22 libtoolize15 libtoolize14`}
-fi
-if [ "x$libtoolize" = "x" ]; then
+  fi
+  if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1
-fi
-if [ ! -x "$libtoolize" ]; then
+  fi
+  if [ ! -x "$libtoolize" ]; then
     echo "$libtoolize does not exist or is not executable"
     exit 1
-fi
-
-# compare libtool and libtoolize version
-ltl_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-ltl_version=`echo $ltl_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-IFS=.; set $ltl_version; IFS=' '
-
-if [ "x${lt_version}" != "x${ltl_version}" ]; then
-    echo "$libtool and $libtoolize have different versions"
-    exit 1
-fi
-
-
-#
-# Info output
-#
-echo "Bootstrapping using:"
-echo "  autoconf  : ${AUTOCONF:-`which autoconf`}"
-echo "  automake  : ${AUTOMAKE:-`which automake`}"
-echo "  aclocal   : ${ACLOCAL:-`which aclocal`}"
-echo "  libtool   : ${libtool} (${lt_version})"
-echo "  libtoolize: ${libtoolize}"
-echo
-
-echo "Entering directory ${LIBDIR}/apr"
-cd ${LIBDIR}/apr
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-#
-
-# bootstrap: Build the support scripts needed to compile from a
-#            checked-out version of the source code.
-
-# Create the libtool helper files
-#
-# Note: we copy (rather than link) them to simplify distribution.
-# Note: APR supplies its own config.guess and config.sub -- we do not
-#       rely on libtool's versions
-#
-echo "Copying libtool helper files ..."
-
-# Remove any libtool files so one can switch between libtool 1.3
-# and libtool 1.4 by simply rerunning the bootstrap script.
-(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
-
-if ${libtoolize} -n --install >/dev/null 2>&1 ; then
-  $libtoolize --force --copy --install
-else
-  $libtoolize --force --copy
-fi
-
-if [ -f libtool.m4 ]; then 
-   ltfile=`pwd`/libtool.m4
-else
-   if [ $lt_major -eq 2 ]; then
-       ltfindcmd="`sed -n \"/aclocaldir=/{s/.*=/echo /p;q;}\" < $libtoolize`"
-       ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`/libtool.m4}
-   else
-       ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
-                     < $libtoolize`"
-       ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
-   fi
-   # Expecting the code above to be very portable, but just in case...
-   if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
-     ltpath=`dirname $libtoolize`
-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
-   fi
-fi
-
-if [ ! -f $ltfile ]; then
-    echo "$ltfile not found"
-    exit 1
-fi
-
-echo "bootstrap: Using libtool.m4 at ${ltfile}."
-
-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-
-# libtool.m4 from 1.6 requires ltsugar.m4
-if [ -f ltsugar.m4 ]; then
-   rm -f build/ltsugar.m4
-   mv ltsugar.m4 build/ltsugar.m4
-fi
-
-# Clean up any leftovers
-rm -f aclocal.m4 libtool.m4
-
-# fix for FreeBSD (at least):
-# libtool.m4 is in share/aclocal, while e.g. aclocal19 only looks in share/aclocal19
-# get aclocal's default directory and include the libtool.m4 directory via -I if
-# it's in a different location
-
-aclocal_dir="`${ACLOCAL:-aclocal} --print-ac-dir`"
-
-if [ -n "${aclocal_dir}" -a -n "${ltfile}" -a "`dirname ${ltfile}`" != "${aclocal_dir}" ] ; then
-  ACLOCAL_OPTS="-I `dirname ${ltfile}`"
-fi
-
-### run aclocal
-echo "Re-creating aclocal.m4 ..."
-${ACLOCAL:-aclocal} ${ACLOCAL_OPTS}
-
-### do some work to toss config.cache?
-echo "Creating configure ..."
-${AUTOCONF:-autoconf}
-
-#
-# Generate the autoconf header
-#
-echo "Creating include/arch/unix/apr_private.h.in ..."
-${AUTOHEADER:-autoheader}
-
-# Libs automake automation function
-libbootstrap()
-{
-  i=$1
-  if [ -d ${LIBDIR}/${i} ] ; then
-  echo "Entering directory ${LIBDIR}/${i}"
-  cd ${LIBDIR}/${i}
-  rm -f aclocal.m4
-  CFFILE=
-  if [ -f ${LIBDIR}/${i}/configure.in ] ; then
-      CFFILE="${LIBDIR}/${i}/configure.in"
-  else
-      if [ -f ${LIBDIR}/${i}/configure.ac ] ; then
-          CFFILE="${LIBDIR}/${i}/configure.ac"
-      fi
   fi
 
-  if [ ! -z ${CFFILE} ] ; then
+  # compare libtool and libtoolize version
+  ltl_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+  ltl_version=`echo $ltl_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+  IFS=.; set $ltl_version; IFS=' '
 
+  if [ "x${lt_version}" != "x${ltl_version}" ]; then
+    echo "$libtool and $libtoolize have different versions"
+    exit 1
+  fi
+}
+
+print_autotools_vers() {
+  #
+  # Info output
+  #
+  echo "Bootstrapping using:"
+  echo "  autoconf  : ${AUTOCONF:-`which autoconf`}"
+  echo "  automake  : ${AUTOMAKE:-`which automake`}"
+  echo "  aclocal   : ${ACLOCAL:-`which aclocal`}"
+  echo "  libtool   : ${libtool} (${lt_version})"
+  echo "  libtoolize: ${libtoolize}"
+  echo
+}
+
+bootstrap_apr() {
+  echo "Entering directory ${LIBDIR}/apr"
+  cd ${LIBDIR}/apr
+
+  # Licensed to the Apache Software Foundation (ASF) under one or more
+  # contributor license agreements.  See the NOTICE file distributed with
+  # this work for additional information regarding copyright ownership.
+  # The ASF licenses this file to You 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.
+  #
+  #
+
+  # bootstrap: Build the support scripts needed to compile from a
+  #            checked-out version of the source code.
+
+  # Create the libtool helper files
+  #
+  # Note: we copy (rather than link) them to simplify distribution.
+  # Note: APR supplies its own config.guess and config.sub -- we do not
+  #       rely on libtool's versions
+  #
+  echo "Copying libtool helper files ..."
+
+  # Remove any libtool files so one can switch between libtool 1.3
+  # and libtool 1.4 by simply rerunning the bootstrap script.
+  (cd build ; rm -f ltconfig ltmain.sh libtool.m4)
+
+  if ${libtoolize} -n --install >/dev/null 2>&1 ; then
+    $libtoolize --force --copy --install
+  else
+    $libtoolize --force --copy
+  fi
+
+  if [ -f libtool.m4 ]; then 
+    ltfile=`pwd`/libtool.m4
+  else
+    if [ $lt_major -eq 2 ]; then
+      ltfindcmd="`sed -n \"/aclocaldir=/{s/.*=/echo /p;q;}\" < $libtoolize`"
+      ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`/libtool.m4}
+    else
+      ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
+                     < $libtoolize`"
+      ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
+    fi
+     # Expecting the code above to be very portable, but just in case...
+    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
+      ltpath=`dirname $libtoolize`
+      ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+    fi
+  fi
+
+  if [ ! -f $ltfile ]; then
+    echo "$ltfile not found"
+    exit 1
+  fi
+
+  echo "bootstrap: Using libtool.m4 at ${ltfile}."
+
+  cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+
+  # libtool.m4 from 1.6 requires ltsugar.m4
+  if [ -f ltsugar.m4 ]; then
+    rm -f build/ltsugar.m4
+    mv ltsugar.m4 build/ltsugar.m4
+  fi
+
+  # Clean up any leftovers
+  rm -f aclocal.m4 libtool.m4
+
+  # fix for FreeBSD (at least):
+  # libtool.m4 is in share/aclocal, while e.g. aclocal19 only looks in share/aclocal19
+  # get aclocal's default directory and include the libtool.m4 directory via -I if
+  # it's in a different location
+
+  aclocal_dir="`${ACLOCAL:-aclocal} --print-ac-dir`"
+
+  if [ -n "${aclocal_dir}" -a -n "${ltfile}" -a "`dirname ${ltfile}`" != "${aclocal_dir}" ] ; then
+    ACLOCAL_OPTS="-I `dirname ${ltfile}`"
+  fi
+
+  ### run aclocal
+  echo "Re-creating aclocal.m4 ..."
+  ${ACLOCAL:-aclocal} ${ACLOCAL_OPTS}
+
+  ### do some work to toss config.cache?
+  echo "Creating configure ..."
+  ${AUTOCONF:-autoconf}
+
+  #
+  # Generate the autoconf header
+  #
+  echo "Creating include/arch/unix/apr_private.h.in ..."
+  ${AUTOHEADER:-autoheader}
+
+  # Remove autoconf 2.5x's cache directory
+  rm -rf autom4te*.cache
+
+  echo "Entering directory ${LIBDIR}/apr-util"
+  cd ${LIBDIR}/apr-util
+  if [ "${BGJOB}" = "false" ]; then
+    ./buildconf
+  else
+    ./buildconf &
+  fi
+}
+
+# Libs automake automation function
+libbootstrap() {
+  i=$1
+  if [ -d ${LIBDIR}/${i} ]; then
+    echo "Entering directory ${LIBDIR}/${i}"
+    cd ${LIBDIR}/${i}
+    rm -f aclocal.m4
+    CFFILE=
+    if [ -f ${LIBDIR}/${i}/configure.in ]; then
+      CFFILE="${LIBDIR}/${i}/configure.in"
+    else
+      if [ -f ${LIBDIR}/${i}/configure.ac ]; then
+        CFFILE="${LIBDIR}/${i}/configure.ac"
+      fi
+    fi
+
+    if [ ! -z ${CFFILE} ]; then
       LTTEST=`grep "AC_PROG_LIBTOOL" ${CFFILE}`
       LTTEST2=`grep "AM_PROG_LIBTOOL" ${CFFILE}`
       AMTEST=`grep "AM_INIT_AUTOMAKE" ${CFFILE}`
@@ -307,69 +332,74 @@ libbootstrap()
       echo "Creating aclocal.m4"
       ${ACLOCAL:-aclocal} ${ACLOCAL_OPTS} ${ACLOCAL_FLAGS}
 
-#only run if AC_PROG_LIBTOOL is in configure.in/configure.ac
-      if [ ! -z "${LTTEST}" -o "${LTTEST2}" -o "${AXTEST}" ] ; then
-          echo "Running libtoolize..."
-          if ${libtoolize} -n --install >/dev/null 2>&1 ; then
-             $libtoolize --force --copy --install
-          else
-             $libtoolize --force --copy
-          fi
+      # only run if AC_PROG_LIBTOOL is in configure.in/configure.ac
+      if [ ! -z "${LTTEST}" -o "${LTTEST2}" -o "${AXTEST}" ]; then
+        echo "Running libtoolize..."
+        if ${libtoolize} -n --install >/dev/null 2>&1; then
+          $libtoolize --force --copy --install
+        else
+          $libtoolize --force --copy
+        fi
       fi
 
       echo "Creating configure"
       ${AUTOCONF:-autoconf}
 
-#only run if AC_CONFIG_HEADERS is found in configure.in/configure.ac
-      if [ ! -z "${AHTEST}" ] ; then
-          echo "Running autoheader..."
-          ${AUTOHEADER:-autoheader} ;
+      # only run if AC_CONFIG_HEADERS is found in configure.in/configure.ac
+      if [ ! -z "${AHTEST}" ]; then
+        echo "Running autoheader..."
+        ${AUTOHEADER:-autoheader};
       fi
 
-#run if AM_INIT_AUTOMAKE / AC_PROG_INSTALL is in configure.in/configure.ac
-      if [ ! -z "${AMTEST}" -o "${AMTEST2}" ] ; then
-          echo "Creating Makefile.in"
-          ${AUTOMAKE:-automake} --no-force --add-missing --copy ;
+      # run if AM_INIT_AUTOMAKE / AC_PROG_INSTALL is in configure.in/configure.ac
+      if [ ! -z "${AMTEST}" -o "${AMTEST2}" ]; then
+        echo "Creating Makefile.in"
+        ${AUTOMAKE:-automake} --no-force --add-missing --copy;
       fi
       rm -rf autom4te*.cache
-  fi
+    fi
   else
-      echo "Skipping directory ${LIBDIR}/${i}"
+    echo "Skipping directory ${LIBDIR}/${i}"
   fi
 }
 
+bootstrap_fs() {
+  cd ${BASEDIR}
+  rm -f aclocal.m4
+  ${ACLOCAL:-aclocal} ${ACLOCAL_OPTS}
+  $libtoolize --copy --automake
+  ${AUTOCONF:-autoconf}
+  ${AUTOHEADER:-autoheader}
+  ${AUTOMAKE:-automake} --no-force --add-missing --copy
+  rm -rf autom4te*.cache
+}
 
-# Remove autoconf 2.5x's cache directory
-rm -rf autom4te*.cache
+bootstrap_libs() {
+  for i in ${SUBDIRS}; do
+    if [ "${BGJOB}" = "false" ]; then
+      libbootstrap ${i}
+    else
+      libbootstrap ${i} &
+    fi
+  done
+}
 
-echo "Entering directory ${LIBDIR}/apr-util"
-cd ${LIBDIR}/apr-util
-if [ "${BGJOB}" = "false" ] ; then
-	./buildconf
-else
-	./buildconf &
-fi
-
-
-for i in ${SUBDIRS}
-do
-  if [ "${BGJOB}" = "false" ] ; then
-  	libbootstrap ${i}
-  else
-	libbootstrap ${i} &
+run() {
+  setup_modules
+  setup_gnu
+  check_ac_ver
+  check_am_ver
+  check_acl_ver
+  check_lt_ver
+  check_libtoolize
+  print_autotools_vers
+  bootstrap_apr
+  bootstrap_libs
+  bootstrap_fs
+  if [ "${BGJOB}" = "true" ]; then
+    wait
   fi
-done
+}
 
-if [ "${BGJOB}" = "true" ] ; then
-	wait
-fi
-cd ${BASEDIR}
-
-rm -f aclocal.m4
-${ACLOCAL:-aclocal} ${ACLOCAL_OPTS}
-$libtoolize --copy --automake
-${AUTOCONF:-autoconf}
-${AUTOHEADER:-autoheader}
-${AUTOMAKE:-automake} --no-force --add-missing --copy
-rm -rf autom4te*.cache
+run