blob: b016959e7a58829b3316615bc78e095d944b5867 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From: Author: Johannes Schauer <j.schauer@email.de>
Date: Tue, 21 Apr 2015 20:35:22 -0400
Subject: libtoolize_check
---
autogen.sh | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 7464c9d..3e79704 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -91,16 +91,11 @@ do
fi
done
-for command in libtool14 libtool15 libtool glibtool
-do
- URL=$gnu/$pkg/
- if
- testProgram $command
- then
- libtool=$command
- libtoolize=`echo "$libtool" | sed -e 's/libtool/libtoolize/'`
- fi
-done
+if
+ testProgram libtoolize
+then
+ libtoolize=libtoolize
+fi
if [ -z $autoconf ]; then
echo You must have autoconf installed to compile the cluster-glue package.
@@ -114,7 +109,7 @@ elif [ -z $automake ]; then
echo or get the source tarball at: $gnu/automake/
exit 1
-elif [ -z $libtool ]; then
+elif [ -z $libtoolize ]; then
echo You must have libtool installed to compile the cluster-glue package.
echo Download the appropriate package for your system,
echo or get the source tarball at: $gnu/libtool/
@@ -125,7 +120,7 @@ oneline() {
read x; echo "$x"
}
-LT_version=`$libtool --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
+LT_version=`$libtoolize --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
LT_majvers=`echo "$LT_version" | sed -e 's%\..*%%'`
LT_minvers=`echo "$LT_version" | sed -e 's%^[^.]*\.%%' `
LT_minnum=`echo "$LT_minvers" | sed -e 's%[^0-9].*%%'`
@@ -138,8 +133,7 @@ then
fi
# Create local copies so that the incremental updates will work.
-rm -f ./autoconf ./automake ./autoheader ./libtool
-ln -s `which $libtool` ./libtool
+rm -f ./autoconf ./automake ./autoheader
ln -s `which $autoconf` ./autoconf
ln -s `which $automake` ./automake
ln -s `which $autoheader` ./autoheader
|
