diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-09-10 01:48:58 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-09-10 01:48:58 +0000 |
| commit | e5d866f6b3c5c95b5cfeb063e68bc139c0a13b1c (patch) | |
| tree | e6d998c19f30a5b7cc1cdf136c56a286309a1910 /qpid/cpp/src/finddb.cmake | |
| parent | 54f59af8956c9df2349c0030a3104ffc605b46c8 (diff) | |
| download | qpid-python-e5d866f6b3c5c95b5cfeb063e68bc139c0a13b1c.tar.gz | |
QPID-5123: Changes to Fedora 19 packaging of libdb4 prevents legacystore from building
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1521335 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/finddb.cmake')
| -rw-r--r-- | qpid/cpp/src/finddb.cmake | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/qpid/cpp/src/finddb.cmake b/qpid/cpp/src/finddb.cmake index fad827cffe..2f2f94f469 100644 --- a/qpid/cpp/src/finddb.cmake +++ b/qpid/cpp/src/finddb.cmake @@ -22,31 +22,33 @@ if(UNIX) # - Find BerkeleyDB # Find the BerkeleyDB includes and library # This module defines -# DB_INCLUDE_DIR, where to find db.h, etc. +# DB_CXX_INCLUDE_DIR, where to find db_cxx.h, etc. # DB_LIBRARIES, the libraries needed to use BerkeleyDB. # DB_FOUND, If false, do not try to use BerkeleyDB. # also defined, but not for general use are # DB_LIBRARY, where to find the BerkeleyDB library. -FIND_PATH(DB_INCLUDE_DIR db.h +FIND_PATH(DB_CXX_INCLUDE_DIR db_cxx.h /usr/local/include/db4 + /usr/local/include/libdb4 /usr/local/include /usr/include/db4 + /usr/include/libdb4 /usr/include ) -SET(DB_NAMES ${DB_NAMES} db_cxx) +SET(DB_NAMES ${DB_NAMES} db_cxx db_cxx-4) FIND_LIBRARY(DB_LIBRARY NAMES ${DB_NAMES} PATHS /usr/lib /usr/local/lib ) -IF (DB_LIBRARY AND DB_INCLUDE_DIR) +IF (DB_LIBRARY AND DB_CXX_INCLUDE_DIR) SET(DB_LIBRARIES ${DB_LIBRARY}) SET(DB_FOUND "YES") -ELSE (DB_LIBRARY AND DB_INCLUDE_DIR) +ELSE (DB_LIBRARY AND DB_CXX_INCLUDE_DIR) UNSET( DB_FOUND ) -ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR) +ENDIF (DB_LIBRARY AND DB_CXX_INCLUDE_DIR) IF (DB_FOUND) @@ -60,15 +62,15 @@ ELSE (DB_FOUND) ENDIF (DB_FOUND) # Deprecated declarations. -SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} ) +SET (NATIVE_DB_INCLUDE_PATH ${DB_CXX_INCLUDE_DIR} ) GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH) MARK_AS_ADVANCED( DB_LIBRARY - DB_INCLUDE_DIR + DB_CXX_INCLUDE_DIR ) else(UNIX) MESSAGE(STATUS "BerkeleyDB is ignored on non-Unix platforms") UNSET( DB_FOUND ) -endif(UNIX)
\ No newline at end of file +endif(UNIX) |