tests: (lsfd) fix typoes in an error name

[thirdparty/util-linux.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index c71c0404d4fad3c9f9bc9cf4456ab5aeaa972af9..833f90415f5c51c3351d7c196b1fd1ae082ae82d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -73,6 +73,9 @@ test -f sys-utils/mount.c ||
 [ -x "$(command -v gettext)" -o -x "$(command -v xgettext)" ] ||
        warn_mesg "You need have [x]gettext binary installed to update po/ stuff."
 
+(flex --version) < /dev/null > /dev/null 2>&1 ||
+       error_mesg "You must have flex installed to build the util-linux."
+
 if ! (bison --version) < /dev/null > /dev/null 2>&1; then
        error_mesg "You must have bison installed to build the util-linux."
 else
@@ -86,6 +89,7 @@ else
        esac
 fi
 
+
 LIBTOOLIZE=libtoolize
 case `uname` in Darwin*) LIBTOOLIZE=glibtoolize ;; esac
 if ! ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
@@ -112,6 +116,7 @@ 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 "   flex:       $(flex --version | head -1)"
 echo "   bison:      $(bison --version | head -1)"
 echo
 
@@ -134,10 +139,12 @@ if test -f tools/libtool.m4.patch; then
                rm m4/libtool.m4
                mv m4/libtool.m4.org m4/libtool.m4
        fi
+       set +e
        patch --batch --dry -p1 < tools/libtool.m4.patch > /dev/null 2>&1
        if [ "$?" -eq 0 ]; then
                patch -p1 --batch < tools/libtool.m4.patch
        fi
+       set -e
 fi
 
 aclocal -I m4 $AL_OPTS