summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2004-07-31 05:35:52 +0000
committerColin Walters <walters@verbum.org>2004-07-31 05:35:52 +0000
commitf49c8eecef54c44d9baf4f20ec8a7c539d2d0a0a (patch)
treee7cd731b23b02dba1b3810216dcb295f4bc2266d
parent1e9b185b0c274ef0d684b1e43418388225321e72 (diff)
2004-07-31 Colin Walters <walters@redhat.com>
* configure.in: Use AC_TRY_COMPILE instead of AC_EGREP_HEADER to correctly detect DBUS__ACQUIRE_SVC. Also add an AC_MSG_CHECKING.
-rw-r--r--ChangeLog6
-rw-r--r--configure.in7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 90fa3f40..769c787c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-31 Colin Walters <walters@redhat.com>
+
+ * configure.in: Use AC_TRY_COMPILE instead of AC_EGREP_HEADER
+ to correctly detect DBUS__ACQUIRE_SVC. Also add an
+ AC_MSG_CHECKING.
+
2004-07-24 Havoc Pennington <hp@redhat.com>
SELinux support from Matthew Rickard <mjricka@epoch.ncsc.mil>
diff --git a/configure.in b/configure.in
index 67f971c6..c04097b5 100644
--- a/configure.in
+++ b/configure.in
@@ -700,8 +700,13 @@ else
# see if we have the SELinux header with the new D-BUS stuff in it
if test x$have_selinux = xyes ; then
- AC_EGREP_HEADER(DBUS__ACQUIRE_SVC, av_permissions.h,
+ AC_MSG_CHECKING([for DBUS Flask permissions in selinux/av_permissions.h])
+ AC_TRY_COMPILE([#include <selinux/av_permissions.h>],
+ [#ifdef DBUS__ACQUIRE_SVC return 0;
+ #else #error DBUS__ACQUIRE_SVC not defined
+ #endif],
have_selinux=yes, have_selinux=no)
+ AC_MSG_RESULT($have_selinux)
fi
if test x$enable_selinux = xauto ; then