Put the current git commit's short hash in generated programs.

We previously put the SVN revision in generated programs.  Now that
the sources are in git, insert the current commit's short hash instead.

Note that I changed `configure.ac' so that we won't get warnings
about using `:=' assignments in Automake files.  I'm not crazy about
this change; better ways to get the current hash at build time would
be appreciated.
(cherry picked from commit 2365217)

configure

@@ -1970,6 +1970,7 @@ test -n "$target_alias" &&
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+# `-Wno-portability': avoid warnings about using `:=' in `Makefile.am' files.
 am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),

configure.ac

@@ -38,7 +38,8 @@ dnl AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE
+# `-Wno-portability': avoid warnings about using `:=' in `Makefile.am' files.
+AM_INIT_AUTOMAKE([-Wall -Wno-portability])
 
 # Avoid configure-time warnings about `--datarootdir' being ignored.
 # This can perhaps be removed in a few years after Autoconf 2.60.

runtime/Makefile.am

@@ -39,7 +39,8 @@ lib_LIBRARIES = libcsmith.a
 libcsmith_a_SOURCES = \
 	volatile_runtime.c
 
-SVN_FLAG = -DSVN_VERSION=\"`svnversion -n .`\"
+GIT_HASH := $(shell git show -s --format=%h . 2>/dev/null || echo exported)
+GIT_FLAG = -DGIT_VERSION=\"$(GIT_HASH)\"
 
 ## ENE: The idea of stuffing the target CPU name (a string) into a CPP symbol
 ## is kind of awful.  What we should do instead is use the name to modify the
@@ -48,7 +49,7 @@ SVN_FLAG = -DSVN_VERSION=\"`svnversion -n .`\"
 
 libcsmith_a_CPPFLAGS = \
 	-DTARGET_CPU_$(target_cpu)=1 \
-	$(SVN_FLAG)
+	$(GIT_FLAG)
 
 libcsmith_a_includedir = \
 	$(includedir)/$(PACKAGE)-$(VERSION)

runtime/Makefile.in

@@ -204,10 +204,11 @@ lib_LIBRARIES = libcsmith.a
 libcsmith_a_SOURCES = \
 	volatile_runtime.c
 
-SVN_FLAG = -DSVN_VERSION=\"`svnversion -n .`\"
+GIT_HASH := $(shell git show -s --format=%h . 2>/dev/null || echo exported)
+GIT_FLAG = -DGIT_VERSION=\"$(GIT_HASH)\"
 libcsmith_a_CPPFLAGS = \
 	-DTARGET_CPU_$(target_cpu)=1 \
-	$(SVN_FLAG)
+	$(GIT_FLAG)
 
 libcsmith_a_includedir = \
 	$(includedir)/$(PACKAGE)-$(VERSION)

src/Makefile.am

@@ -191,7 +191,8 @@ EXTRA_DIST = \
 	csmith.vcproj \
 	csmith.vcxproj
 
-SVN_FLAG = -DSVN_VERSION=\"`svnversion -n .`\"
+GIT_HASH := $(shell git show -s --format=%h . 2>/dev/null || echo exported)
+GIT_FLAG = -DGIT_VERSION=\"$(GIT_HASH)\"
 
 ## ENE: The idea of stuffing the target CPU name (a string) into a CPP symbol
 ## is kind of awful.  What we should do instead is use the name to modify the
@@ -200,7 +201,7 @@ SVN_FLAG = -DSVN_VERSION=\"`svnversion -n .`\"
 
 csmith_CPPFLAGS = \
 	-DTARGET_CPU_$(target_cpu)=1 \
-	$(SVN_FLAG) \
+	$(GIT_FLAG) \
 	$(BOOST_CPPFLAGS)
 
 csmith_LDFLAGS = $(BOOST_LDFLAGS)

src/Makefile.in

@@ -384,10 +384,11 @@ EXTRA_DIST = \
 	csmith.vcproj \
 	csmith.vcxproj
 
-SVN_FLAG = -DSVN_VERSION=\"`svnversion -n .`\"
+GIT_HASH := $(shell git show -s --format=%h . 2>/dev/null || echo exported)
+GIT_FLAG = -DGIT_VERSION=\"$(GIT_HASH)\"
 csmith_CPPFLAGS = \
 	-DTARGET_CPU_$(target_cpu)=1 \
-	$(SVN_FLAG) \
+	$(GIT_FLAG) \
 	$(BOOST_CPPFLAGS)
 
 csmith_LDFLAGS = $(BOOST_LDFLAGS)

src/OutputMgr.cpp

@@ -362,9 +362,9 @@ OutputMgr::OutputHeader(int argc, char *argv[], unsigned long seed)
 		out << " * This is a RANDOMLY GENERATED PROGRAM." << endl;
 		out << " *" << endl;
 		out << " * Generator: " << PACKAGE_STRING << endl;
-	#ifdef SVN_VERSION
-		out << " * svn version: " << SVN_VERSION << endl;
-	#endif
+#ifdef GIT_VERSION
+		out << " * Git version: " << GIT_VERSION << endl;
+#endif
 		out << " * Options:  ";
 		if (argc <= 1) {
 			out << " (none)";

src/RandomProgramGenerator.cpp

@@ -107,10 +107,9 @@ static void
 print_version(void)
 {
 	cout << PACKAGE_STRING << endl;
-#ifdef SVN_VERSION
-	cout << "svn version: " << SVN_VERSION << endl;
+#ifdef GIT_VERSION
+	cout << "Git version: " << GIT_VERSION << endl;
 #endif
-	// XXX print svn rev!
 	// XXX print copyright, contact info, etc.?
 }