build-sys: Use autoreconf in bootstrap.sh
Most of the stuff in bootstrap.sh seemed to reimplement autoreconf, badly. I don't understand the wisdom behind the run_versioned trickery. configure.ac states that we require Automake 1.11, so apparently the VERSION variable in bootstrap.sh was out of date. Instead of bumping the version number, I replaced the cruft with an autoreconf call.
This commit is contained in:
parent
cbf3acb543
commit
1f037dc341
51
bootstrap.sh
51
bootstrap.sh
|
@ -17,57 +17,16 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
|
# along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
VERSION=1.9
|
|
||||||
|
|
||||||
run_versioned() {
|
|
||||||
local P
|
|
||||||
local V
|
|
||||||
|
|
||||||
V=$(echo "$2" | sed -e 's,\.,,g')
|
|
||||||
|
|
||||||
if [ -e "`which $1$V 2> /dev/null`" ] ; then
|
|
||||||
P="$1$V"
|
|
||||||
else
|
|
||||||
if [ -e "`which $1-$2 2> /dev/null`" ] ; then
|
|
||||||
P="$1-$2"
|
|
||||||
else
|
|
||||||
P="$1"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
shift 2
|
|
||||||
"$P" "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
|
if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
|
||||||
cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
|
cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
|
||||||
chmod +x .git/hooks/pre-commit && \
|
chmod +x .git/hooks/pre-commit && \
|
||||||
echo "Activated pre-commit hook."
|
echo "Activated pre-commit hook."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "x$1" = "xam" ] ; then
|
intltoolize --force --automake
|
||||||
run_versioned automake "$VERSION" -a -c --foreign
|
autoreconf --force --install --symlink
|
||||||
./config.status
|
|
||||||
else
|
|
||||||
rm -rf autom4te.cache
|
|
||||||
rm -f config.cache
|
|
||||||
|
|
||||||
rm -f Makefile.am~ configure.ac~
|
if test "x$NOCONFIGURE" = "x"; then
|
||||||
# Evil, evil, evil, evil hack
|
CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
|
||||||
sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force
|
make clean
|
||||||
test -f Makefile.am~ && mv Makefile.am~ Makefile.am
|
|
||||||
test -f configure.ac~ && mv configure.ac~ configure.ac
|
|
||||||
|
|
||||||
intltoolize --copy --force --automake
|
|
||||||
run_versioned aclocal "$VERSION" -I m4
|
|
||||||
run_versioned autoconf 2.59 -Wall
|
|
||||||
run_versioned autoheader 2.59
|
|
||||||
run_versioned automake "$VERSION" -a -c --foreign
|
|
||||||
|
|
||||||
if test "x$NOCONFIGURE" = "x"; then
|
|
||||||
CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"
|
|
||||||
make clean
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue