bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

buildsys: use pkg-config for libarchive detection

Browse source 
This also introduces a versioned dependency of >=2.8.0.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
This commit is contained in:
Dave Reisner 2012-03-30 14:30:08 -04:00
parent c5d951846d
commit 059c572ca5
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -153,8 +153,8 @@ AC_CHECK_LIB([m], [fabs], ,
AC_MSG_ERROR([libm is needed to compile pacman!])) AC_MSG_ERROR([libm is needed to compile pacman!]))
# Check for libarchive # Check for libarchive
AC_CHECK_LIB([archive], [archive_read_data], , PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], ,
AC_MSG_ERROR([libarchive is needed to compile pacman!])) AC_MSG_ERROR([*** libarchive >= 2.8.0 is needed to compile pacman!]))
# Check for OpenSSL # Check for OpenSSL
have_openssl=no have_openssl=no
@ -412,7 +412,7 @@ ${PACKAGE_NAME}:
preprocessor flags : ${CPPFLAGS} preprocessor flags : ${CPPFLAGS}
compiler flags : ${CFLAGS} compiler flags : ${CFLAGS}
defines : ${DEFS} defines : ${DEFS}
library flags : ${LIBS} ${LIBSSL_LIBS} library flags : ${LIBS} ${LIBSSL_LIBS} ${LIBARCHIVE_LIBS}
linker flags : ${LDFLAGS} linker flags : ${LDFLAGS}
Architecture : ${CARCH} Architecture : ${CARCH}

2
lib/libalpm/Makefile.am
View file

@ -67,10 +67,12 @@ libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) @LIBCURL@
libalpm_la_CFLAGS = \ libalpm_la_CFLAGS = \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(LIBARCHIVE_CFLAGS) \
$(LIBSSL_CFLAGS) $(LIBSSL_CFLAGS)
libalpm_la_LIBADD = \ libalpm_la_LIBADD = \
$(LTLIBINTL) \ $(LTLIBINTL) \
$(LIBARCHIVE_LIBS) \
$(LIBSSL_LIBS) $(LIBSSL_LIBS)
# vim:set ts=2 sw=2 noet: # vim:set ts=2 sw=2 noet: