]>
Commit | Line | Data |
---|---|---|
4daa26d4 | 1 | --- configure.ac 2008-09-22 16:44:51.000000000 +0200 |
2 | +++ configure.ac-new 2008-11-25 22:24:11.551376250 +0100 | |
3 | @@ -380,13 +380,7 @@ | |
4 | AS_HELP_STRING([--with-security-framework=<option>], | |
5 | [Default security framework to use polkit,dummy])) | |
6 | # try and guess this if nothing is listed | |
7 | -if test x$with_security_framework = x; then | |
8 | - if test -f /usr/bin/polkit-action ; then | |
9 | - with_security_framework=polkit | |
10 | - else | |
11 | - AC_MSG_ERROR([--with-security-framework explicitly required when not using PolicyKit or RBAC]) | |
12 | - fi | |
13 | -fi | |
14 | + with_security_framework=polkit | |
15 | ||
16 | AC_DEFINE_UNQUOTED(security_framework, "$with_security_framework", [default security framework]) | |
17 | AC_SUBST(security_framework, "$with_security_framework") | |
18 | @@ -397,11 +391,6 @@ | |
19 | polkit-grant >= $POLKIT_GRANT_REQUIRED) | |
20 | AC_SUBST(POLKIT_CFLAGS) | |
21 | AC_SUBST(POLKIT_LIBS) | |
22 | - AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE], | |
23 | - [polkit-policy-file-validate], [polkit-policy-file-validate]) | |
24 | - if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then | |
25 | - AC_MSG_ERROR([polkit-policy-file-validate not found]) | |
26 | - fi | |
27 | AC_DEFINE(USE_SECURITY_POLKIT, 1, [if we should use PolicyKit]) | |
28 | elif test x$with_security_framework = xdummy; then | |
29 | AC_DEFINE(USE_SECURITY_DUMMY, 1, [if we should use a dummy security framework]) |