Changeset 499 for trunk/aclocal.m4


Ignore:
Timestamp:
Dec 20, 2015, 10:12:16 PM (6 years ago)
Author:
katerina
Message:

Fix for ticket #396 (options --enable-selinux, --enable-posix-acl).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/aclocal.m4

    r481 r499  
    409409x_libraries=NONE
    410410DESTDIR=
    411 SH_ENABLE_OPTS="asm ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
     411SH_ENABLE_OPTS="selinux posix-acl asm ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
    412412SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
    413413
     
    14251425                       [sh_facl=yes],[sh_facl=no])
    14261426        LIBS="$OLDLIBS"
    1427 
    1428         if test x"$sh_facl" = xyes; then
    1429           AC_DEFINE(USE_ACL, 1, [Define if you want ACL support.])
     1427  fi   
     1428
     1429  if test x"$sh_facl" = xyes; then
     1430          AC_DEFINE(USE_ACL, 1, [Define if you want ACL support.])
    14301431          LIBS="$LIBS $LIBACL"
    1431         fi
     1432  else
     1433          if test "x$enable_posix_acl" != xcheck; then
     1434             AC_MSG_FAILURE([--enable-posix-acl was given, but test for acl support failed])
     1435          fi
    14321436  fi
    14331437])
     
    14501454                       [sh_fattr=yes],[sh_fattr=no])
    14511455        LIBS="$OLDLIBS"
    1452 
    1453         if test x"$sh_fattr" = xyes; then
     1456  fi
     1457
     1458  if test x"$sh_fattr" = xyes; then
    14541459          AC_DEFINE(USE_XATTR, 1, [Define if you want extended attributes support.])
    14551460          LIBS="$LIBS $LIBATTR"
    1456         fi
     1461  else
     1462          if test "x$enable_selinux" != xcheck; then
     1463             AC_MSG_FAILURE([--enable-selinux was given, but test for selinux support failed])
     1464          fi
    14571465  fi
    14581466])
Note: See TracChangeset for help on using the changeset viewer.