buildsys: use pkg-config for libarchive detection
This also introduces a versioned dependency of >=2.8.0. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
This commit is contained in:
parent
c5d951846d
commit
059c572ca5
@ -153,8 +153,8 @@ AC_CHECK_LIB([m], [fabs], ,
|
||||
AC_MSG_ERROR([libm is needed to compile pacman!]))
|
||||
|
||||
# Check for libarchive
|
||||
AC_CHECK_LIB([archive], [archive_read_data], ,
|
||||
AC_MSG_ERROR([libarchive is needed to compile pacman!]))
|
||||
PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], ,
|
||||
AC_MSG_ERROR([*** libarchive >= 2.8.0 is needed to compile pacman!]))
|
||||
|
||||
# Check for OpenSSL
|
||||
have_openssl=no
|
||||
@ -412,7 +412,7 @@ ${PACKAGE_NAME}:
|
||||
preprocessor flags : ${CPPFLAGS}
|
||||
compiler flags : ${CFLAGS}
|
||||
defines : ${DEFS}
|
||||
library flags : ${LIBS} ${LIBSSL_LIBS}
|
||||
library flags : ${LIBS} ${LIBSSL_LIBS} ${LIBARCHIVE_LIBS}
|
||||
linker flags : ${LDFLAGS}
|
||||
|
||||
Architecture : ${CARCH}
|
||||
|
@ -67,10 +67,12 @@ libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) @LIBCURL@
|
||||
|
||||
libalpm_la_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
$(LIBARCHIVE_CFLAGS) \
|
||||
$(LIBSSL_CFLAGS)
|
||||
|
||||
libalpm_la_LIBADD = \
|
||||
$(LTLIBINTL) \
|
||||
$(LIBARCHIVE_LIBS) \
|
||||
$(LIBSSL_LIBS)
|
||||
|
||||
# vim:set ts=2 sw=2 noet:
|
||||
|
Loading…
Reference in New Issue
Block a user