From f49c8eecef54c44d9baf4f20ec8a7c539d2d0a0a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 31 Jul 2004 05:35:52 +0000 Subject: [PATCH] 2004-07-31 Colin Walters * configure.in: Use AC_TRY_COMPILE instead of AC_EGREP_HEADER to correctly detect DBUS__ACQUIRE_SVC. Also add an AC_MSG_CHECKING. --- ChangeLog | 6 ++++++ configure.in | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 90fa3f4..769c787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-07-31 Colin Walters + + * 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 SELinux support from Matthew Rickard diff --git a/configure.in b/configure.in index 67f971c..c04097b 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 ], + [#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 -- 2.7.4