From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 24 Feb 2011 15:47:28 +0000 (+0000)
Subject: Modernize checks for DBUS__ACQUIRE_SVC
X-Git-Tag: dbus-1.4.8~14^2~4^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fe24aacd23a1e2bf4b8f89457f4c18baceef198;p=thirdparty%2Fdbus.git

Modernize checks for DBUS__ACQUIRE_SVC

Part of a patch by Javier Jardón.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32245
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/configure.ac b/configure.ac
index 4ab8b4a1f..23d4f2c03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -848,12 +848,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_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_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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