merge r2075 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2140 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 21:21:59 +00:00
parent e721ecd4ff
commit aceb80043f

View file

@ -881,11 +881,11 @@ if test "x${polkit}" != xno ; then
[ [
HAVE_POLKIT=1 HAVE_POLKIT=1
saved_LIBS="$LIBS" saved_LIBS="$LIBS"
LIBS="$LIBS POLKIT_LIBS" LIBS="$LIBS $POLKIT_LIBS"
AC_CHECK_FUNCS(polkit_context_is_caller_authorized) AC_CHECK_FUNCS(polkit_context_is_caller_authorized)
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
AC_DEFINE([HAVE_POLKIT], 1, [Have PolicyKit]) AC_DEFINE([HAVE_POLKIT], 1, [Have PolicyKit])
policydir=`pkg-config --variable prefix`/usr/share/PolicyKit/policy/ policydir=`pkg-config polkit-dbus --variable prefix`/share/PolicyKit/policy/
AC_SUBST(policydir) AC_SUBST(policydir)
], ],
[ [