vlserver: Rationalise usage message

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index d174f56..6ed38ed 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1224,6 +1224,7 @@ AC_CHECK_HEADERS([ \
                   ncurses.h \
                   netdb.h \
                   netinet/in.h \
+                  pwd.h \
                   regex.h \
                   security/pam_modules.h \
                   signal.h \
@@ -1249,6 +1250,7 @@ AC_CHECK_HEADERS([ \
                   sys/statfs.h \
                   sys/statvfs.h \
                   sys/socket.h \
+                  sys/sysctl.h \
                   sys/time.h \
                   sys/types.h \
                   sys/un.h \
@@ -1327,8 +1329,10 @@ AC_CHECK_FUNCS([ \
        mkstemp \
        pread \
        preadv \
+       preadv64 \
        pwrite \
        pwritev \
+       pwritev64 \
        regcomp \
        regerror \
        regexec \
@@ -1338,6 +1342,8 @@ AC_CHECK_FUNCS([ \
        sigaction \
        strcasestr \
        strerror \
+       sysconf \
+       sysctl \
        timegm \
 ])
 
@@ -1349,7 +1355,6 @@ dnl haven't found a need for yet, and so haven't imported
 AC_CHECK_FUNCS([ \
        chown \
        fchown \
-       getdtablesize \
        gethostname \
        gettimeofday \
        localtime_r \
@@ -1382,6 +1387,7 @@ AC_REPLACE_FUNCS([ \
        erealloc \
        err \
        errx \
+       getdtablesize \
        getopt \
        getprogname \
        mkstemp \
@@ -1463,13 +1469,13 @@ case $AFS_SYSNAME in
      AC_MSG_RESULT(no)
    fi
    AC_MSG_CHECKING([for vectored positional I/O])
-   if test "$ac_cv_func_preadv" = "yes" && \
-           test "$ac_cv_func_pwritev" = "yes"; then
-      AC_DEFINE(HAVE_PIOV, 1, [define if you have preadv() and pwritev()])
-      AC_MSG_RESULT(yes)
-   else
-     AC_MSG_RESULT(no)
-   fi
+   AS_IF([test "$ac_cv_func_preadv" = "yes" -a \
+               "$ac_cv_func_pwritev" = "yes" -a \
+              "$ac_cv_func_preadv64" = "yes" -a \
+              "$ac_cv_func_pwritev64" = "yes"],
+        [AC_DEFINE(HAVE_PIOV, 1, [define if you have preadv() and pwritev()])
+         AC_MSG_RESULT(yes)],
+        [AC_MSG_RESULT(no)])
    ;;
 esac
 
@@ -1677,7 +1683,9 @@ OPENAFS_HAVE_STRUCT_FIELD(DIR, dd_fd, [#include <sys/types.h>
 
 dnl Eventually, this will look for the system one, or for OpenSSL
 LIB_hcrypto="-lafshcrypto"
+LDFLAGS_hcrypto="-L\$(TOP_LIBDIR)"
 AC_SUBST(LIB_hcrypto)
+AC_SUBST(LDFLAGS_hcrypto)
 ])
 
 AC_DEFUN([SUMMARY], [