From 29e7beed6e387b78c86e985e0c96e24154a01dec Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Mon, 15 Jul 2013 15:07:52 +0200 Subject: configure: silent complaint if not built on git repository This silences a complaint if the toolkit is not built within a Git repository: ... [*] Checking libnet ... [YES] fatal: Not a git repository (or any of the parent directories): .git [*] Generating config.h ... [*] Looks good! All tools will be built! This is not problematic as the build can be done without any problems. It will just have an empty Git id in --version output. So simply silence this complaint and move on. Signed-off-by: Daniel Borkmann --- Makefile | 2 +- configure | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ba24748..b8c0763 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ RMDIR = echo -e " RM\t$(1)" && rmdir --ignore-fail-on-non-empty $(1) 2> /dev/nu GZIP = gzip --best -c # Git related -GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_STRING)/ $(VERSION_STRING) | \ +GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_STRING)/ v$(VERSION_STRING) | \ $(1) > ../netsniff-ng-$(VERSION_STRING).tar.$(2) GIT_TAG = git tag -a $(VERSION_STRING) -s -m "tools: $(VERSION_STRING) release" GIT_LOG = git shortlog -n --not $(shell git describe --always --abbrev=0 --tags) diff --git a/configure b/configure index ccd84f4..5e24313 100755 --- a/configure +++ b/configure @@ -507,7 +507,7 @@ EOF gen_config_hdr() { - local _version="`git describe --always`" + local _version="" local _have_libpcap="" local _have_libgeoip="" local _have_libz="" @@ -515,6 +515,13 @@ gen_config_hdr() echo "[*] Generating config.h ... " + git rev-parse > /dev/null 2>&1 + if [ "$?" == "0" ] ; then + _version="`git describe --always`" + else + _version="(none)" + fi + if [ "$HAVE_LIBPCAP" == "1" ] ; then _have_libpcap="#define HAVE_TCPDUMP_LIKE_FILTER 1" fi -- cgit v1.2.3-54-g00ecf