configure: Use pkg-config to discover libsolv

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index af9ae172d20bd9d16d57632025d9a41c0e256dab..3a8ff8e59e99b13a1432c626c7968ee334e53134 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -326,6 +326,7 @@ libpakfire_la_CFLAGS = \
        $(CURL_CFLAGS) \
        $(OPENSSL_CFLAGS) \
        $(PCRE2_CFLAGS) \
+       $(SOLV_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(UUID_CFLAGS)
 

diff --git a/configure.ac b/configure.ac
index 5e533dbf509e65fb02919c5634842ca129521d1d..f4deabea0ce35736ffa1e4557f20a6e32e5e6db4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,13 +159,6 @@ AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader libr
 DL_LIBS="$LIBS"
 AC_SUBST(DL_LIBS)
 
-# libsolv
-AC_CHECK_HEADERS([solv/solvversion.h], [], [AC_MSG_ERROR([*** libsolv headers not found])])
-
-LIBS=
-AC_SEARCH_LIBS([solver_create], [solv], [], [AC_MSG_ERROR([*** libsolv library not found])])
-SOLV_LIBS="$LIBS"
-AC_SUBST(SOLV_LIBS)
 LIBS="$save_LIBS"
 
 PKG_CHECK_MODULES([ARCHIVE], [libarchive >= 3.3.3])
@@ -174,6 +167,7 @@ PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}])
 PKG_CHECK_MODULES([LZMA], [liblzma])
 PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.1.1])
 PKG_CHECK_MODULES([PCRE2], [libpcre2-8])
+PKG_CHECK_MODULES([SOLV], [libsolv])
 PKG_CHECK_MODULES([SQLITE3], [sqlite3])
 PKG_CHECK_MODULES([UUID], [uuid])