diff --git a/.gitignore b/.gitignore
index 1ac03e6..80aff8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ INSTALL
 Makefile.in
 aclocal.m4
 autom4te.cache
+compile
 config.guess
 config.h.in
 config.sub
@@ -23,6 +24,7 @@ config.log
 config.status
 libtool
 stamp-h1
+test-driver
 umem.spec
 umem_test
 umem_test1
diff --git a/Makefile.am b/Makefile.am
index b745f7b..78f973e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,10 @@ libumem_la_SOURCES =	init_lib.c \
 			sys/vmem_impl_user.h
 
 libumem_malloc_la_SOURCES = malloc.c
-libumem_malloc_la_LDFLAGS = -lpthread -R$(libdir) -lumem 
+libumem_malloc_la_LDFLAGS = -lpthread -R$(libdir) -lumem
+
+AM_CFLAGS = -fno-builtin-calloc
+ACLOCAL_AMFLAGS = -I m4
 
 man3_MANS = umem_alloc.3 umem_cache_create.3 umem_debug.3
 EXTRA_DIST = COPYRIGHT OPENSOLARIS.LICENSE umem.spec Doxyfile umem_test4 \
diff --git a/README b/README
index f5c022e..d950309 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@ Linux and Windows versions of our product as we have found it to be stable.
 We will continue to update this project as and when we make improvements, and
 welcome third-party patches that improve the usability for everyone.
 
- 
+
 Wez Furlong,
 Message Systems, Inc.
 wez (at) messagesystems (dot) com
diff --git a/configure.ac b/configure.ac
index 3928c83..0b0b872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_INIT([umem], [1.0.2], [], [umem])
 AM_INIT_AUTOMAKE([dist-bzip2])
+AC_CONFIG_MACRO_DIRS([m4])
 
 AC_PROG_CC
 AM_PROG_AS
@@ -8,8 +9,8 @@ AC_PROG_LIBTOOL
 AC_C_INLINE
 
 AC_MSG_CHECKING([whether pthread_mutex_t is larger than 24 bytes])
-AC_TRY_RUN( 
-  [   
+AC_TRY_RUN(
+  [
 #include <pthread.h>
 int main(void){return (sizeof(pthread_mutex_t) > 24);}
   ],
@@ -19,7 +20,7 @@ int main(void){return (sizeof(pthread_mutex_t) > 24);}
     AC_DEFINE(UMEM_PTHREAD_MUTEX_TOO_BIG, [1], [need bigger cache])
     AC_MSG_WARN([*** increasing umem cpu cache size to compensate.])
   ]
-) 
+)
 
 AC_CHECK_LIB(dl,dlopen)
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 120000
index 0000000..f3504e9
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/libtool.m4
\ No newline at end of file
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 120000
index 0000000..b81279e
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/ltoptions.m4
\ No newline at end of file
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 120000
index 0000000..4d76cc7
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/ltsugar.m4
\ No newline at end of file
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 120000
index 0000000..5eb474f
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/ltversion.m4
\ No newline at end of file
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 120000
index 0000000..de0b9f9
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1 @@
+/usr/share/aclocal/lt~obsolete.m4
\ No newline at end of file
diff --git a/umem_test.c b/umem_test.c
index a90e91f..1fe9168 100644
--- a/umem_test.c
+++ b/umem_test.c
@@ -4,10 +4,13 @@
 
 #include "umem.h"
 
+#define UMEM_STANDALONE 1
+#include "umem_impl.h"
+
 int main(int argc, char *argv[])
 {
   char *foo;
-  
+
   umem_startup(NULL, 0, 0, NULL, NULL);
 
   foo = umem_alloc(32, UMEM_DEFAULT);
@@ -20,4 +23,3 @@ int main(int argc, char *argv[])
 
   return EXIT_SUCCESS;
 }
-