From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Mar 2021 11:50:12 +0000 (+0000)
Subject: configure: Use pkg-config to discover libsolv
X-Git-Tag: 0.9.28~1285^2~579
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3350b942138979fee59a8563f653ddd68477c9ae;p=pakfire.git

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 af9ae172d..3a8ff8e59 100644
--- 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 5e533dbf5..f4deabea0 100644
--- 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])