1 files changed, 8 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh
index ba27501..9a3c9e5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
-WANT_AUTOMAKE=1.8
+test -r autogen.local && source autogen.local
-export WANT_AUTOMAKE
+test -z "$tool_libtoolize" && tool_libtoolize="$(type -P glibtoolize || type -P libtoolize)"
-libtoolize -f \
+if test -z "$tool_libtoolize" ; then
-&& aclocal \
+ echo "Failed to find libtoolize." ; exit 1;
+fi
+   "$tool_libtoolize" -f \
+&& aclocal ${ACLOCAL_FLAGS} \
 && autoheader \
 && automake -a \
 && autoconf \
-&& ./configure "$@"
+&& ./configure ${CONFIGURE_FLAGS} "$@"

diff --git a/autogen.sh b/autogen.sh index ba27501..9a3c9e5 100755 --- a/autogen.sh +++ b/autogen.sh
@@ -1,9 +1,12 @@
1	#!/bin/sh	1	#!/bin/sh
2	WANT_AUTOMAKE=1.8	2	test -r autogen.local && source autogen.local
3	export WANT_AUTOMAKE	3	test -z "$tool_libtoolize" && tool_libtoolize="$(type -P glibtoolize \|\| type -P libtoolize)"
4	libtoolize -f \	4	if test -z "$tool_libtoolize" ; then
5	&& aclocal \	5	echo "Failed to find libtoolize." ; exit 1;
		6	fi
		7	"$tool_libtoolize" -f \
		8	&& aclocal ${ACLOCAL_FLAGS} \
6	&& autoheader \	9	&& autoheader \
7	&& automake -a \	10	&& automake -a \
8	&& autoconf \	11	&& autoconf \
9	&& ./configure "$@"	12	&& ./configure ${CONFIGURE_FLAGS} "$@"