Skip to content

Commit 86a0958

Browse files
committed
quieter bootstrap
and tiny config fixes
1 parent 029cc19 commit 86a0958

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
INSTALL
12
test-driver
23
test/test-suite.log
34
test/test_all.sh.log

bootstrap.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rm -f src/*.o src/nip2 src/Makefile src/Makefile.in
1313
ACDIR=`aclocal --print-ac-dir`
1414

1515
# OS X with brew sets ACDIR to
16-
# /usr/local/Cellar/automake/1.13.1/share/aclocal, the staging area, which is
16+
# /usr/local/Cellar/automake/x.y.z/share/aclocal, the staging area, which is
1717
# totally wrong argh
1818
if [ ! -d $ACDIR ]; then
1919
ACDIR=/usr/local/share/aclocal
@@ -24,12 +24,11 @@ cp $ACDIR/codeset.m4 m4
2424
cp $ACDIR/gettext.m4 m4
2525
cp $ACDIR/glibc21.m4 m4
2626
cp $ACDIR/iconv.m4 m4
27-
cp $ACDIR/isc-posix.m4 m4
2827
cp $ACDIR/lcmessage.m4 m4
2928
cp $ACDIR/progtest.m4 m4
3029

3130
# some systems need libtoolize, some glibtoolize ... how annoying
32-
echo testing for glibtoolize ...
31+
echo -n "testing for glibtoolize ... "
3332
if glibtoolize --version >/dev/null 2>&1; then
3433
LIBTOOLIZE=glibtoolize
3534
echo using glibtoolize
@@ -39,7 +38,9 @@ else
3938
fi
4039

4140
aclocal
42-
glib-gettextize --force --copy
41+
# this produces a lot of benign but misleading output ... hide it and hope for
42+
# the best
43+
glib-gettextize --force --copy > /dev/null
4344
test -r aclocal.m4 && chmod u+w aclocal.m4
4445
autoconf
4546
autoheader

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Process this file with autoconf to produce a configure script.
22

3-
AC_INIT([nip2], [8.3.0])
3+
AC_INIT([nip2], [8.3.0], [[email protected]])
44

55
# foreign stops complaints about a missing README (we use README.md instead)
66
# and missing INSTALL (the standard Gnu INSTALL is not very useful)
7-
AM_INIT_AUTOMAKE([-Wall foreign])
7+
AM_INIT_AUTOMAKE([-Wno-portability foreign])
88

99
AC_CONFIG_HEADERS(config.h)
1010
AC_CONFIG_MACRO_DIR([m4])

0 commit comments

Comments
 (0)