Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7fa56e5
Check for atf before trying to build tests, while here remove most of EXTRA_DIST
Baptiste Daroussin committed 12 years ago
commit 7fa56e5e63ead6cd16f8727238e7754108486a52
parent 39e0635
2 files changed +8 -4
modified Makefile.am
@@ -1,9 +1,8 @@
AUTOMAKE_OPTIONS=	subdir-objects

ACLOCAL_AMFLAGS=	-I m4
- 
EXTRA_DIST=	external/expat external/libyaml external/libelf \
- 
		 external/libucl external/uthash external/sqlite docs
+ 
EXTRA_DIST=	docs

dist-hook:

	rm -rf `find $(distdir)/external -type d -name .deps`
- 
SUBDIRS = external libpkg src tests scripts
 

\ No newline at end of file
+ 
SUBDIRS = external libpkg src @BUILD_TESTS@ scripts
modified configure.ac
@@ -102,6 +102,11 @@ AC_CHECK_HEADER([sys/sbuf.h], [
	LIBSBUF_INCLUDE="-I\$(top_srcdir)/external/libsbuf"

])
+ 
AC_CHECK_HEADER([atf-c.h], [
+ 
	 BUILD_TESTS="tests"
+ 
	 AC_CONFIG_FILES(tests/Makefile)
+ 
 ])
+ 


AC_CHECK_HEADER([sys/capability.h], [

        AC_CHECK_LIB(c, cap_sandboxed, [

                AC_DEFINE(HAVE_CAPSICUM, 1, [Define 1 if you have 'capsicum'.])
@@ -118,12 +123,12 @@ AC_SUBST([LIBSBUF_BUNDLED])
AC_SUBST([LIBSBUF_INCLUDE])

AC_SUBST([LIBJAIL_LIB])

AC_SUBST([HAVE_TEST])
+ 
AC_SUBST([BUILD_TESTS])



AC_CONFIG_FILES(Makefile \

		src/Makefile \

		external/Makefile \

		scripts/Makefile \
- 
		tests/Makefile \

		libpkg/Makefile

		libpkg/pkg.h \

		libpkg/pkg.pc