Browse Source

[autobuild] use autoreconf instead of calling tools manually; update .gitignore

personal/stbuehler/wip
Stefan Bühler 6 years ago
parent
commit
b329a39026
2 changed files with 8 additions and 30 deletions
  1. +5
    -3
      .gitignore
  2. +3
    -27
      autogen.sh

+ 5
- 3
.gitignore View File

@@ -1,14 +1,16 @@
*build/
autom4te.cache/
m4/
Makefile.in
aclocal.m4
ar-lib
autom4te.cache
compile
config.guess
config.sub
configure
depcomp
include/lighttpd/config.h.in
include/lighttpd/config.h.in~
install-sh
ltmain.sh
m4
missing
include/lighttpd/config.h.in

+ 3
- 27
autogen.sh View File

@@ -1,20 +1,6 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.

if which glibtoolize >/dev/null 2>&1; then
LIBTOOLIZE=${LIBTOOLIZE:-glibtoolize}
else
LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
fi
LIBTOOLIZE_FLAGS="--copy --force"
ACLOCAL=${ACLOCAL:-aclocal}
AUTOHEADER=${AUTOHEADER:-autoheader}
AUTOMAKE=${AUTOMAKE:-automake}
AUTOMAKE_FLAGS="--add-missing --copy"
AUTOCONF=${AUTOCONF:-autoconf}

ARGV0=$0

set -e

if [ ! -f configure.ac -o ! -f COPYING ]; then
@@ -22,17 +8,7 @@ if [ ! -f configure.ac -o ! -f COPYING ]; then
exit 1
fi

run() {
echo "$ARGV0: running \`$@'"
$@
}

run rm -f aclocal.m4 ar-lib config.guess config.sub configure depcomp instal-sh ltmain.sh missing
run rm -rf m4 autom4te.cache

run $LIBTOOLIZE $LIBTOOLIZE_FLAGS
run $ACLOCAL $ACLOCAL_FLAGS
run $AUTOHEADER
run $AUTOMAKE $AUTOMAKE_FLAGS
run $AUTOCONF
# old autoreconf/aclocal versions fail hard if m4 doesn't exist
mkdir -p m4
autoreconf --force --install
echo "Now type './configure ...' and 'make' to compile."

Loading…
Cancel
Save