summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanny <danny@rawhide.localdomain>2009-09-08 12:20:36 -0400
committerdanny <danny@rawhide.localdomain>2009-09-08 12:20:36 -0400
commit8cb4bad9dc9d4cfef8eec6ff4ff5365324c9a974 (patch)
tree33a26bf4397d96b0db6fb15ba44ca4ca5457dc16
parent30bb0938e5361114212381f582f7b0be3c5b3063 (diff)
downloadabrt-8cb4bad9dc9d4cfef8eec6ff4ff5365324c9a974.tar.gz
abrt-8cb4bad9dc9d4cfef8eec6ff4ff5365324c9a974.tar.xz
abrt-8cb4bad9dc9d4cfef8eec6ff4ff5365324c9a974.zip
add polkit to compilation
-rw-r--r--configure.ac1
-rw-r--r--src/Daemon/Makefile.am7
-rw-r--r--src/Daemon/Polkit.cpp2
-rw-r--r--src/Daemon/Polkit.h2
4 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index e6b4dd7b..e7b66ad6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ PKG_CHECK_MODULES([NSS], [nss])
PKG_CHECK_MODULES([XMLRPC_CPP], [xmlrpc++])
PKG_CHECK_MODULES([XMLRPC_CLIENT_CPP], [xmlrpc_client++])
PKG_CHECK_MODULES([XMLRPC_CLIENT_CPP], [python])
+PKG_CHECK_MODULES([POLKIT],[polkit-gobject-1])
AC_CHECK_HEADER([sys/inotify.h], [],
[AC_MSG_ERROR([sys/inotify.h is needed to build abrt])])
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 934016a9..17823d63 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -13,7 +13,8 @@ abrtd_SOURCES = \
CommLayerServerSocket.h CommLayerServerSocket.cpp \
CommLayerServerDBus.h CommLayerServerDBus.cpp \
Daemon.cpp Daemon.h \
- Settings.h Settings.cpp
+ Settings.h Settings.cpp \
+ Polkit.h Polkit.cpp
abrtd_CPPFLAGS = \
-I$(srcdir)/../../inc \
-I$(srcdir)/../../lib/MiddleWare \
@@ -25,11 +26,11 @@ abrtd_CPPFLAGS = \
-DCONF_DIR=\"$(CONF_DIR)\" \
-DVAR_RUN=\"$(VAR_RUN)\" \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
- $(ENABLE_SOCKET_OR_DBUS)
+ $(ENABLE_SOCKET_OR_DBUS) $(POLKIT_CFLAGS)
abrtd_LDADD = \
../../lib/MiddleWare/libABRTMiddleWare.la \
../../lib/CommLayer/libABRTCommLayer.la \
- $(DL_LIBS) $(DBUS_LIBS) $(RPM_LIBS)
+ $(DL_LIBS) $(DBUS_LIBS) $(RPM_LIBS) $(POLKIT_LIBS)
dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
dist_dbusabrtconf_DATA = dbus-abrt.conf
diff --git a/src/Daemon/Polkit.cpp b/src/Daemon/Polkit.cpp
index 8c8e3884..722b788c 100644
--- a/src/Daemon/Polkit.cpp
+++ b/src/Daemon/Polkit.cpp
@@ -24,7 +24,7 @@
#include "Polkit.h"
-PolkitResult polkit_check_authorization(char* dbus_name,char *action_id)
+PolkitResult polkit_check_authorization(const char* dbus_name,const char *action_id)
{
PolkitAuthority *authority;
PolkitSubject *subject;
diff --git a/src/Daemon/Polkit.h b/src/Daemon/Polkit.h
index bb03822f..04aca64f 100644
--- a/src/Daemon/Polkit.h
+++ b/src/Daemon/Polkit.h
@@ -34,6 +34,6 @@ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE*/
PolkitChallenge = 0x03
} PolkitResult;
-PolkitResult polkit_check_authorization(char * dbus_name,char *action_id);
+PolkitResult polkit_check_authorization(const char * dbus_name,const char *action_id);
#endif