Fix typos in rev.12786

Also, update some EGREP tests to COMPILE_IFELSE

diff --git a/helpers/external_acl/AD_group/required.m4 b/helpers/external_acl/AD_group/required.m4
index 79d8d81eb091a24c91fe86ea3c3e5744bf7da7fe..f5c09a7a051508c8b7fc3623729a846da35aa82a 100755 (executable)
--- 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 6543ccb7c0ec08602df739d75d90ddb7d1e3cb76..fdc86e9ad6d2b98d1cebba80c28e501b288c2630 100755 (executable)
--- 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.h>]],[[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 ff127310c720e6f599cb9e45d7ec0736dda30f71..4520681ed6a197286ca6f55bfbcc26ed441eac11 100644 (file)
--- 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"])