build-sys: use generated libtool-2 stuff

The commit 60a4edd66200be829560dce0d41a02fc70cef4f5 temporary disabled
libtool-2 in autogen.sh. It seems that libtool-2 in available in
many distributions now, so we don't have to manage the generated .m4
libtool files in git anymore.

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/autogen.sh b/autogen.sh
index f8b38097f..d84acb12b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -41,12 +41,12 @@ test -f mount/mount.c || {
 	echo
 	DIE=1
 }
-#(libtool --version) < /dev/null > /dev/null 2>&1 || {
-#	echo
-#	echo "You must have libtool-2 installed to generate util-linux build system."
-#	echo
-#	DIE=1
-#}
+(libtool --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have libtool-2 installed to generate util-linux build system."
+	echo
+	DIE=1
+}
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to generate util-linux build system."
@@ -54,11 +54,11 @@ test -f mount/mount.c || {
 	DIE=1
 }
 
-#ltver=$(libtoolize --version | awk '/^libtoolize/ { print $4 }')
-#test ${ltver##2.} == "$ltver" && {
-#	echo "You must have libtool version >= 2.x.x, but you have $ltver."
-#	DIE=1
-#}
+ltver=$(libtoolize --version | awk '/^libtoolize/ { print $4 }')
+test ${ltver##2.} == "$ltver" && {
+	echo "You must have libtool version >= 2.x.x, but you have $ltver."
+	DIE=1
+}
 
 if test "$DIE" -eq 1; then
 	exit 1
@@ -71,12 +71,12 @@ echo "   aclocal:    $(aclocal --version | head -1)"
 echo "   autoconf:   $(autoconf --version | head -1)"
 echo "   autoheader: $(autoheader --version | head -1)"
 echo "   automake:   $(automake --version | head -1)"
-#echo "   libtoolize: $(libtoolize --version | head -1)"
+echo "   libtoolize: $(libtoolize --version | head -1)"
 
 set -e
 po/update-potfiles
 autopoint --force $AP_OPTS
-#libtoolize --force --copy $LT_OPTS
+libtoolize --force $LT_OPTS
 aclocal -I m4 $AL_OPTS
 autoconf $AC_OPTS
 autoheader $AH_OPTS