diff options
author | Andreas Henriksson <andreas@fatal.se> | 2019-12-05 13:29:31 +0100 |
---|---|---|
committer | Andreas Henriksson <andreas@fatal.se> | 2019-12-05 13:29:31 +0100 |
commit | 69d932140c70455a282b6e7115d9caf0cc56d6ff (patch) | |
tree | eda18bc82cc58e5d193e608f00543b2b5b537d49 /configure.ac | |
parent | b28d45d2bd2462414b9dbbe38e6c7f3d5f7b462b (diff) | |
download | shadow-69d932140c70455a282b6e7115d9caf0cc56d6ff.tar.gz |
New upstream version 4.8upstream/4.8
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 67625564..e3ed3b43 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) -AC_INIT([shadow], [4.7], [pkg-shadow-devel@lists.alioth.debian.org], [], +AC_INIT([shadow], [4.8], [pkg-shadow-devel@lists.alioth.debian.org], [], [https://github.com/shadow-maint/shadow]) AM_INIT_AUTOMAKE([1.11 foreign dist-xz]) AM_SILENT_RULES([yes]) @@ -247,7 +247,7 @@ AC_ARG_ENABLE(subordinate-ids, [enable_subids="maybe"] ) -AC_ARG_WITH(audit, +AC_ARG_WITH(audit, [AC_HELP_STRING([--with-audit], [use auditing support @<:@default=yes if found@:>@])], [with_audit=$withval], [with_audit=maybe]) AC_ARG_WITH(libpam, @@ -277,6 +277,9 @@ AC_ARG_WITH(libcrack, AC_ARG_WITH(sha-crypt, [AC_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])], [with_sha_crypt=$withval], [with_sha_crypt=yes]) +AC_ARG_WITH(bcrypt, + [AC_HELP_STRING([--with-bcrypt], [allow the bcrypt password encryption algorithm @<:@default=no@:>@])], + [with_bcrypt=$withval], [with_bcrypt=no]) AC_ARG_WITH(nscd, [AC_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])], [with_nscd=$withval], [with_nscd=yes]) @@ -286,6 +289,9 @@ AC_ARG_WITH(sssd, AC_ARG_WITH(group-name-max-length, [AC_HELP_STRING([--with-group-name-max-length], [set max group name length @<:@default=16@:>@])], [with_group_name_max_length=$withval], [with_group_name_max_length=yes]) +AC_ARG_WITH(su, + [AC_HELP_STRING([--with-su], [build and install su program and man page @<:@default=yes@:>@])], + [with_su=$withval], [with_su=yes]) if test "$with_group_name_max_length" = "no" ; then with_group_name_max_length=0 @@ -301,6 +307,11 @@ if test "$with_sha_crypt" = "yes"; then AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms]) fi +AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes") +if test "$with_bcrypt" = "yes"; then + AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm]) +fi + if test "$with_nscd" = "yes"; then AC_CHECK_FUNC(posix_spawn, [AC_DEFINE(USE_NSCD, 1, [Define to support flushing of nscd caches])], @@ -313,6 +324,9 @@ if test "$with_sssd" = "yes"; then [AC_MSG_ERROR([posix_spawn is needed for sssd support])]) fi +AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su])]) +AM_CONDITIONAL([WITH_SU], [test "x$with_su" != "xno"]) + dnl Check for some functions in libc first, only if not found check for dnl other libraries. This should prevent linking libnsl if not really dnl needed (Linux glibc, Irix), but still link it if needed (Solaris). @@ -321,6 +335,17 @@ AC_SEARCH_LIBS(inet_ntoa, inet) AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) +AC_CHECK_LIB([econf],[econf_readDirs],[LIBECONF="-leconf"],[LIBECONF=""]) +if test -n "$LIBECONF"; then + ECONF_CPPFLAGS="-DUSE_ECONF=1" + AC_ARG_ENABLE([vendordir], + AS_HELP_STRING([--enable-vendordir=DIR], [Directory for distribution provided configuration files]),,[]) +fi +AC_SUBST(ECONF_CPPFLAGS) +AC_SUBST(LIBECONF) +AC_SUBST([VENDORDIR], [$enable_vendordir]) +AM_CONDITIONAL([HAVE_VENDORDIR], [test "x$enable_vendordir" != x]) + if test "$enable_shadowgrp" = "yes"; then AC_DEFINE(SHADOWGRP, 1, [Define to support the shadow group file.]) fi @@ -500,7 +525,7 @@ if test "$with_selinux" != "no"; then AC_MSG_ERROR([libsemanage not found]) fi - if test "$selinux_lib$semanage_lib" == "yesyes" ; then + if test "$selinux_lib$semanage_lib" = "yesyes" ; then AC_DEFINE(WITH_SELINUX, 1, [Build shadow with SELinux support]) LIBSELINUX="-lselinux" @@ -715,8 +740,10 @@ echo " tcb support (incomplete): $with_tcb" echo " shadow group support: $enable_shadowgrp" echo " S/Key support: $with_skey" echo " SHA passwords encryption: $with_sha_crypt" +echo " bcrypt passwords encryption: $with_bcrypt" echo " nscd support: $with_nscd" echo " sssd support: $with_sssd" echo " subordinate IDs support: $enable_subids" echo " use file caps: $with_fcaps" +echo " install su: $with_su" echo |