upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8056 fix libdb detection with gcc 5

Browse source 
The old cpp version generated:
__db_version 5

The new output:
__db_version
            5

Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
Behavior with older versions of gcc is not changed.
This commit is contained in:
Jan Synacek 2015-02-11 10:32:28 +01:00 committed by Howard Chu
parent b5da411e1e
commit f19f1c3249
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/openldap.m4
View file

@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
#endif #endif
__db_version DB_VERSION_MAJOR __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} ol_cv_bdb_major=${3}
]) ])
case $ol_cv_bdb_major in [[1-9]]*) : ;; *) 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 #endif
__db_version DB_VERSION_MINOR __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} ol_cv_bdb_minor=${3}
]) ])
case $ol_cv_bdb_minor in [[0-9]]*) : ;; *) case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)