ITS#8527 - Add additional debug logging on consumer/provider state when the consumer...

[openldap] / build / openldap.m4

diff --git a/build/openldap.m4 b/build/openldap.m4
index caf8fc2aa6642b3d2ffe02f56dd0a343d4be32f5..d8cf32f70781d4e2f18c187d22747481ceaf2cf5 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -2,7 +2,7 @@ dnl OpenLDAP Autoconf Macros
 dnl $OpenLDAP$
 dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl
-dnl Copyright 1998-2014 The OpenLDAP Foundation.
+dnl Copyright 1998-2017 The OpenLDAP Foundation.
 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without
@@ -321,14 +321,14 @@ dnl --------------------------------------------------------------------
 dnl Get major and minor version from <db.h>
 AC_DEFUN([OL_BDB_HEADER_VERSION],
 [AC_CACHE_CHECK([for Berkeley DB major version in db.h], [ol_cv_bdb_major],[
-       AC_LANG_CONFTEST([
+       AC_LANG_CONFTEST([AC_LANG_SOURCE([
 #include <db.h>
 #ifndef DB_VERSION_MAJOR
 #      define DB_VERSION_MAJOR 1
 #endif
 __db_version DB_VERSION_MAJOR
-])
-       set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+])])
+       set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
        ol_cv_bdb_major=${3}
 ])
 case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
@@ -337,14 +337,14 @@ esac
 
 dnl Determine minor version
 AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
-       AC_LANG_CONFTEST([
+       AC_LANG_CONFTEST([AC_LANG_SOURCE([
 #include <db.h>
 #ifndef DB_VERSION_MINOR
 #      define DB_VERSION_MINOR 0
 #endif
 __db_version DB_VERSION_MINOR
-])
-       set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+])])
+       set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
        ol_cv_bdb_minor=${3}
 ])
 case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
@@ -678,7 +678,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
 ]])
 
 AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
+[AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
 
 int main(argc, argv)
        int argc;
@@ -686,7 +686,7 @@ int main(argc, argv)
 {
 OL_PTHREAD_TEST_FUNCTION
 }
-]))
+])])
 dnl --------------------------------------------------------------------
 AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2)
 if test "$ol_link_threads" = no ; then