Index: buildtools/aclocal.m4
===================================================================
--- buildtools/aclocal.m4	(revision 402)
+++ buildtools/aclocal.m4	(working copy)
@@ -1,16 +1,16 @@
 dnl FreeBSD -pthread check - Jonathan McDowell
 AC_DEFUN(AC_PTHREAD_FREEBSD,
          [AC_MSG_CHECKING([if we need -pthread for threads])
-          AC_CACHE_VAL(ac_ldflag_pthread,
+          AC_CACHE_VAL(ac_cv_ldflag_pthread,
                        [ac_save_LDFLAGS="$LDFLAGS"
                         LDFLAGS="-pthread $LDFLAGS"
                         AC_TRY_LINK([char pthread_create();],
                                     pthread_create();,
-                                    eval "ac_ldflag_pthread=yes",
-                                    eval "ac_ldflag_pthread=no"),
+                                    eval "ac_cv_ldflag_pthread=yes",
+                                    eval "ac_cv_ldflag_pthread=no"),
                                     LDFLAGS="$ac_save_LDFLAGS"
                        ])
-          if eval "test \"`echo $ac_ldflag_pthread`\" = yes"; then
+          if eval "test \"`echo $ac_cv_ldflag_pthread`\" = yes"; then
             AC_MSG_RESULT(yes)
           else
             AC_MSG_RESULT(no)
Index: stdutil/buildtools/aclocal.m4
===================================================================
--- stdutil/buildtools/aclocal.m4	(revision 402)
+++ stdutil/buildtools/aclocal.m4	(working copy)
@@ -1,16 +1,16 @@
 dnl FreeBSD -pthread check - Jonathan McDowell
 AC_DEFUN(AC_PTHREAD_FREEBSD,
          [AC_MSG_CHECKING([if we need -pthread for threads])
-          AC_CACHE_VAL(ac_ldflag_pthread,
+          AC_CACHE_VAL(ac_cv_ldflag_pthread,
                        [ac_save_LDFLAGS="$LDFLAGS"
                         LDFLAGS="-pthread $LDFLAGS"
                         AC_TRY_LINK([char pthread_create();],
                                     pthread_create();,
-                                    eval "ac_ldflag_pthread=yes",
-                                    eval "ac_ldflag_pthread=no"),
+                                    eval "ac_cv_ldflag_pthread=yes",
+                                    eval "ac_cv_ldflag_pthread=no"),
                                     LIBS="$ac_save_LDFLAGS"
                        ])
-          if eval "test \"`echo $ac_ldflag_pthread`\" = yes"; then
+          if eval "test \"`echo $ac_cv_ldflag_pthread`\" = yes"; then
             AC_MSG_RESULT(yes)
           else
             AC_MSG_RESULT(no)
Index: daemon/Makefile.in
===================================================================
--- daemon/Makefile.in	(revision 402)
+++ daemon/Makefile.in	(working copy)
@@ -4,6 +4,7 @@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
+datarootdir=@datarootdir@
 libdir=@libdir@
 includedir=@includedir@
 mandir=@mandir@
Index: libspread/Makefile.in
===================================================================
--- libspread/Makefile.in	(revision 402)
+++ libspread/Makefile.in	(working copy)
@@ -4,6 +4,7 @@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
+datarootdir=@datarootdir@
 libdir=@libdir@
 includedir=@includedir@
 mandir=@mandir@
Index: examples/Makefile.in
===================================================================
--- examples/Makefile.in	(revision 402)
+++ examples/Makefile.in	(working copy)
@@ -4,6 +4,7 @@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
+datarootdir=@datarootdir@
 libdir=@libdir@
 includedir=@includedir@
 mandir=@mandir@