Add debug msg if adding entry to logDB fails

[openldap] / build / openldap.m4

diff --git a/build/openldap.m4 b/build/openldap.m4
index caf8fc2aa6642b3d2ffe02f56dd0a343d4be32f5..73a9b451c1ad347aa2106d55632630ac02d7561d 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 $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
 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],[
 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
 #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]]*) : ;; *)
        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],[
 
 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
 #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]]*) : ;; *)
        ol_cv_bdb_minor=${3}
 ])
 case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)


@@ -534,7 +534,7 @@ if test $ac_cv_header_db_h = yes; then
 fi
 ])
 dnl --------------------------------------------------------------------
 fi
 ])
 dnl --------------------------------------------------------------------

-dnl Check for version compatility with back-bdb
+dnl Check for version compatibility with back-bdb

 AC_DEFUN([OL_BDB_COMPAT],
 [AC_CACHE_CHECK([if Berkeley DB version supported by BDB/HDB backends], [ol_cv_bdb_compat],[
        AC_EGREP_CPP(__db_version_compat,[
 AC_DEFUN([OL_BDB_COMPAT],
 [AC_CACHE_CHECK([if Berkeley DB version supported by BDB/HDB backends], [ol_cv_bdb_compat],[
        AC_EGREP_CPP(__db_version_compat,[


@@ -678,7 +678,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
 ]])
 
 AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
 ]])
 
 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;
 
 int main(argc, argv)
        int argc;


@@ -686,7 +686,7 @@ int main(argc, argv)
 {
 OL_PTHREAD_TEST_FUNCTION
 }
 {
 OL_PTHREAD_TEST_FUNCTION
 }

-]))
+])])

 dnl --------------------------------------------------------------------
 AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2)
 if test "$ol_link_threads" = no ; then
 dnl --------------------------------------------------------------------
 AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2)
 if test "$ol_link_threads" = no ; then


@@ -719,7 +719,7 @@ dnl Check GNU Pth pthread Header
 dnl
 dnl defines ol_cv_header linux_threads to 'yes' or 'no'
 dnl            'no' implies pthreads.h is not LinuxThreads or pthreads.h
 dnl
 dnl defines ol_cv_header linux_threads to 'yes' or 'no'
 dnl            'no' implies pthreads.h is not LinuxThreads or pthreads.h

-dnl            doesn't exists.  Existance of pthread.h should separately
+dnl            doesn't exist.  Existence of pthread.h should separately

 dnl            checked.
 dnl 
 AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [
 dnl            checked.
 dnl 
 AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [


@@ -750,7 +750,7 @@ dnl Check LinuxThreads Header
 dnl
 dnl defines ol_cv_header linux_threads to 'yes' or 'no'
 dnl            'no' implies pthreads.h is not LinuxThreads or pthreads.h
 dnl
 dnl defines ol_cv_header linux_threads to 'yes' or 'no'
 dnl            'no' implies pthreads.h is not LinuxThreads or pthreads.h

-dnl            doesn't exists.  Existance of pthread.h should separately
+dnl            doesn't exist.  Existence of pthread.h should separately

 dnl            checked.
 dnl 
 AC_DEFUN([OL_HEADER_LINUX_THREADS], [
 dnl            checked.
 dnl 
 AC_DEFUN([OL_HEADER_LINUX_THREADS], [


@@ -1107,7 +1107,7 @@ AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS],
 ])dnl
 dnl
 dnl --------------------------------------------------------------------
 ])dnl
 dnl
 dnl --------------------------------------------------------------------

-dnl Check for Cyrus SASL version compatility
+dnl Check for Cyrus SASL version compatibility

 AC_DEFUN([OL_SASL_COMPAT],
 [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[
        AC_EGREP_CPP(__sasl_compat,[
 AC_DEFUN([OL_SASL_COMPAT],
 [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[
        AC_EGREP_CPP(__sasl_compat,[