1 |
philantrop 08/02/07 00:12:58 |
2 |
|
3 |
Added: kdebase-4.0.1-pam-optional.patch |
4 |
Log: |
5 |
Version bump to KDE 4.0.1. |
6 |
(Portage version: 2.1.4.1) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 kde-base/kdm/files/kdebase-4.0.1-pam-optional.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/files/kdebase-4.0.1-pam-optional.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/files/kdebase-4.0.1-pam-optional.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: kdebase-4.0.1-pam-optional.patch |
15 |
=================================================================== |
16 |
diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake |
17 |
index 3499836..cd1c2bb 100644 |
18 |
--- a/kdebase/workspace/cmake/modules/FindPAM.cmake |
19 |
+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake |
20 |
@@ -5,6 +5,8 @@ |
21 |
# PAM_INCLUDE_DIR - the pam include directory |
22 |
# PAM_LIBRARIES - libpam library |
23 |
|
24 |
+if (WITH_PAM) |
25 |
+ |
26 |
if (PAM_INCLUDE_DIR AND PAM_LIBRARY) |
27 |
# Already in cache, be silent |
28 |
set(PAM_FIND_QUIETLY TRUE) |
29 |
@@ -72,3 +74,5 @@ else (PAM_FOUND) |
30 |
endif (PAM_FOUND) |
31 |
|
32 |
mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST) |
33 |
+ |
34 |
+endif (WITH_PAM) |
35 |
diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake |
36 |
index ed8ab9e..ce3bcc2 100644 |
37 |
--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake |
38 |
+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake |
39 |
@@ -1,4 +1,4 @@ |
40 |
-find_package(PAM) |
41 |
+macro_optional_find_package(PAM) |
42 |
|
43 |
set(UNIXAUTH_LIBRARIES) |
44 |
set(UNIXAUTH_INCLUDE_DIRS) |
45 |
|
46 |
|
47 |
|
48 |
-- |
49 |
gentoo-commits@l.g.o mailing list |