From 4575154e1bf867c0c9691c57e508f777c4cd4226 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Mon, 1 Nov 2021 09:39:13 +0000
Subject: [PATCH] Shrink autogen by reading VERSION file directly in
 configure.ac

---
 .gitignore                     | 1 -
 autogen.sh                     | 6 ------
 configure.seed => configure.ac | 2 +-
 scripts/hack_fakeautoconf.sh   | 4 +++-
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename configure.seed => configure.ac (98%)

diff --git a/.gitignore b/.gitignore
index ae2b142..17d6441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.a
 *.gz
 configure
-configure.ac
 config.*
 /Makefile
 tools/Makefile
diff --git a/autogen.sh b/autogen.sh
index 81ba943..b717abd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-N2N_VERSION_SHORT=$(cat VERSION)
-
-cat configure.seed | sed \
-    -e "s/@N2N_VERSION_SHORT@/$N2N_VERSION_SHORT/g" \
-    > configure.ac
-
 rm -f config.h config.h.in *~ Makefile configure #*
 
 echo "Wait please..."
diff --git a/configure.seed b/configure.ac
similarity index 98%
rename from configure.seed
rename to configure.ac
index f4558cc..f7ca2f5 100644
--- a/configure.seed
+++ b/configure.ac
@@ -1,5 +1,5 @@
 odnl> Do not add anything above
-AC_INIT([edge],@N2N_VERSION_SHORT@)
+AC_INIT([edge], m4_esyscmd([cat VERSION | tr -d '\n']))
 dnl> Do not add anything above
 
 N2N_VERSION_SHORT=${PACKAGE_VERSION}
diff --git a/scripts/hack_fakeautoconf.sh b/scripts/hack_fakeautoconf.sh
index 321c9e1..e6163de 100755
--- a/scripts/hack_fakeautoconf.sh
+++ b/scripts/hack_fakeautoconf.sh
@@ -3,8 +3,10 @@
 # Specifically for windows, where installing autoconf looks suspiciously
 # like boiling the ocean.
 
+VERSION=$(cat VERSION)
+
 sed \
-    -e "s%@N2N_VERSION_SHORT@%FIXME%g" \
+    -e "s%@N2N_VERSION_SHORT@%$VERSION%g" \
     -e "s%@GIT_COMMITS@%FIXME%g" \
     -e "s%@CC@%gcc%g" \
     -e "s%@AR@%ar%g" \