[Pkg-shadow-devel] [PATCH 2/7] build-sys: run autoupdate
Sami Kerola
kerolasa at iki.fi
Fri Aug 30 06:04:23 UTC 2013
Signed-off-by: Sami Kerola <kerolasa at iki.fi>
---
configure.ac | 65 +++++++++++++++++++++++++++++++++---------------------------
1 file changed, 36 insertions(+), 29 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1a3f841..1005516 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,19 +7,19 @@ dnl Some hacks...
test "$prefix" = "NONE" && prefix="/usr"
test "$prefix" = "/usr" && exec_prefix=""
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
-AM_DISABLE_SHARED
-AM_ENABLE_STATIC
+AC_DISABLE_SHARED([])
+AC_ENABLE_STATIC([])
AM_MAINTAINER_MODE
dnl Checks for programs.
AC_PROG_CC
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
AC_PROG_LN_S
AC_PROG_YACC
-AM_PROG_LIBTOOL
+LT_INIT
dnl Checks for libraries.
@@ -105,7 +105,18 @@ fi
dnl Checks for library functions.
AC_TYPE_GETGROUPS
-AC_TYPE_SIGNAL
+AC_DIAGNOSE([obsolete],[your code may safely assume C89 semantics that RETSIGTYPE is void.
+Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])dnl
+AC_CACHE_CHECK([return type of signal handlers],[ac_cv_type_signal],[AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([#include <sys/types.h>
+#include <signal.h>
+],
+ [return *(signal (0, 0)) (0) == 1;])],
+ [ac_cv_type_signal=int],
+ [ac_cv_type_signal=void])])
+AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers
+ (`int' or `void').])
+
AC_FUNC_UTIME_NULL
AC_FUNC_STRFTIME
AC_REPLACE_FUNCS(mkdir putgrent putpwent putspent rename rmdir)
@@ -201,7 +212,7 @@ if test "$ac_cv_func_ruserok" = "yes"; then
fi
AC_ARG_ENABLE(shadowgrp,
- [AC_HELP_STRING([--enable-shadowgrp], [enable shadow group support @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-shadowgrp],[enable shadow group support @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_shadowgrp="yes" ;;
no) enable_shadowgrp="no" ;;
@@ -211,15 +222,13 @@ AC_ARG_ENABLE(shadowgrp,
)
AC_ARG_ENABLE(man,
- [AC_HELP_STRING([--enable-man],
- [regenerate roff man pages from Docbook @<:@default=no@:>@])],
+ [AS_HELP_STRING([--enable-man],[regenerate roff man pages from Docbook @<:@default=no@:>@])],
[enable_man="${enableval}"],
[enable_man="no"]
)
AC_ARG_ENABLE(account-tools-setuid,
- [AC_HELP_STRING([--enable-account-tools-setuid],
- [Install the user and group management tools setuid and authenticate the callers. This requires --with-pam.])],
+ [AS_HELP_STRING([--enable-account-tools-setuid],[Install the user and group management tools setuid and authenticate the callers. This requires --with-pam.])],
[case "${enableval}" in
yes) enable_acct_tools_setuid="yes" ;;
no) enable_acct_tools_setuid="no" ;;
@@ -230,8 +239,7 @@ AC_ARG_ENABLE(account-tools-setuid,
)
AC_ARG_ENABLE(utmpx,
- [AC_HELP_STRING([--enable-utmpx],
- [enable loggin in utmpx / wtmpx @<:@default=no@:>@])],
+ [AS_HELP_STRING([--enable-utmpx],[enable loggin in utmpx / wtmpx @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_utmpx="yes" ;;
no) enable_utmpx="no" ;;
@@ -241,44 +249,43 @@ AC_ARG_ENABLE(utmpx,
)
AC_ARG_ENABLE(subordinate-ids,
- [AC_HELP_STRING([--enable-subordinate-ids],
- [support subordinate ids @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-subordinate-ids],[support subordinate ids @<:@default=yes@:>@])],
[enable_subids="${enableval}"],
[enable_subids="maybe"]
)
AC_ARG_WITH(audit,
- [AC_HELP_STRING([--with-audit], [use auditing support @<:@default=yes if found@:>@])],
+ [AS_HELP_STRING([--with-audit],[use auditing support @<:@default=yes if found@:>@])],
[with_audit=$withval], [with_audit=maybe])
AC_ARG_WITH(libpam,
- [AC_HELP_STRING([--with-libpam], [use libpam for PAM support @<:@default=yes if found@:>@])],
+ [AS_HELP_STRING([--with-libpam],[use libpam for PAM support @<:@default=yes if found@:>@])],
[with_libpam=$withval], [with_libpam=maybe])
AC_ARG_WITH(selinux,
- [AC_HELP_STRING([--with-selinux], [use SELinux support @<:@default=yes if found@:>@])],
+ [AS_HELP_STRING([--with-selinux],[use SELinux support @<:@default=yes if found@:>@])],
[with_selinux=$withval], [with_selinux=maybe])
AC_ARG_WITH(acl,
- [AC_HELP_STRING([--with-acl], [use ACL support @<:@default=yes if found@:>@])],
+ [AS_HELP_STRING([--with-acl],[use ACL support @<:@default=yes if found@:>@])],
[with_acl=$withval], [with_acl=maybe])
AC_ARG_WITH(attr,
- [AC_HELP_STRING([--with-attr], [use Extended Attribute support @<:@default=yes if found@:>@])],
+ [AS_HELP_STRING([--with-attr],[use Extended Attribute support @<:@default=yes if found@:>@])],
[with_attr=$withval], [with_attr=maybe])
AC_ARG_WITH(skey,
- [AC_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])],
+ [AS_HELP_STRING([--with-skey],[use S/Key support @<:@default=no@:>@])],
[with_skey=$withval], [with_skey=no])
AC_ARG_WITH(tcb,
- [AC_HELP_STRING([--with-tcb], [use tcb support (incomplete) @<:@default=yes if found@:>@])],
+ [AS_HELP_STRING([--with-tcb],[use tcb support (incomplete) @<:@default=yes if found@:>@])],
[with_tcb=$withval], [with_tcb=maybe])
AC_ARG_WITH(libcrack,
- [AC_HELP_STRING([--with-libcrack], [use libcrack @<:@default=no@:>@])],
+ [AS_HELP_STRING([--with-libcrack],[use libcrack @<:@default=no@:>@])],
[with_libcrack=$withval], [with_libcrack=no])
AC_ARG_WITH(sha-crypt,
- [AC_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])],
+ [AS_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(nscd,
- [AC_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--with-nscd],[enable support for nscd @<:@default=yes@:>@])],
[with_nscd=$withval], [with_nscd=yes])
AC_ARG_WITH(group-name-max-length,
- [AC_HELP_STRING([--with-group-name-max-length], [set max group name length @<:@default=16@:>@])],
+ [AS_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])
if test "$with_group_name_max_length" = "no" ; then
@@ -606,12 +613,12 @@ if test "$with_skey" = "yes"; then
AC_CHECK_LIB(skey, skeychallenge, [LIBSKEY=-lskey],
[AC_MSG_ERROR([liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])])
AC_DEFINE(SKEY, 1, [Define to support S/Key logins.])
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
#include <skey.h>
- ],[
+ ]], [[
skeychallenge((void*)0, (void*)0, (void*)0, 0);
- ],[AC_DEFINE(SKEY_BSD_STYLE, 1, [Define to support newer BSD S/Key API])])
+ ]])],[AC_DEFINE(SKEY_BSD_STYLE, 1, [Define to support newer BSD S/Key API])],[])
fi
if test "$enable_utmpx" = "yes"; then
--
1.8.4
More information about the Pkg-shadow-devel
mailing list