From: | "Pavel Kazakov (nullishzero)" <nullishzero@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in lxde-base/lxdm/files: lxdm-0.4.1-fix-optional-pam.patch |
Date: | Mon, 23 Dec 2013 07:44:04 |
Message-Id: | 20131223074358.C77E32004C@flycatcher.gentoo.org |
1 | nullishzero 13/12/23 07:43:58 |
2 | |
3 | Added: lxdm-0.4.1-fix-optional-pam.patch |
4 | Log: |
5 | Make pam a conditional subdirectory; bug #469512 |
6 | |
7 | (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x39E7AB2E) |
8 | |
9 | Revision Changes Path |
10 | 1.1 lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: lxdm-0.4.1-fix-optional-pam.patch |
16 | =================================================================== |
17 | diff --git a/Makefile.am b/Makefile.am |
18 | index bfac56b..40710fc 100644 |
19 | --- a/Makefile.am |
20 | +++ b/Makefile.am |
21 | @@ -2,10 +2,13 @@ NULL = |
22 | SUBDIRS= \ |
23 | src \ |
24 | po \ |
25 | - pam \ |
26 | data \ |
27 | $(NULL) |
28 | |
29 | +if HAVE_PAM |
30 | +SUBDIRS += pam |
31 | +endif |
32 | + |
33 | rpm: dist @PACKAGE_NAME@.spec |
34 | rpmbuild -bb \ |
35 | --define "_sourcedir `pwd`" \ |
36 | diff --git a/configure.ac b/configure.ac |
37 | index ae5177f..aaa1bad 100644 |
38 | --- a/configure.ac |
39 | +++ b/configure.ac |
40 | @@ -27,6 +27,7 @@ if test "x$USE_PAM" != "xno" ; then |
41 | AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."]) |
42 | fi]) |
43 | fi |
44 | +AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ]) |
45 | |
46 | # Checks for header files. |
47 | AC_PATH_X |