From 5a871362c8d598d43463279a41209e83fe327d8c Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Wed, 7 Mar 2018 13:14:58 -0800 Subject: [PATCH] No more stupid autoconf version churn, run autogen.sh from the build scripts --- build | 8 ++++++++ build-debug | 5 +++++ build-debug-g3 | 9 +++++++++ build-debug-g3-sdl2 | 9 +++++++++ build-debug-no-avcodec | 8 ++++++++ build-debug-no-mt32 | 8 ++++++++ build-debug-sdl2 | 9 +++++++++ build-mingw | 8 ++++++++ build-mingw-lowend | 8 ++++++++ 9 files changed, 72 insertions(+) diff --git a/build b/build index d4c886543..d5c13c5b5 100755 --- a/build +++ b/build @@ -1,5 +1,13 @@ #!/bin/bash +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 diff --git a/build-debug b/build-debug index 24a0f2d4c..ea13f7aa4 100755 --- a/build-debug +++ b/build-debug @@ -1,5 +1,10 @@ #!/bin/bash +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + # fix chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh diff --git a/build-debug-g3 b/build-debug-g3 index 8809a0697..b77f51c5a 100755 --- a/build-debug-g3 +++ b/build-debug-g3 @@ -1,4 +1,13 @@ #!/bin/bash + +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + chmod +x configure export CFLAGS="$CFLAGS -g3 -O0 -fno-inline -fno-omit-frame-pointer" diff --git a/build-debug-g3-sdl2 b/build-debug-g3-sdl2 index a9d1b6212..49cfdc03d 100755 --- a/build-debug-g3-sdl2 +++ b/build-debug-g3-sdl2 @@ -1,4 +1,13 @@ #!/bin/bash + +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + chmod +x configure export CFLAGS="$CFLAGS -g3 -O0 -fno-inline -fno-omit-frame-pointer" diff --git a/build-debug-no-avcodec b/build-debug-no-avcodec index c1ec638aa..4b39e3d96 100755 --- a/build-debug-no-avcodec +++ b/build-debug-no-avcodec @@ -1,5 +1,13 @@ #!/bin/bash +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 diff --git a/build-debug-no-mt32 b/build-debug-no-mt32 index 4d89194ae..ef2220b4e 100755 --- a/build-debug-no-mt32 +++ b/build-debug-no-mt32 @@ -1,5 +1,13 @@ #!/bin/bash +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 diff --git a/build-debug-sdl2 b/build-debug-sdl2 index d82c62645..6ea384ca6 100755 --- a/build-debug-sdl2 +++ b/build-debug-sdl2 @@ -1,4 +1,13 @@ #!/bin/bash + +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + chmod +x configure ./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr --enable-sdl2 || exit 1 make -j3 || exit 1 diff --git a/build-mingw b/build-mingw index 78c7c531c..69f17bf71 100644 --- a/build-mingw +++ b/build-mingw @@ -1,5 +1,13 @@ #!/bin/bash +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 diff --git a/build-mingw-lowend b/build-mingw-lowend index b4773c993..f08800e74 100644 --- a/build-mingw-lowend +++ b/build-mingw-lowend @@ -1,5 +1,13 @@ #!/bin/bash +# I'm sick and tired of all the churn the three versions of autoconf +# are causing in this repo. Stop committing the configure scripts +# and just autoregen. +./autogen.sh || exit 1 + +# fix +chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh + # prefer to compile against our own copy of SDL 1.x echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1