Commit 0e756226 authored by Jan Synacek's avatar Jan Synacek Committed by Quanah Gibson-Mount
Browse files

ITS#8056 fix libdb detection with gcc 5

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.
parent bb1fe3d3
...@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION], ...@@ -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],[ ...@@ -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]]*) : ;; *)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment