Permalink
Browse files

Replace bootstrap with simpler autogen.sh

Copied from HarfBuzz but removed the parts we don’t need.

Fixes the rest of #35
  • Loading branch information...
khaledhosny authored and behdad committed Feb 10, 2018
1 parent 3b5baae commit 8576118c37c8fd0b03f18ba1e56cedbcd5bd658d
Showing with 38 additions and 160 deletions.
  1. +1 −4 .travis.yml
  2. +1 −1 Makefile.am
  3. +1 −1 README.md
  4. +35 −0 autogen.sh
  5. +0 −154 bootstrap
@@ -11,11 +11,8 @@ matrix:
- os: osx
compiler: clang
install:
- ./bootstrap
script:
- ./configure
- ./autogen.sh
- make
- make check || (cat */test-suite.log && false)
- make distcheck || (cat */test-suite.log && false)
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
## The order of subdirs is important, don't change without a reason.
SUBDIRS = gen.tab charset lib bin doc test
EXTRA_DIST = bootstrap ChangeLog.old
EXTRA_DIST = autogen.sh ChangeLog.old
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = @PACKAGE@.pc
@@ -41,7 +41,7 @@ The latest version of GNU FriBidi may be found at:
## Building
Start with running the [`bootstrap`](./bootstrap) script and follow the
Start with running the [`autogen.sh`](./autogen.sh) script and follow the
instructions.
@@ -0,0 +1,35 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
test -n "$srcdir" || srcdir=`dirname "$0"`
test -n "$srcdir" || srcdir=.
olddir=`pwd`
cd $srcdir
echo -n "checking for pkg-config... "
which pkg-config || {
echo "*** No pkg-config found, please install it ***"
exit 1
}
echo -n "checking for libtoolize... "
which glibtoolize || which libtoolize || {
echo "*** No libtoolize (libtool) found, please install it ***"
exit 1
}
echo -n "checking for autoreconf... "
which autoreconf || {
echo "*** No autoreconf (autoconf) found, please install it ***"
exit 1
}
echo "running autoreconf --force --install --verbose"
autoreconf --force --install --verbose || exit $?
cd $olddir
test -n "$NOCONFIGURE" || {
echo "running configure $@"
"$srcdir/configure" "$@"
}
154 bootstrap

This file was deleted.

Oops, something went wrong.

0 comments on commit 8576118

Please sign in to comment.