diff --git a/autogen.sh b/autogen.sh index 8230b90368..3dcc38f952 100755 --- a/autogen.sh +++ b/autogen.sh @@ -35,7 +35,7 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autocon "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6 automake-1.5" \ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1 -version_check "libtool" "" \ +version_check "libtoolize" "libtoolize libtoolize14" \ "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1 version_check "pkg-config" "" \ "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 @@ -60,7 +60,7 @@ fi toplevel_check $srcfile tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS" -tool_run "libtoolize" "--copy --force" +tool_run "$libtoolize" "--copy --force" tool_run "$autoheader" # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo diff --git a/common b/common index 6757dae288..b4a839c99c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6757dae2885c2c09ad6db243c73946ef387bb044 +Subproject commit b4a839c99c0bf2d4903824426ef3cc0d4b0ad992