Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 887b20a
Fix autotools issues.
Vsevolod Stakhov committed 12 years ago
commit 887b20af7196b7bfc2ae3ad107b37444860439d6
parent 61c8baa
4 files changed +17 -17
modified configure.ac
@@ -36,8 +36,8 @@ AC_CHECK_HEADER([gelf.h], [
		LIBELF_LIB="-lelf"

	])

], [
- 
    LIBELF_LIB="\$(top_srcdir)/external/libelf.la"
- 
    LIBELF_BUNDLED="\$(top_srcdir)/external/libelf.la"
+ 
    LIBELF_LIB="\$(top_builddir)/external/libelf.la"
+ 
    LIBELF_BUNDLED="\$(top_builddir)/external/libelf.la"

    LIBELF_INCLUDE="-I\$(top_srcdir)/external/libelf"

])
modified libpkg/Makefile.am
@@ -39,9 +39,9 @@ libpkg_la_CFLAGS= -I$(top_srcdir)/libpkg \
			-I$(top_srcdir)/external/libyaml/include \

			-DPREFIX=\"$(prefix)\" \

			-Wno-pointer-sign
- 
libpkg_la_LIBADD=	$(top_srcdir)/external/libucl.la \
- 
			$(top_srcdir)/external/libsqlite.la \
- 
			$(top_srcdir)/external/libyaml.la \
+ 
libpkg_la_LIBADD=	$(top_builddir)/external/libucl.la \
+ 
			$(top_builddir)/external/libsqlite.la \
+ 
			$(top_builddir)/external/libyaml.la \

			@LIBELF_LIB@ \

			-larchive \

			-lsbuf \
@@ -64,6 +64,6 @@ noinst_HEADERS= private/db_upgrades.h \
			private/thd_repo.h \

			private/utils.h
- 
dist_man_MANS=		libpkg/pkg-repository.5 \
- 
			libpkg/pkg_printf.3 \
- 
			libpkg/pkg_repos.3 

\ No newline at end of file
+ 
dist_man_MANS=		pkg-repository.5 \
+ 
			pkg_printf.3 \
+ 
			pkg_repos.3 

\ No newline at end of file
modified src/Makefile.am
@@ -66,7 +66,8 @@ dist_man_MANS= pkg-add.8 \
			pkg.8 \

			pkg.conf.5
- 
pkg_LDADD=		libpkg.la libexpat.la \
+ 
pkg_LDADD=	$(top_builddir)/libpkg/libpkg.la \
+ 
			$(top_builddir)/external/libexpat.la \

			-ljail

pkg_CFLAGS=		-I$(top_srcdir)/libpkg \

			-I$(top_srcdir)/external/uthash \
modified tests/Makefile.am
@@ -1,16 +1,15 @@
AUTOMAKE_OPTIONS=	subdir-objects
- 
check_PROGRAMS=	pkg_printf pkg_validation
-
- 
pkg_printf_SOURCES=	$(top_srcdir)/libpkg/pkg_printf.c \
- 
				lib/pkg_printf_test.c
+ 
pkg_printf_SOURCES=	lib/pkg_printf_test.c

pkg_printf_CFLAGS=	-I$(top_srcdir)/libpkg -DTESTING
- 
pkg_printf_LDADD=		libpkg.la -latf-c
- 
pkg_printf_LDLAGS=	-Wl,-rpath=\$$ORIGIN/../.libs
+ 
pkg_printf_LDADD=	$(top_builddir)/libpkg/libpkg.la -latf-c
+ 
pkg_printf_LDFLAGS=	-Wl,-rpath=\$$ORIGIN/../.libs

pkg_validation_SOURCES=	lib/pkg_validation.c

pkg_validation_CFLAGS=	-I$(top_srcdir)/libpkg -DTESTING
- 
pkg_validation_LDADD=		libpkg.la -latf-c
- 
pkg_validation_LDLAGS=	-Wl,-rpath=\$$ORIGIN/../.libs
+ 
pkg_validation_LDADD=	$(top_builddir)/libpkg/libpkg.la -latf-c
+ 
pkg_validation_LDFLAGS=	-Wl,-rpath=\$$ORIGIN/../.libs
+
+ 
check_PROGRAMS=	pkg_printf pkg_validation



regression-test:

	@echo "ATF/KYUA has change our testing framework is not compatible for now"