Merge branch 'branch-release-3.0.5'

[netatalk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ade3cf6c94f71e3a9f015c8f4ede2c4dbf3ee941..c3c695cebf6918dff60efd9cd8b340fd7c8b0584 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,8 @@ AC_CHECK_FUNCS(mmap utime getpagesize) dnl needed by tbd
 dnl search for necessary libraries
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(connect, socket)
+AC_CHECK_FUNCS(getifaddrs) dnl comes after gethostbyname and connect so it picks up the libs
+
 AX_PTHREAD(, [AC_MSG_ERROR([missing pthread_sigmask])])
 
 AC_DEFINE(OPEN_NOFOLLOW_ERRNO, ELOOP, errno returned by open with O_NOFOLLOW)
@@ -198,7 +200,7 @@ AC_NETATALK_LOCKFILE
 dnl Check for Docbook and build documentation if found
 AX_CHECK_DOCBOOK
 
-CFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include $CFLAGS"
+CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include $CPPFLAGS"
 UAMS_PATH="${uams_path}"
 
 AC_SUBST(LIBS)
@@ -251,9 +253,11 @@ AC_OUTPUT([Makefile
        doc/Makefile
     doc/html.xsl
     doc/man.xsl
+    doc/manual/Makefile
     doc/manual/manual.xml
     doc/manpages/Makefile
     doc/manpages/man1/Makefile
+    doc/manpages/man5/Makefile
     doc/manpages/man8/Makefile
        etc/Makefile
        etc/afpd/Makefile