[svn-upgrade] Integrating new upstream version, shadow (4.0.0)
This commit is contained in:
+52
-54
@@ -1,6 +1,6 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(lib/dialchk.c)
|
||||
AM_INIT_AUTOMAKE(shadow, 20001016)
|
||||
AM_INIT_AUTOMAKE(shadow, 4.0.0)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl Some hacks...
|
||||
@@ -9,14 +9,14 @@ test "$prefix" = "/usr" && exec_prefix=""
|
||||
test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
|
||||
test "$LDFLAGS" = "" && LDFLAGS="-s"
|
||||
|
||||
AM_DISABLE_SHARED
|
||||
AM_ENABLE_STATIC
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_ISC_POSIX
|
||||
dnl AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
dnl AC_PROG_MAKE_SET
|
||||
AC_PROG_YACC
|
||||
dnl AC_ARG_PROGRAM
|
||||
AM_C_PROTOTYPES
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
@@ -26,10 +26,15 @@ dnl Checks for header files.
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_STDC
|
||||
AC_HEADER_SYS_WAIT
|
||||
AC_CHECK_HEADERS(fcntl.h limits.h unistd.h sys/time.h utmp.h utmpx.h)
|
||||
AC_CHECK_HEADERS(termios.h termio.h sgtty.h sys/ioctl.h syslog.h)
|
||||
AC_CHECK_HEADERS(paths.h usersec.h utime.h ulimit.h sys/resource.h)
|
||||
AC_CHECK_HEADERS(gshadow.h shadow.h lastlog.h rpc/key_prot.h)
|
||||
|
||||
AC_CHECK_HEADERS(fcntl.h limits.h unistd.h sys/time.h utmp.h utmpx.h \
|
||||
termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h usersec.h \
|
||||
utime.h ulimit.h sys/resource.h gshadow.h shadow.h lastlog.h \
|
||||
rpc/key_prot.h)
|
||||
|
||||
AC_CHECK_FUNCS(a64l fchmod fchown fsync getgroups gethostname getspnam \
|
||||
gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \
|
||||
memcpy memset mkstemp setgroups sigaction strchr updwtmp updwtmpx)
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
@@ -106,12 +111,6 @@ AC_PROG_GCC_TRADITIONAL
|
||||
AC_TYPE_SIGNAL
|
||||
AC_FUNC_UTIME_NULL
|
||||
AC_FUNC_STRFTIME
|
||||
dnl Disabled for now, strtoday.c has problems with year 2000 or later
|
||||
dnl AC_CHECK_FUNCS(strptime)
|
||||
AC_CHECK_FUNCS(a64l fchmod fchown fsync getgroups gethostname getspnam)
|
||||
AC_CHECK_FUNCS(gettimeofday getusershell getutent initgroups lchown lckpwdf)
|
||||
AC_CHECK_FUNCS(lstat memcpy memset setgroups sigaction strchr updwtmp updwtmpx)
|
||||
|
||||
AC_REPLACE_FUNCS(mkdir putgrent putpwent putspent rename rmdir)
|
||||
AC_REPLACE_FUNCS(sgetgrent sgetpwent sgetspent)
|
||||
AC_REPLACE_FUNCS(snprintf strcasecmp strdup strerror strstr)
|
||||
@@ -198,8 +197,6 @@ AC_DEFINE(AGING)
|
||||
AC_DEFINE(USE_SYSLOG)
|
||||
AC_DEFINE(RLOGIN)
|
||||
AC_DEFINE(RUSEROK, 0)
|
||||
AC_DEFINE(LOGIN_ACCESS)
|
||||
AC_DEFINE(SU_ACCESS)
|
||||
|
||||
dnl Use our own version of getpass(), which handles long passwords
|
||||
dnl (unlike many systems which have a limit of 8 characters), and can
|
||||
@@ -207,15 +204,14 @@ dnl be interrupted with Ctrl-C (unlike Linux libc).
|
||||
AC_DEFINE(getpass, libshadow_getpass)
|
||||
|
||||
AC_ARG_ENABLE(desrpc, [ --enable-desrpc try to use secure RPC in login (default if found)])
|
||||
dnl AC_ARG_ENABLE(md5crypt, [ --enable-md5crypt include MD5-compatible crypt function])
|
||||
AC_ARG_ENABLE(shadowgrp, [ --enable-shadowgrp enable shadow group support [default=yes]])
|
||||
|
||||
AC_ARG_WITH(libcrack, [ --with-libcrack try to use libcrack (default if found)])
|
||||
AC_ARG_WITH(libcrypt, [ --with-libcrypt try to use libcrypt (default if found)])
|
||||
AC_ARG_WITH(libopie, [ --with-libopie use libopie for OPIE support])
|
||||
AC_ARG_WITH(libpam, [ --with-libpam use libpam for PAM support])
|
||||
AC_ARG_WITH(libskey, [ --with-libskey use libskey for S/Key support])
|
||||
AC_ARG_WITH(libtcfs, [ --with-libtcfs use libtcfs for TCFS support])
|
||||
AC_ARG_WITH(libopie, [ --with-libopie use libopie for OPIE support])
|
||||
AC_ARG_WITH(libpam, [ --with-libpam use libpam for PAM support])
|
||||
AC_ARG_WITH(libskey, [ --with-libskey use libskey for S/Key support])
|
||||
AC_ARG_WITH(libtcfs, [ --with-libtcfs use libtcfs for TCFS support])
|
||||
|
||||
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
|
||||
@@ -243,11 +239,6 @@ if test "$with_libcrypt" != "no"; then
|
||||
AC_CHECK_LIB(crypt, crypt, [AC_DEFINE(HAVE_LIBCRYPT) LIBCRYPT=-lcrypt])
|
||||
fi
|
||||
|
||||
if test "$enable_md5crypt" = "yes"; then
|
||||
LIBOBJS="$LIBOBJS md5.o md5crypt.o"
|
||||
AC_DEFINE(MD5_CRYPT)
|
||||
fi
|
||||
|
||||
AC_SUBST(LIBCRACK)
|
||||
if test "$with_libcrack" != "no"; then
|
||||
echo "checking cracklib flavour, don't be surprised by the results"
|
||||
@@ -272,36 +263,43 @@ fi
|
||||
|
||||
AC_SUBST(LIBPAM)
|
||||
if test "$with_libpam" = "yes"; then
|
||||
dnl AC_CHECK_LIB(pam, pam_start, AC_DEFINE(USE_PAM) LIBPAM=-lpam)
|
||||
dnl the above doesn't work as there is no libpam.a (only .so)
|
||||
dnl XXX - libpam_misc is probably Linux-PAM specific
|
||||
LIBPAM="-lpam -lpam_misc -ldl"
|
||||
AC_DEFINE(USE_PAM)
|
||||
AC_CACHE_CHECK(whether pam_strerror needs two arguments,
|
||||
ac_cv_pam_strerror_needs_two_args,
|
||||
AC_TRY_COMPILE(
|
||||
[#include <security/pam_appl.h>],
|
||||
[ pam_handle_t *pamh; pam_strerror(pamh, PAM_SUCCESS); ],
|
||||
ac_cv_pam_strerror_needs_two_args=yes,
|
||||
ac_cv_pam_strerror_needs_two_args=no
|
||||
)
|
||||
AC_CHECK_LIB(pam, pam_start,
|
||||
[AC_DEFINE(USE_PAM)
|
||||
LIBPAM="-lpam"
|
||||
AC_CHECK_LIB(pam_misc, main,
|
||||
LIBPAM="$LIBPAM -lpam_misc", ,
|
||||
AC_MSG_ERROR(libpam_misc is missing)
|
||||
)]
|
||||
[AC_MSG_CHECKING(use login access checking if PAM not used)
|
||||
AC_DEFINE(LOGIN_ACCESS)
|
||||
AC_MSG_RESULT(yes)]
|
||||
)
|
||||
if test "$ac_cv_pam_strerror_needs_two_args" = "yes"; then
|
||||
AC_DEFINE(PAM_STRERROR_NEEDS_TWO_ARGS)
|
||||
fi
|
||||
AC_MSG_CHECKING(use login and su access checking if PAM not used)
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
AC_MSG_CHECKING(use login and su access checking if PAM not used)
|
||||
AC_DEFINE(LOGIN_ACCESS)
|
||||
AC_DEFINE(SU_ACCESS)
|
||||
AC_MSG_RESULT(yes)
|
||||
fi
|
||||
|
||||
LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
|
||||
AC_SUBST(LTLIBOBJS)
|
||||
dnl LTALLOCA=`echo "$ALLOCA" | sed 's/\.o/.lo/g'`
|
||||
dnl AC_SUBST(LTALLOCA)
|
||||
|
||||
ALL_LINGUAS="cs el fr pl sv"
|
||||
ALL_LINGUAS="cs el fr pl sv uk"
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
AC_OUTPUT(libmisc/Makefile man/Makefile man/pl/Makefile
|
||||
lib/Makefile src/Makefile Makefile
|
||||
contrib/Makefile debian/Makefile doc/Makefile etc/Makefile
|
||||
intl/Makefile intl/po2tbl.sed po/Makefile.in
|
||||
etc/pam.d/Makefile shadow-utils.spec,
|
||||
echo timestamp > stamp-h)
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
intl/Makefile
|
||||
po/Makefile.in
|
||||
doc/Makefile
|
||||
man/Makefile
|
||||
man/ja/Makefile
|
||||
man/pl/Makefile
|
||||
man/pt_BR/Makefile
|
||||
libmisc/Makefile
|
||||
lib/Makefile
|
||||
src/Makefile
|
||||
contrib/Makefile
|
||||
debian/Makefile
|
||||
etc/Makefile
|
||||
etc/pam.d/Makefile
|
||||
shadow-utils.spec])
|
||||
|
||||
Reference in New Issue
Block a user