Skip to content

Commit

Permalink
build: Fix Rust version to actually be conditional, and off by default
Browse files Browse the repository at this point in the history
Until we land the git2-rs changes (and have the cargo entry reference
code outside of my homedir) there's not much point to enabling it by
default.

Closes #14
  • Loading branch information
cgwalters committed Mar 29, 2016
1 parent b89f9ac commit ecab67e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ LIBS=$BUILDDEP_LIBGIT_GLIB_LIBS
AC_CHECK_FUNCS(git_libgit2_init)
LIBS=$save_LIBS

AC_ARG_ENABLE(rust,
[AS_HELP_STRING([--enable-rust],
[Compile Rust version [default=no]])],,
enable_rust=no)
AS_IF([test "$enable_rust" != no], [
AC_PATH_PROG([CARGO], [cargo])
AS_IF([test -z "$CARGO"], [
Expand Down
2 changes: 2 additions & 0 deletions rust/Makefile-inc.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if ENABLE_RUST
bin_PROGRAMS += git-rustevtag

git-rustevtag: rust/src/main.rs rust/Cargo.toml
(cd rust && cargo build) && cp rust/target/debug/git-rustevtag .
endif

0 comments on commit ecab67e

Please sign in to comment.