Merge remote-tracking branch 'origin/mdb.RE/0.9'

[openldap] / build / openldap.m4

diff --git a/build/openldap.m4 b/build/openldap.m4
index caf8fc2aa6642b3d2ffe02f56dd0a343d4be32f5..32a52c7078168a5962b44c8c29b753fbfc192c0c 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-2015 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


@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
 #endif
 __db_version DB_VERSION_MAJOR
 ])
 #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]]*) : ;; *)


@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
 #endif
 __db_version DB_VERSION_MINOR
 ])
 #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]]*) : ;; *)