Add rra-c-util to the src/external regime

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 4764f5e..99e0edf 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -244,21 +244,25 @@ AC_ARG_WITH([html-xsl],
 
 AC_ARG_WITH([docbook2pdf],
        AS_HELP_STRING([--with-docbook2pdf=ARG],
-       [which Docbook to PDF utility to use (possible choices are: fop, docbook2pdf, dblatex)]),
+       [which Docbook to PDF utility to use (possible choices are: fop, dblatex, docbook2pdf)]),
                [DOCBOOK2PDF="$withval"],
-       AC_CHECK_PROGS([DOCBOOK2PDF], [fop docbook2pdf dblatex], [echo]))
+       AC_CHECK_PROGS([DOCBOOK2PDF], [fop dblatex docbook2pdf], [echo]))
 
 AC_ARG_WITH([docbook-stylesheets],
        AS_HELP_STRING([--with-docbook-stylesheets=ARG],
        [location of DocBook stylesheets (default is to search a set of likely paths)]),
                [DOCBOOK_STYLESHEETS="$withval"],
        OPENAFS_SEARCH_DIRLIST([DOCBOOK_STYLESHEETS], [/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets /usr/share/sgml/docbook/docbook-xsl-stylesheets /usr/share/sgml/docbook/xsl-stylesheets /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl], [$HTML_XSL])
-       if test "x$DOCBOOK_STYLESHEETS" == "x"; then
+       if test "x$DOCBOOK_STYLESHEETS" = "x"; then
                AC_WARN([Docbook stylesheets not found; some documentation can't be built])
        fi)
 
 enable_login="no"
 
+dnl Check whether kindlegen exists.  If not, we'll suppress that part of the
+dnl documentation build.
+AC_CHECK_PROGS([KINDLEGEN], [kindlegen])
+
 dnl weird ass systems
 dnl AC_AIX
 AC_ISC_POSIX
@@ -912,9 +916,11 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_IOP_I_PERMISSION_TAKES_FLAGS
                 LINUX_IOP_I_PERMISSION_TAKES_NAMEIDATA
                 LINUX_IOP_I_PUT_LINK_TAKES_COOKIE
+                LINUX_DOP_D_DELETE_TAKES_CONST
                 LINUX_DOP_D_REVALIDATE_TAKES_NAMEIDATA
                 LINUX_FOP_F_FLUSH_TAKES_FL_OWNER_T
                 LINUX_FOP_F_FSYNC_TAKES_DENTRY
+                LINUX_FOP_F_FSYNC_TAKES_RANGE
                 LINUX_AOP_WRITEBACK_CONTROL
                 LINUX_FS_STRUCT_FOP_HAS_SPLICE
                 LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG
@@ -1261,7 +1267,6 @@ AC_CHECK_HEADERS([ \
                   pthread_np.h \
                   pwd.h \
                   regex.h \
-                  resolv.h \
                   security/pam_appl.h \
                   signal.h \
                   stdint.h \
@@ -1303,12 +1308,24 @@ AC_CHECK_HEADERS([ \
                   unistd.h \
                   windows.h \
                ])
+
+AC_CHECK_HEADERS([resolv.h], [], [], [AC_INCLUDES_DEFAULT
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif])
+
 AC_CHECK_HEADERS([net/if.h],[],[],[AC_INCLUDES_DEFAULT
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif])
 
 AC_CHECK_HEADERS([netinet/if_ether.h],[],[],[AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
 #ifdef HAVE_NET_IF_H
 # include <net/if.h>
 #endif])
@@ -1596,6 +1613,10 @@ AC_DEFINE_UNQUOTED([PTHREAD_SETNAME_NP_ARGS], $pthread_setname_np_args, [Number
 fi
 LIBS="$save_LIBS"
 
+OPENAFS_OSCONF
+openafs_cv_saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $XCFLAGS_NOCHECKING"
+
 AC_TYPE_SIGNAL
 OPENAFS_RETSIGTYPE
 AC_CHECK_SIZEOF(void *)
@@ -1644,6 +1665,8 @@ AC_CHECK_TYPES([long long], [], [], [])
 
 AC_SIZEOF_TYPE(long)
 
+CFLAGS="$openafs_cv_saved_CFLAGS"
+
 RRA_HEADER_PAM_CONST
 
 
@@ -1721,7 +1744,6 @@ AC_SUBST(XSLTPROC)
 AC_SUBST(DOCBOOK2PDF)
 AC_SUBST(DOCBOOK_STYLESHEETS)
 
-OPENAFS_OSCONF
 OPENAFS_FUSE
 OPENAFS_SWIG