blob: 81b9fc2a5d26b26e28140824e264eb8a674b6989 (
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
|
--- bootstrap.orig 2006-09-07 13:19:28.000000000 -0500
+++ bootstrap 2009-07-13 19:56:34.000000000 -0500
@@ -23,7 +23,7 @@
libtool_version=`$LIBTOOLIZE --version | sed 's/.*) \([0-9.][0-9.]*\).*/\1/'`
# echo libtool version: $libtool_version
case $libtool_version in
- 1.4*|1.5*)
+ 1.4*|1.5*|2.2*)
have_libtool=true
;;
esac
@@ -60,7 +60,7 @@
automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
# echo automake version: $automake_version
case $automake_version in
- 1.7*|1.8*|1.9*)
+ 1.7*|1.8*|1.9*|1.[1-9][0-9]*)
have_automake=true
;;
esac
@@ -96,27 +96,3 @@
$AUTOMAKE --add-missing --copy || exit $?
$AUTOCONF || exit $?
-
-cd $ORIGDIR || exit $?
-
-echo
-echo "I am going to run ./configure with the following arguments:"
-echo
-echo " --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS $@"
-echo
-
-if test -z "$*"; then
- echo "If you wish to pass additional arguments, please specify them "
- echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS "
- echo "environment variable."
- echo
-fi
-
-$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@"
-RC=$?
-if test $RC -ne 0; then
- echo
- echo "Configure failed or did not finish!"
- exit $RC
-fi
-
|
