[Pkg-wmaker-commits] [wmbiff] 57/84: seek out and use athe underrated automake 1.6.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 03:01:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to tag wmbiff_0_4_10
in repository wmbiff.
commit db1f25d85ce1eab81cd4c21e4cb6035f1d7245ff
Author: bluehal <bluehal>
Date: Tue Aug 6 08:05:33 2002 +0000
seek out and use athe underrated automake 1.6.
---
FromCVS.sh | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/FromCVS.sh b/FromCVS.sh
index 26c3ea8..493ab5f 100755
--- a/FromCVS.sh
+++ b/FromCVS.sh
@@ -7,14 +7,37 @@
# complains if any macro other than its own specifies
# the file
+# it's skanky that I have to look explicitly for a newer
+# version to invoke.
+
+if [ -x /usr/bin/automake-1.6 ]; then
+ echo "Using automake 1.6";
+ AUTOMAKE=automake-1.6
+ ACLOCAL=aclocal-1.6
+else
+ AUTOMAKE=automake
+ ACLOCAL=aclocal
+fi
+
+# debian, at least, handles this one correctly;
+# this hack is for potential redhatters.
+if [ -x /usr/bin/autoconf2.50 ]; then
+ echo "Using autoconf 2.5x";
+ AUTOCONF=autoconf2.50
+ AUTOHEADER=autoheader2.50
+else
+ AUTOCONF=autoconf
+ AUTOHEADER=autoheader
+fi
+
if [ -e /usr/share/aclocal/libgnutls.m4 ]; then
- aclocal;
+ ${ACLOCAL};
else
- aclocal -I autoconf;
+ ${ACLOCAL} -I autoconf;
fi
- autoheader && \
- automake -a && \
- autoconf && \
+ ${AUTOHEADER} && \
+ ${AUTOMAKE} -a && \
+ ${AUTOCONF} && \
./configure && \
make
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list