A bit more configure tweaking.

diff --git a/configure.ac b/configure.ac
index 24a0710116aa0f82adaec185bab9f119e2939b08..a49e6addca3dcc64bd9d35f7f0629b8a86455123 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -488,7 +488,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
     sys/ioctl.h sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h \
     sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
     netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
-    sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
+    sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \
     popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netinet/ip.h \
     zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h)
 AC_HEADER_MAJOR_FIXED
@@ -1221,11 +1221,6 @@ else
        AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
        AC_DEFINE(SUPPORT_ACLS, 1)
        ;;
-    *hpux*)
-       AC_MSG_RESULT(Using HPUX ACLs)
-       AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
-       AC_DEFINE(SUPPORT_ACLS, 1)
-       ;;
     *irix*)
        AC_MSG_RESULT(Using IRIX ACLs)
        AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs])
@@ -1247,6 +1242,11 @@ else
        AC_DEFINE(HAVE_OSX_ACLS, 1, [true if you have Mac OS X ACLs])
        AC_DEFINE(SUPPORT_ACLS, 1)
        ;;
+    *hpux*|*nsk*)
+       AC_MSG_RESULT(Using HPUX ACLs)
+       AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs])
+       AC_DEFINE(SUPPORT_ACLS, 1)
+       ;;
     *)
        AC_MSG_RESULT(running tests:)
        AC_CHECK_LIB(acl,acl_get_file)

diff --git a/lib/sysacls.c b/lib/sysacls.c
index 3eb903cf335738cb193603433aa848dfa118acfa..a354baed6309d6d8c502b0358d37619b44b2fdaf 100644 (file)
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
@@ -767,7 +767,9 @@ int sys_acl_free_acl(SMB_ACL_T acl_d)
 
 #elif defined(HAVE_HPUX_ACLS) /*---------------------------------------------*/
 
+#ifdef HAVE_DL_H
 #include <dl.h>
+#endif
 
 /*
  * Based on the Solaris/SCO code - with modifications.