[ostree/wip/embed-glib: 1/2] build: Add option to disable ostbuild
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree/wip/embed-glib: 1/2] build: Add option to disable ostbuild
- Date: Thu, 7 Jun 2012 21:45:29 +0000 (UTC)
commit 6f1b100d889fc99b1f997801c11ed259ea68d7f3
Author: Colin Walters <walters verbum org>
Date: Thu Jun 7 17:25:26 2012 -0400
build: Add option to disable ostbuild
Makefile-ostbuild.am | 3 +++
configure.ac | 9 ++++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index f038569..b513d32 100644
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -17,6 +17,8 @@
ostbuild: src/ostbuild/ostbuild.in Makefile
sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), $< > $ tmp && mv $ tmp $@
+
+if BUILD_OSTBUILD
bin_SCRIPTS += ostbuild
EXTRA_DIST += src/ostbuild/ostbuild.in
@@ -55,3 +57,4 @@ pyostbuild_PYTHON = \
src/ostbuild/pyostbuild/vcs.py \
$(NULL)
+endif
diff --git a/configure.ac b/configure.ac
index e47c2e5..9b9bb2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,14 @@ if test x$with_libarchive != xno; then
fi
AM_CONDITIONAL(USE_LIBARCHIVE, test $with_libarchive != no)
-AM_PATH_PYTHON([2.7])
+AC_ARG_ENABLE(ostbuild,
+ AC_HELP_STRING([--enable-ostbuild],
+ [build ostbuild]),,
+ enable_ostbuild=yes)
+if test x$enable_ostbuild = xyes; then
+ AM_PATH_PYTHON([2.7])
+fi
+AM_CONDITIONAL(BUILD_OSTBUILD, test x$enable_ostbuild = xyes)
AC_CONFIG_FILES([
Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]