Make dependency on svnversion/git optional (for devel versionstamp, fixes #2009)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2540 152afb58-edef-0310-8abb-c4023f1b3aa9

NEWS

@@ -56,6 +56,7 @@ NEWS
   * Add X-Sendfile-Range feature (fixes #2005)
   * Fix 100% cpu usage if time() < 0 (thx to gaspa and cate, fixes #1964)
   * Allow max-keep-alive-requests to depend on conditional (fixes #1881)
+  * Make dependency on svnversion/git optional (for devel versionstamp, fixes #2009)
 
 - 1.4.22 - 2009-03-07
   * Fix wrong lua type for CACHE_MISS/CACHE_HIT in mod_cml (fixes #533)

src/Makefile.am

@@ -12,9 +12,15 @@ lighttpd_angel_SOURCES=lighttpd-angel.c
 
 versionstamp:
 	@test -f versionstamp.h || touch versionstamp.h; \
-	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)"; \
-	if test $$REVISION = "exported"; then \
-		REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)"; \
+	REVISION=""; \
+	if test -x "`which svnversion`"; then \
+		REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)"; \
+		if test "$$REVISION" = "exported"; then \
+			REVISION=""; \
+		fi; \
+	fi; \
+	if test -z "$$REVISION" -a -x "`which git`"; then \
+		REVISION="$$(cd "$(top_srcdir)"; LANG=C git describe --always 2>/dev/null || echo)"; \
 	fi; \
 	if test -n "$$REVISION"; then \
 		echo "#define REPO_VERSION \"-devel-$$REVISION\"" > versionstamp.h.tmp; \