summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorailin-nemui <ailin-nemui@users.noreply.github.com>2017-10-24 22:04:13 +0200
committerailin-nemui <ailin-nemui@users.noreply.github.com>2017-10-24 22:04:13 +0200
commit87550541e745627cc78507ce573d68b8453959c9 (patch)
treeeb2cd6d37c36ce6c9348c4c2c7c014290273a8ba
parentcfa51c5ae2c06f4b93f443c986ec0bc316c860a4 (diff)
downloadirssi-87550541e745627cc78507ce573d68b8453959c9.zip
fix key length checker to actually do some work
-rwxr-xr-xautogen.sh16
1 files changed, 1 insertions, 15 deletions
diff --git a/autogen.sh b/autogen.sh
index 60eb4fb8..a9e354c9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,20 +29,6 @@ cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr
files=`echo $files|sed 's/\.in//g'`
cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
-# .html -> .txt with lynx or elinks
-echo "Documentation: html -> txt..."
-if type lynx >/dev/null 2>&1 ; then
- LC_ALL=en_IE.utf8 lynx -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt
-elif type elinks >/dev/null 2>&1 ; then
- elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt
-elif type links >/dev/null 2>&1 ; then
- links -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = " $_"; };' > docs/faq.txt
-else
- echo "**Error**: No lynx or elinks present"
- echo "Install lynx or elinks, then run autogen.sh again"
- exit 1
-fi
-
if test x$NOCONFIGURE = x && test -z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the"
@@ -65,4 +51,4 @@ else
fi
# make sure perl hashes have correct length
-find src/perl -name *.c -o -name *.xs | xargs grep -n hv_store | perl -ne 'if (/"(\w+)",\s*(\d+)/) { print unless $2 == length $1 }'
+find src/perl -name '*.c' -o -name '*.xs' -exec grep -n hv_store {} + | perl -l -ne 'if (/"(\w+)",\s*(\d+)/ && $2 != length $1) { $X=1; print "Incorrect key length in $_" } END { exit $X }'