Adjusted for use with new AC_CHECK_ macros.

@@ -48,12 +48,12 @@ void free ();
 # define EXIT_FAILURE 1
 #endif
 
-#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-you must run the autoconf test for a properly working malloc -- see malloc.m4
+#ifndef HAVE_MALLOC
+# error "you must run the autoconf test for a properly working malloc -- see malloc.m4"
 #endif
 
-#ifndef HAVE_DONE_WORKING_REALLOC_CHECK
-you must run the autoconf test for a properly working realloc -- see realloc.m4
+#ifndef HAVE_REALLOC
+# error "you must run the autoconf test for a properly working realloc -- see realloc.m4"
 #endif
 
 /* Exit value when the requested amount of memory is not available.

@@ -23,9 +23,8 @@ EXTRA_DIST = \
  enable.m4 \
  gssapi.m4 \
  guile.m4 \
- malloc.m4 \
+ lib.m4 \
  mu_libobj.m4 \
- realloc.m4 \
  regex.m4 \
  utmp.m4 \
  tls.m4 \