From 6f848030dd6de2e5aa6276a79661c807835b8115 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Fri, 27 Jun 2008 02:26:55 +0200
Subject: Check for tool presence (git, rsync, etc. pp)

---
 Makefile.am  |  5 ++++-
 configure.ac | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index c1e1f40..98cfae7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ if HAVE_NDIM_MAN2TXT
 endif
 
 # Requires git 1.5 to work properly.
-GIT = git
+if HAVE_GIT
 tag:
 	test -d "$(top_srcdir)/.git"
 	@cd "$(top_srcdir)" && $(GIT) status;:
@@ -76,7 +76,9 @@ tag:
 	msgfile="$$PWD/TAG-MESSAGE"; \
 	cd "$(top_srcdir)" && $(GIT) tag -s -F "$$msgfile" "v$(TAG)"; \
 	rm -f "$$msgfile"
+endif
 
+if HAVE_RSYNC
 UPLOAD_DIR = upload-dir
 ALL_UPLOAD_FILES = $(UPLOAD_FILES) $(distdir).tar.bz2
 upload: $(UPLOAD_FILES) dist
@@ -88,6 +90,7 @@ upload: $(UPLOAD_FILES) dist
 	rsync -avz --delete "$(UPLOAD_DIR)/" $(RSYNC_HOST):$(RSYNC_DIR)/$(PACKAGE_TARNAME)/
 	rm -rf "$(UPLOAD_DIR)"
 	if test -d "$(top_srcdir)/.git"; then cd "$(top_srcdir)" && git push public master; fi
+endif
 
 clean-local:
 	rm -rf "$(UPLOAD_DIR)"
diff --git a/configure.ac b/configure.ac
index e54078d..2a3cf36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,33 @@ NDIM_DETECT_MAN2TXT()dnl
 
 ########################################################################
 
+AC_ARG_VAR([GIT], [git revision control system])
+AC_PATH_PROG([GIT], [git], [no])
+AM_CONDITIONAL([HAVE_GIT], [test "x$GIT" != "xno"])
+
+########################################################################
+
+AC_ARG_VAR([RSYNC], [rsync program for synchronizing files over a network])
+AC_PATH_PROG([RSYNC], [rsync], [no])
+AM_CONDITIONAL([HAVE_RSYNC], [test "x$RSYNC" != "xno"])
+
+########################################################################
+
+AC_ARG_VAR([BZR], [bzr revision control system])
+AC_PATH_PROG([BZR], [bzr], [no])
+
+########################################################################
+
+AC_ARG_VAR([SCONS], [scons build toold])
+AC_PATH_PROG([SCONS], [scons], [no])
+
+########################################################################
+
+AC_ARG_VAR([CMAKE], [cmake build toold])
+AC_PATH_PROG([CMAKE], [cmake], [no])
+
+########################################################################
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([GNUmakefile])
 AC_CONFIG_FILES([src/nbblib/package.py:src/nbblib/package.in])
-- 
cgit