Vinzenz Feenstra has uploaded a new change for review. Change subject: Build fixes ......................................................................
Build fixes * Don't execute PEP8 checks when PEP8 is not installed * configure.ac: Don't fail on systems where AM_PROG_AR is not yet available in automake * m4/fhs.m4 don't fail if neither /var/lock/subsys nor /var/lock are present Change-Id: Iaa33a029b2e8fbbbd2e1329814dd8dc182109552 Signed-off-by: Vinzenz Feenstra <[email protected]> --- M Makefile.am M configure.ac M m4/fhs.m4 3 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent refs/changes/47/23747/1 diff --git a/Makefile.am b/Makefile.am index d13b408..ccbc3f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,9 @@ PEP8_BLACKLIST = ovirt-guest-agent/setup.py +# Only execute the PEP8 checks if it was found +# If pep8 couldn't be located don't execute this +ifndef WITHOUT_PEP8 check-local: $(PEP8) --exclude="$(PEP8_BLACKLIST)" --filename '*.py,*.py.in' \ $(PEP8_WHITELIST) @@ -68,7 +71,7 @@ fi; \ done; \ fi; - +endif install-exec-hook: $(MKDIR_P) $(DESTDIR)/$(pkgdatadir) diff --git a/configure.ac b/configure.ac index 9cce1ed..6ba8a8b 100644 --- a/configure.ac +++ b/configure.ac @@ -13,6 +13,7 @@ DEFINE_FHS AC_PROG_CC AC_PROG_CXX +m4_pattern_allow([AM_PROG_AR]) AM_PROG_AR AC_PROG_LIBTOOL AC_PROG_INSTALL @@ -80,6 +81,8 @@ AC_PATH_PROG([PEP8], [pep8]) if test "x$PEP8" = "x"; then AC_MSG_WARN([python-pep8 not found]) + WITHOUT_PEP8=1 + AC_SUBST([WITHOUT_PEP8]) fi diff --git a/m4/fhs.m4 b/m4/fhs.m4 index ca2cfaa..dd55a46 100644 --- a/m4/fhs.m4 +++ b/m4/fhs.m4 @@ -64,10 +64,8 @@ if test -d /var/lock/subsys; then AC_SUBST([lock_dir], ['/var/lock/subsys']) - elif test -d /var/lock; then - AC_SUBST([lock_dir], ['/var/lock']) else - AC_MSG_ERROR([This system does not seem to have a /var/lock directory.]) + AC_SUBST([lock_dir], ['/var/lock']) fi ]) -- To view, visit http://gerrit.ovirt.org/23747 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa33a029b2e8fbbbd2e1329814dd8dc182109552 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
