Changeset 68 for trunk/aclocal.m4

Timestamp:

Oct 30, 2006, 12:03:44 AM (18 years ago)

Author:

rainer

Message:

Update trunk to samhain 2.3

File:

• trunk/aclocal.m4 (modified) (2 diffs)

trunk/aclocal.m4

@@ -402 +402 @@
 x_libraries=NONE
 DESTDIR=
-SH_ENABLE_OPTS="db-reload xml-log message-queue login-watch mounts-check userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp"
+SH_ENABLE_OPTS="db-reload xml-log message-queue login-watch process-check port-check mounts-check userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp"
 SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
 
@@ -1238 +1238 @@
 ])dnl
 
+AC_DEFUN([sh_CHECK_POSIX_ACL],
+[
+  AC_CHECK_HEADERS(sys/acl.h)
+  if test $ac_cv_header_sys_acl_h = yes; then
+
+        AC_CHECK_LIB([acl], [acl_get_file], sh_lacl=yes, sh_lacl=no)
+        if test x"$sh_lacl" = xyes; then
+                LIBACL=-lacl
+        else
+                LIBACL=
+        fi
+
+        OLDLIBS="$LIBS"
+        LIBS="$LIBS $LIBACL"
+        AC_CHECK_FUNCS([acl_free acl_get_file acl_get_fd],
+                       [sh_facl=yes],[sh_facl=no])
+        LIBS="$OLDLIBS"
+
+        if test x"$sh_facl" = xyes; then
+          AC_DEFINE(USE_ACL, 1, [Define if you want ACL support.])
+          LIBS="$LIBS $LIBACL"
+        fi
+  fi
+])
+
+AC_DEFUN([sh_CHECK_XATTR],
+[
+  AC_CHECK_HEADERS(attr/xattr.h)
+  if test $ac_cv_header_attr_xattr_h = yes; then
+
+        AC_CHECK_LIB([attr], [getxattr], sh_lattr=yes, sh_lattr=no)
+        if test x"$sh_lattr" = xyes; then
+                LIBATTR=-lattr
+        else
+                LIBATTR=
+        fi
+  
+        OLDLIBS="$LIBS"
+        LIBS="$LIBS $LIBATTR"
+        AC_CHECK_FUNCS([getxattr lgetxattr fgetxattr],
+                       [sh_fattr=yes],[sh_fattr=no])
+        LIBS="$OLDLIBS"
+
+        if test x"$sh_fattr" = xyes; then
+          AC_DEFINE(USE_XATTR, 1, [Define if you want extended attributes support.])
+          LIBS="$LIBS $LIBATTR"
+        fi
+  fi
+])
 
 dnl Autoconf macros for libprelude