From cf8c1446adb160bdf018ea8667eefdd2f24a332d Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 18 May 2013 06:20:54 -0600 Subject: [PATCH] Fix typos in rev.12786 Also, update some EGREP tests to COMPILE_IFELSE --- helpers/external_acl/AD_group/required.m4 | 10 ++++++---- helpers/external_acl/session/required.m4 | 2 +- helpers/external_acl/time_quota/required.m4 | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/helpers/external_acl/AD_group/required.m4 b/helpers/external_acl/AD_group/required.m4 index 79d8d81eb0..f5c09a7a05 100755 --- a/helpers/external_acl/AD_group/required.m4 +++ b/helpers/external_acl/AD_group/required.m4 @@ -1,6 +1,8 @@ -# -## TODO: make a AC_COMPILE check instead -# for hdr in w32api/dsrole.h dsrole.h; do - AC_EGREP_HEADER(/usr/include/$hdr,[DsRoleGetPrimaryDomainInformation],[BUILD_HELPER="AD_group"]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[#include <$hdr>]], [[ + PDSROLE_PRIMARY_DOMAIN_INFO_BASIC pDSRoleInfo; + DWORD ret = DsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, (PBYTE *) & pDSRoleInfo); + ]]) + ],[BUILD_HELPER="AD_group"],[]) done diff --git a/helpers/external_acl/session/required.m4 b/helpers/external_acl/session/required.m4 index 6543ccb7c0..fdc86e9ad6 100755 --- a/helpers/external_acl/session/required.m4 +++ b/helpers/external_acl/session/required.m4 @@ -1 +1 @@ -AC_EGREP_HEADER(/usr/include/db.h,db_env_create,[BUILD_HELPER="session"]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]],[[DB_ENV *db_env = NULL; db_env_create(&db_env, 0);]])],[BUILD_HELPER="session"],[]) diff --git a/helpers/external_acl/time_quota/required.m4 b/helpers/external_acl/time_quota/required.m4 index ff127310c7..4520681ed6 100644 --- a/helpers/external_acl/time_quota/required.m4 +++ b/helpers/external_acl/time_quota/required.m4 @@ -1,2 +1,2 @@ AC_CHECK_HEADERS([db_185.h],[BUILD_HELPER="time_quota"]) -AC_EGREP_HEADER(/usr/include/db.h,dbopen,[BUILD_HELPER="time_quota"]) +AC_EGREP_HEADER([dbopen],[/usr/include/db.h],[BUILD_HELPER="time_quota"]) -- 2.47.3