← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/pam/oneiric-proposed

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-02-17 16:15:47 UTC
  • mfrom: (3.2.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110217161547-afxi0yboxvn18a5t
Tags: 1.1.2-2ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/libpam-modules.postinst: Add PATH to /etc/environment if it's
    not present there or in /etc/security/pam_env.conf. (should send to
    Debian).
  - debian/libpam0g.postinst: only ask questions during update-manager when
    there are non-default services running.
  - debian/patches-applied/series: Ubuntu patches are as below ...
  - debian/patches-applied/ubuntu-rlimit_nice_correction: Explicitly
    initialise RLIMIT_NICE rather than relying on the kernel limits.
  - Change Vcs-Bzr to point at the Ubuntu branch.
  - debian/patches-applied/pam_motd-legal-notice: display the contents of
    /etc/legal once, then set a flag in the user's homedir to prevent
    showing it again.
  - debian/update-motd.5, debian/libpam-modules.manpages: add a manpage
    for update-motd, with some best practices and notes of explanation.
  - debian/patches/update-motd-manpage-ref: add a reference in pam_motd(8)
    to update-motd(5)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
1
dnl Process this file with autoconf to produce a configure script.
2
2
AC_INIT
3
3
AC_CONFIG_SRCDIR([conf/pam_conv1/pam_conv_y.y])
4
 
AM_INIT_AUTOMAKE("Linux-PAM", 1.1.1)
 
4
AM_INIT_AUTOMAKE("Linux-PAM", 1.1.2)
5
5
AC_PREREQ(2.61)
6
6
AC_CONFIG_HEADERS([config.h])
7
7
AC_CONFIG_MACRO_DIR([m4])
86
86
PAM_LD_AS_NEEDED
87
87
PAM_LD_O1
88
88
 
 
89
if test x"$cross_compiling" = xyes; then
 
90
        AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
 
91
else
 
92
        CC_FOR_BUILD="$CC"
 
93
fi
 
94
 
89
95
dnl Largefile support
90
96
AC_SYS_LARGEFILE
91
97
 
361
367
               [test "x$HAVE_AUDIT_TTY_STATUS" = xyes])
362
368
 
363
369
AC_CHECK_HEADERS(xcrypt.h crypt.h)
 
370
AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
 
371
  [crypt_libs="xcrypt crypt"],
 
372
  [crypt_libs="crypt"])
 
373
 
364
374
BACKUP_LIBS=$LIBS
365
 
AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
 
375
AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
366
376
AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
367
 
Libs=$BACKUP_LIBS
 
377
LIBS=$BACKUP_LIBS
368
378
AC_SUBST(LIBCRYPT)
369
379
if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
370
380
        AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.])
458
468
AC_FUNC_VPRINTF
459
469
AC_CHECK_FUNCS(fseeko gethostname gettimeofday lckpwdf mkdir select)
460
470
AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
461
 
AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
 
471
AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
462
472
AC_CHECK_FUNCS(getgrouplist getline getdelim)
463
473
AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af)
464
474