Merge branch 'v3-cleanup' into v3.1.6-alex

[netatalk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cbbc67719ab3bc34d7d3f7de0bcbd55bdbe15be9..2f89f8cc23206b391e07e575fb9c3f57ecce99a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
 
 dnl these tests have been comfirmed to be needed in 2011
 AC_CHECK_FUNCS(backtrace_symbols dirfd getusershell pread pwrite pselect)
-AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen mempcpy)
+AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen mempcpy vasprintf asprintf)
 AC_CHECK_FUNCS(mmap utime getpagesize) dnl needed by tbd
 
 dnl search for necessary libraries
@@ -180,6 +180,7 @@ AC_NETATALK_REALPATH
 
 dnl Check for sendfile()
 AC_NETATALK_SENDFILE
+AC_NETATALK_RECVFILE
 
 dnl Check whether bundled libevent shall not be used
 AC_NETATALK_LIBEVENT
@@ -208,7 +209,7 @@ AC_NETATALK_LOCKFILE
 dnl Check for Docbook and build documentation if found
 AX_CHECK_DOCBOOK
 
-CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include $CPPFLAGS"
+CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir) $CPPFLAGS"
 UAMS_PATH="${uams_path}"
 
 AC_SUBST(LIBS)
@@ -244,7 +245,6 @@ AC_OUTPUT([Makefile
        bin/cnid/cnid2_create
        bin/megatron/Makefile
        bin/misc/Makefile
-       bin/uniconv/Makefile
        config/Makefile
        config/pam/Makefile
        contrib/Makefile
@@ -284,6 +284,7 @@ AC_OUTPUT([Makefile
        libatalk/cnid/last/Makefile
        libatalk/cnid/dbd/Makefile
        libatalk/cnid/tdb/Makefile
+       libatalk/cnid/mysql/Makefile
        libatalk/compat/Makefile
        libatalk/dsi/Makefile
        libatalk/iniparser/Makefile