From 1ef642bf33b7b5aa608a3607963ed45841f0f508 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 29 Nov 2015 22:04:32 +0100 Subject: [PATCH] autostuff: get rid of the bootstrap script Running autoreconf when AC_CONFIG_MACRO_DIR does not exist ends up in a failure. Unfortunately, git does not track empty directories. That's why we have bootstrap, which creates it before running autoreconf. Add an empty, dummy file in there and track it, so we can get rid of our bootstrap script. Update the README file accordingly. We're left with a stray, generated autom4te.cache file, but that's a minor annoyance. Signed-off-by: "Yann E. MORIN" --- README | 4 ++++ bootstrap | 17 ----------------- scripts/.autostuff/m4/.empty | 0 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100755 bootstrap create mode 100644 scripts/.autostuff/m4/.empty diff --git a/README b/README index 4c8ade7..2a3ebd3 100644 --- a/README +++ b/README @@ -39,3 +39,7 @@ For a list of known issues, please also refer to file docs/known-issues.txt. Note that, provided you have the required dependencies, all frontends are properly built if you link dynamically. The following just works as expected: ./configure && make + +Note: if using the git tree, or changing the autostuff sources, you'll first +have to run: + autoreconf -fi diff --git a/bootstrap b/bootstrap deleted file mode 100755 index 4dd9407..0000000 --- a/bootstrap +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e - -printf "Creating macrodir...\n" -macrodir="$( sed -e '/^AC_CONFIG_MACRO_DIR(\[\(.*\)\])/!d;' \ - -e 's//\1/;' \ - configure.ac \ - )" -mkdir -p "${macrodir}" - -printf "Running autoreconf...\n" -autoreconf -f -i -Wall - -# Cleanup the useless stuff... :-( -rm -rf autom4te.cache - -printf "Done. You may now run:\n ./configure\n" diff --git a/scripts/.autostuff/m4/.empty b/scripts/.autostuff/m4/.empty new file mode 100644 index 0000000..e69de29 -- 2.39.5