folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only enable test-suite if fakechroot is available

This commit is contained in:
Panu Matilainen 2011-04-04 14:31:17 +03:00
parent aea6f0423f
commit a81d933cc3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -19,7 +19,7 @@ endif
if WITH_LUA if WITH_LUA
SUBDIRS += luaext SUBDIRS += luaext
endif endif
SUBDIRS += rpmio lib sign build scripts fileattrs doc . tests SUBDIRS += rpmio lib sign build scripts fileattrs doc .
if ENABLE_PYTHON if ENABLE_PYTHON
SUBDIRS += python SUBDIRS += python
@ -29,6 +29,10 @@ if ENABLE_PLUGINS
SUBDIRS += plugins SUBDIRS += plugins
endif endif
if HAVE_FAKECHROOT
SUBDIRS += tests
endif
DIST_SUBDIRS = po misc luaext rpmio lib sign build python scripts fileattrs doc tests plugins DIST_SUBDIRS = po misc luaext rpmio lib sign build python scripts fileattrs doc tests plugins
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

4
configure.ac
View File

@ -138,7 +138,9 @@ AC_PATH_PROG(__NM, nm, /usr/bin/nm, $MYPATH)
AC_PATH_PROG(__OBJCOPY, objcopy, /usr/bin/objcopy, $MYPATH) AC_PATH_PROG(__OBJCOPY, objcopy, /usr/bin/objcopy, $MYPATH)
AC_PATH_PROG(__OBJDUMP, objdump, /usr/bin/objdump, $MYPATH) AC_PATH_PROG(__OBJDUMP, objdump, /usr/bin/objdump, $MYPATH)
AC_PATH_PROG(__STRIP, strip, /usr/bin/strip, $MYPATH) AC_PATH_PROG(__STRIP, strip, /usr/bin/strip, $MYPATH)
AC_PATH_PROG(__FAKECHROOT, fakechroot, /usr/bin/fakechroot, $MYPATH)
AC_PATH_PROG(__FAKECHROOT, fakechroot, no, $MYPATH)
AM_CONDITIONAL(HAVE_FAKECHROOT, [test "$__FAKECHROOT" != "no"])
dnl see if we have a mkdir that supports `-p' for rpmbuild's purposes dnl see if we have a mkdir that supports `-p' for rpmbuild's purposes
AC_PROG_MKDIR_P AC_PROG_MKDIR_P