From: Michael Schroeder Date: Fri, 19 Oct 2012 12:44:01 +0000 (+0200) Subject: check for rpm/db.h header file X-Git-Tag: BASE-SuSE-Code-12_3-Branch~223 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd3f9bb02ea7aec77311340f2ff21ffc9fd39d65;p=thirdparty%2Flibsolv.git check for rpm/db.h header file --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ae536ba1..e3ba1850 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,6 +135,7 @@ MESSAGE (STATUS "Enabling multi dist support") ADD_DEFINITIONS (-DMULTI_SEMANTICS) ENDIF (MULTI_SEMANTICS) +INCLUDE (CheckIncludeFile) IF (ENABLE_RPMDB) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) @@ -160,6 +161,7 @@ IF (ENABLE_RPMDB) 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 (ENABLE_RPMDB) INCLUDE (CheckFunctionExists) @@ -172,6 +174,7 @@ TEST_BIG_ENDIAN (WORDS_BIGENDIAN) # should create config.h with #cmakedefine instead... FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN + HAVE_RPM_DB_H ENABLE_RPMDB ENABLE_RPMDB_PUBKEY ENABLE_RPMMD ENABLE_SUSEREPO ENABLE_COMPS ENABLE_HELIXREPO ENABLE_MDKREPO ENABLE_ARCHREPO ENABLE_DEBIAN ENABLE_LZMA_COMPRESSION ENABLE_BZIP2_COMPRESSION) diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c index 38de58a7..59cd1532 100644 --- a/ext/repo_rpmdb.c +++ b/ext/repo_rpmdb.c @@ -32,10 +32,10 @@ #include #ifndef DB_CREATE -# ifdef FEDORA -# include -# else +# if defined(SUSE) || defined(HAVE_RPM_DB_H) # include +# else +# include # endif #endif