From 60a4edd66200be829560dce0d41a02fc70cef4f5 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Mon, 16 Feb 2009 10:40:25 +0100
Subject: build-sys: add temporary libtool *.m4 stuff

We require libtool-2 (because old 1.5.x is crap). Unfortunately,
libtool-2 is still not available in many Linux distributions  -- now I
see it in unstable distributions only. The painless way how to resolve
this problem is to __temporary__ commit generated libtool-2 stuff to
our repository.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 autogen.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index f597b7147..61b7bd96b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,13 +29,13 @@ DIE=0
 	DIE=1
 }
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have libtool-2 installed to generate util-linux-ng build system."
-	echo "Download the appropriate package for your distribution,"
-	echo "or see http://www.gnu.org/software/libtool"
-	DIE=1
-}
+#(libtool --version) < /dev/null > /dev/null 2>&1 || {
+#	echo
+#	echo "You must have libtool-2 installed to generate util-linux-ng build system."
+#	echo "Download the appropriate package for your distribution,"
+#	echo "or see http://www.gnu.org/software/libtool"
+#	DIE=1
+#}
 
 (automake --version) < /dev/null > /dev/null 2>&1 || {
 	echo
@@ -62,11 +62,11 @@ test -f mount/mount.c || {
 	exit 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."
-	exit 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."
+#	exit 1
+#}
 
 echo
 echo "Generate build-system by:"
@@ -75,12 +75,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)"
 echo
 
 set -e
 autopoint --force $AP_OPTS
-libtoolize --force --copy $LT_OPTS
+#libtoolize --force --copy $LT_OPTS
 aclocal -I m4 $AL_OPTS
 autoconf $AC_OPTS
 autoheader $AH_OPTS
-- 
cgit v1.2.3-55-g7522