X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=bootstrap.sh;h=5cb6d35e3e3cb5ce610d03770974216e88bed29d;hb=7bca10ca93172c1417f10c630a13c7aa88617ded;hp=eb16db255d8082fa3c9f867035f60e938c364270;hpb=5a6dd35a036e60a1e51d2bffbde6b5fb0064e65d;p=m6w6%2Flibmemcached

diff --git a/bootstrap.sh b/bootstrap.sh
index eb16db25..5cb6d35e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -33,89 +33,121 @@
 
 die() { echo "$@"; exit 1; }
 
+command_exists () {
+  type "$1" &> /dev/null ;
+}
+
 run() {
+  echo $TESTS_ENVIRONMENT
   echo "\`$@' $ARGS"
   $@ $ARGS
 } 
 
-if [ -d .git ]
-then
-  AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
-elif [ -d .bzr ]
-then
-  AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
-elif [ -d .svn ]
-then
-  AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
-elif [ -d .hg ]
-then
-  AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
-else
-  AUTORECONF_FLAGS="--install --force --verbose -Wall"
-fi
-
-LIBTOOLIZE_FLAGS="--force --verbose"
-
-if [ $(uname) = "Darwin" ]
-then
-  LIBTOOLIZE=glibtoolize
-elif [ -z "$LIBTOOLIZE" ]
-then 
-  LIBTOOLIZE=libtoolize
-fi
-
-AUTORECONF=autoreconf
-
-# Set ENV DEBUG in order to enable debugging
-if [ -n "$DEBUG" ]
-then 
-  DEBUG="--enable-debug"
-fi
-
-# Set ENV ASSERT in order to enable assert
-if [ -n "$ASSERT" ]
-then 
-  ASSERT="--enable-assert"
-fi
-
-# Set ENV MAKE in order to override "make"
-if [ -z "$MAKE" ]
-then 
-  MAKE="make"
-fi
-
-# Set ENV MAKE_J in order to override "-j2"
-if [ -z "$MAKE_J" ]
-then
-  MAKE_J="-j2"
-fi
-
-# Set ENV PREFIX in order to set --prefix for ./configure
-if [ -n "$PREFIX" ]
-then 
-  PREFIX="--prefix=$PREFIX"
-fi
-
-if [ -f Makefile ]
-then
-  $MAKE $MAKE_J distclean
-fi
-
-run $LIBTOOLIZE $LIBTOOLIZE_FLAGS || die "Can't execute $LIBTOOLIZE"
-run $AUTORECONF $AUTORECONF_FLAGS || die "Can't execute $AUTORECONF"
-
-# If we are executing on OSX use CLANG, otherwise only use it if we find it in the ENV
-if [ $(uname) = "Darwin" ]
-then
-  CC=clang CXX=clang++ ./configure $DEBUG $ASSERT $PREFIX || die "configure failed to run"
-else
-  ./configure $DEBUG $ASSERT $PREFIX || die "configure failed to run"
-fi
-
-# Set ENV MAKE_TARGET in order to override default of "all"
-if [ -z "$MAKE_TARGET" ]
-then 
-  MAKE_TARGET="all"
-fi
-
-run $MAKE $MAKE_J $MAKE_TARGET || die "Can't execute make"
+bootstrap() {
+  if [ -d .git ]
+  then
+    AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
+  elif [ -d .bzr ]
+  then
+    AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
+  elif [ -d .svn ]
+  then
+    AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
+  elif [ -d .hg ]
+  then
+    AUTORECONF_FLAGS="--install --force --verbose -Wall -Werror"
+  else
+    AUTORECONF_FLAGS="--install --force --verbose -Wall"
+  fi
+
+  LIBTOOLIZE_FLAGS="--force --verbose"
+
+  if [ $(uname) = "Darwin" ]
+  then
+    LIBTOOLIZE=glibtoolize
+  elif [ -z "$LIBTOOLIZE" ]
+  then 
+    LIBTOOLIZE=libtoolize
+  fi
+
+  AUTOMAKE=automake
+  AUTORECONF=autoreconf
+
+  AUTOMAKE_FLAGS=--add-missing
+
+
+  # Set ENV DEBUG in order to enable debugging
+  if [ -n "$DEBUG" ]
+  then 
+    DEBUG="--enable-debug"
+  fi
+
+  # Set ENV ASSERT in order to enable assert
+  if [ -n "$ASSERT" ]
+  then 
+    ASSERT="--enable-assert"
+  fi
+
+  # Set ENV VALGRIND in order to enable assert
+  if [ -n "$VALGRIND" ] && command_exists valgrind
+  then 
+    VALGRIND="valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE"
+    TESTS_ENVIRONMENT="$VALGRIND"
+  fi
+
+  # Set ENV MAKE in order to override "make"
+  if [ -z "$MAKE" ]
+  then 
+    MAKE="make"
+  fi
+
+  # Set ENV MAKE_J in order to override "-j2"
+  if [ -z "$MAKE_J" ]
+  then
+    MAKE_J="-j2"
+  fi
+
+  # Set ENV PREFIX in order to set --prefix for ./configure
+  if [ -n "$PREFIX" ]
+  then 
+    PREFIX="--prefix=$PREFIX"
+  fi
+
+  if [ -f Makefile ]
+  then
+    $MAKE $MAKE_J maintainer-clean
+  fi
+
+  run $LIBTOOLIZE $LIBTOOLIZE_FLAGS || die "Can't execute $LIBTOOLIZE"
+  run $AUTOMAKE $AUTOMAKE_FLAGS || die "Can't execute $AUTORECONF"
+  run $AUTORECONF $AUTORECONF_FLAGS || die "Can't execute $AUTORECONF"
+
+  # If we are executing on OSX use CLANG, otherwise only use it if we find it in the ENV
+  if [ $(uname) = "Darwin" ]
+  then
+    CC=clang CXX=clang++ ./configure $DEBUG $ASSERT $PREFIX || die "configure failed to run"
+  else
+    ./configure $DEBUG $ASSERT $PREFIX || die "configure failed to run"
+  fi
+
+  if [[ -n "$TESTS_ENVIRONMENT" ]] && [[ -f libtool ]]
+  then
+    TESTS_ENVIRONMENT="./libtool --mode=execute $TESTS_ENVIRONMENT"
+    export TESTS_ENVIRONMENT
+  fi
+
+  if [ -f docs/conf.py ]
+  then 
+    run $MAKE $MAKE_J man || die "Can't execute make"
+  fi
+
+  # Set ENV MAKE_TARGET in order to override default of "all"
+  if [ -z "$MAKE_TARGET" ]
+  then 
+    MAKE_TARGET="all"
+  fi
+
+  run $MAKE $MAKE_J $MAKE_TARGET || die "Can't execute make"
+}
+
+bootstrap