| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 2a43027f7ecf2bb3ce73f95bcf575c56bc495d07 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alejandro del Castillo <alejandro.delcastillo@ni.com> |
| 3 | Date: Wed, 9 Dec 2015 17:38:05 -0600 |
| 4 | Subject: [PATCH] configure.ac: use pkg-config for libsolv |
| 5 | |
| 6 | Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> |
| 7 | --- |
| 8 | configure.ac | 12 +----------- |
| 9 | 1 file changed, 1 insertion(+), 11 deletions(-) |
| 10 | |
| 11 | diff --git a/configure.ac b/configure.ac |
| 12 | index 52e1025..d17dc5c 100644 |
| 13 | --- a/configure.ac |
| 14 | +++ b/configure.ac |
| 15 | @@ -159,17 +159,7 @@ if test "x$want_solver" != "xno"; then |
| 16 | AC_MSG_ERROR(Specify which solver with --enable-solver=<SOLVER>)], |
| 17 | [libsolv], |
| 18 | [AC_MSG_RESULT(libsolv) |
| 19 | - |
| 20 | - SOLVER_CFLAGS="-I/usr/local/include/" |
| 21 | - SOLVER_LIBS="-lsolv -lsolvext" |
| 22 | - AC_CHECK_LIB([solv], |
| 23 | - [solver_solve], |
| 24 | - [], |
| 25 | - [AC_MSG_ERROR(libsolv not found)]) |
| 26 | - dnl TODO: remove previous 6 lines and uncomment line below to use |
| 27 | - dnl pkg-config once there is a release of libsolv with pkg-config: |
| 28 | - dnl PKG_CHECK_MODULES(SOLVER, libsolv) |
| 29 | - |
| 30 | + PKG_CHECK_MODULES(SOLVER, libsolv) |
| 31 | AC_DEFINE(HAVE_SOLVER_LIBSOLV,1,[Define if you want to use libsolv])], |
| 32 | # default |
| 33 | [AC_MSG_RESULT(no) |
| 34 | -- |
| 35 | 1.9.1 |
| 36 | |