From 00373e402afe6be57e950c2af7198440b3fb1e55 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 18 Jun 2013 11:25:55 +0200 Subject: [PATCH] fix berkeley db link logic, don't rely on FEDORA being set --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d5b218..16dde94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,13 +174,14 @@ IF (ENABLE_RPMDB) ENDIF (RPMMISC_LIBRARY) ENDIF (RPM5) - IF (RPM5 OR FEDORA) + # check if rpm contains a bundled berkeley db + CHECK_INCLUDE_FILE(rpm/db.h HAVE_RPM_DB_H) + IF (NOT HAVE_RPM_DB_H) FIND_LIBRARY (DB_LIBRARY NAMES db) IF (DB_LIBRARY) SET (RPMDB_LIBRARY ${DB_LIBRARY} ${RPMDB_LIBRARY}) ENDIF (DB_LIBRARY) - ENDIF (RPM5 OR FEDORA) - CHECK_INCLUDE_FILE(rpm/db.h HAVE_RPM_DB_H) + ENDIF (NOT HAVE_RPM_DB_H) INCLUDE (CheckLibraryExists) CHECK_LIBRARY_EXISTS(rpmio pgpDigGetParams "" HAVE_PGPDIGGETPARAMS) ENDIF (ENABLE_RPMDB) -- 2.7.4