Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › fda0e2c
Search for libarchive dependencies as well.
Vsevolod Stakhov committed 12 years ago
commit fda0e2c50da6af0c62160745f42a031760df36f6
parent 07b8f9f
4 files changed +15 -6
modified configure.ac
@@ -55,10 +55,19 @@ AC_DEFINE_UNQUOTED([GIT_HEAD], $GIT_HEAD)
AC_DEFINE([PKG_API], [api_ver])
+ 
AC_SEARCH_LIBS([lzma_version_string], [lzma], [], [
+ 
  AC_MSG_ERROR([unable to find the liblzma])
+ 
])
+ 
AC_SEARCH_LIBS([BZ2_bzReadOpen], [bz2], [], [
+ 
  AC_MSG_ERROR([unable to find the libbz2])
+ 
])
+ 
AC_SEARCH_LIBS([zlibVersion], [z], [], [
+ 
  AC_MSG_ERROR([unable to find the zlib])
+ 
])

AC_SEARCH_LIBS([archive_read_open], [archive], [], [

  AC_MSG_ERROR([unable to find the archive_read() function])

])
- 
AC_CHECK_HEADERS([archive.h],
+ 
AC_CHECK_HEADER([archive.h],

	[pkg_found_archive_headers=yes; break;])

AS_IF([test "x$pkg_found_archive_headers" != "xyes"],

	[AC_MSG_ERROR([Unable to find the libarchive headers])])
modified libpkg/Makefile.am
@@ -48,7 +48,10 @@ libpkg_la_LIBADD= $(top_builddir)/external/libucl.la \
			-lfetch \

			-lutil \

			-lssl \
- 
			-lcrypto
+ 
			-lcrypto \
+ 
			-lbz2 \
+ 
			-lz \
+ 
			-llzma

libpkg_la_LDFLAGS=	-version-info 1 -pthread

lib_LTLIBRARIES=	libpkg.la

include_HEADERS=	pkg.h
modified pkg_config.h.in
@@ -3,9 +3,6 @@
/* "Git revision" */

#undef GIT_HEAD
- 
/* Define to 1 if you have the <archive.h> header file. */
- 
#undef HAVE_ARCHIVE_H
- 


/* Define to 1 if you have the `bcopy' function. */

#undef HAVE_BCOPY
modified src/Makefile.am
@@ -75,7 +75,7 @@ pkg_CFLAGS= -I$(top_srcdir)/libpkg \
			-DGITHASH=\"$(GIT_HEAD)\"

pkg_static_CFLAGS=	$(pkg_CFLAGS)

pkg_static_SOURCES=	$(pkg_SOURCES)
- 
pkg_static_LDADD=	$(pkg_LDADD) -llzma -lbz2 -lz
+ 
pkg_static_LDADD=	$(pkg_LDADD)

pkg_static_LDFLAGS=	-all-static

sbin_PROGRAMS=		pkg pkg-static