From d2c9eb633008931a792e8bf5c710ea0e00b6ff4c Mon Sep 17 00:00:00 2001
From: Colum Paget <colum.paget@axiomgb.com>
Date: Tue, 18 Jun 2024 14:12:09 +0100
Subject: [PATCH] fix 'make check', compile without zlib or openssl

---
 CHANGELOG                           |    6 +
 Makefile                            |   10 +-
 Makefile.in                         |    2 +-
 README.md                           |   21 +-
 cgi.c                               |   15 +-
 check-hash.c                        |    2 +-
 check.sh                            |   42 +-
 common.h                            |    2 +-
 configure                           |  119 +-
 configure.ac                        |   49 +-
 find.c                              |    7 +-
 find.h                              |    2 +-
 fingerprint.c                       |    4 +-
 include-exclude.c                   |    1 -
 libUseful-5/CHANGELOG               |   40 +-
 libUseful-5/Compression.c           |    4 +-
 libUseful-5/DataParser.c            |   88 +-
 libUseful-5/Encodings.c             |   68 +-
 libUseful-5/FileSystem.c            |    2 +-
 libUseful-5/GeneralFunctions.c      |   70 +-
 libUseful-5/HttpServer.c            |    7 +-
 libUseful-5/Inet.h                  |    0
 libUseful-5/LICENCE                 |    0
 libUseful-5/Makefile                |   39 +-
 libUseful-5/Makefile.in             |   35 +-
 libUseful-5/Markup.h                |    0
 libUseful-5/OAuth.c                 |    2 +-
 libUseful-5/OTP.c                   |   38 +-
 libUseful-5/OpenSSL.c               |  254 +-
 libUseful-5/Process.c               |    2 +
 libUseful-5/README.md               |    0
 libUseful-5/Socket.c                |   14 +-
 libUseful-5/Socket.h                |    4 +
 libUseful-5/SpawnPrograms.c         |   32 +-
 libUseful-5/Ssh.h                   |    0
 libUseful-5/Stream.c                |   40 +-
 libUseful-5/Stream.h                |   42 +-
 libUseful-5/StreamAuth.c            |    6 +-
 libUseful-5/Terminal.c              |    8 +-
 libUseful-5/Terminal.h              |    4 +
 libUseful-5/TerminalChoice.h        |   18 +-
 libUseful-5/TerminalProgress.c      |   63 +
 libUseful-5/TerminalProgress.h      |   82 +
 libUseful-5/TerminalTheme.c         |   27 +-
 libUseful-5/TerminalWidget.c        |   26 +-
 libUseful-5/TerminalWidget.h        |    2 +-
 libUseful-5/URL.h                   |    0
 libUseful-5/Unicode.c               |    2 +-
 libUseful-5/Users.c                 |   19 +-
 libUseful-5/Users.h                 |    8 +-
 libUseful-5/base32.c                |  110 +-
 libUseful-5/base64.h                |    0
 libUseful-5/configure               | 3811 ++++++++++++++++-----------
 libUseful-5/configure.ac            |  102 +-
 libUseful-5/examples/.Hash.c.swp    |  Bin 12288 -> 0 bytes
 libUseful-5/examples/Hash.c         |    2 +-
 libUseful-5/examples/Makefile       |    1 +
 libUseful-5/examples/TermProgress.c |   28 +
 libUseful-5/examples/base32.c       |   11 +-
 libUseful-5/examples/ssh-time.c     |   31 +
 libUseful-5/includes.h              |    0
 libUseful-5/libUseful.h             |    1 +
 libUseful-5/md5-global.h            |    0
 main.c                              |    8 +-
 output.c                            |    7 +-
 xdialog.c                           |    2 +-
 66 files changed, 3430 insertions(+), 2012 deletions(-)
 mode change 100755 => 100644 libUseful-5/Inet.h
 mode change 100755 => 100644 libUseful-5/LICENCE
 mode change 100755 => 100644 libUseful-5/Makefile.in
 mode change 100755 => 100644 libUseful-5/Markup.h
 mode change 100755 => 100644 libUseful-5/README.md
 mode change 100755 => 100644 libUseful-5/Ssh.h
 create mode 100644 libUseful-5/TerminalProgress.c
 create mode 100644 libUseful-5/TerminalProgress.h
 mode change 100755 => 100644 libUseful-5/URL.h
 mode change 100755 => 100644 libUseful-5/base64.h
 mode change 100755 => 100644 libUseful-5/configure.ac
 delete mode 100644 libUseful-5/examples/.Hash.c.swp
 create mode 100644 libUseful-5/examples/TermProgress.c
 create mode 100644 libUseful-5/examples/ssh-time.c
 mode change 100755 => 100644 libUseful-5/includes.h
 mode change 100755 => 100644 libUseful-5/md5-global.h

diff --git a/CHANGELOG b/CHANGELOG
index f1976ab..9c03d7c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+v1.20 (2024-06-18)
+  * Bring "make check" (check.sh) up to date with latest functioning of hashrat
+  * Compile if openssl not available (update to latest libUseful)
+  * Honor stdin-supplied hash type when using 'match' (-m) functionality
+  * Add -enable-harden, --enable-zlib and other options to ./configure
+
 v1.19 (2024-01-15)
   * Don't push comment to clipboard, just code/hash.
 
diff --git a/Makefile b/Makefile
index 28f5cc5..bc1055a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 CC = gcc
-CFLAGS = -g -O2
-LIBS = libUseful-5/libUseful.a -lssl -lcrypto  
+CFLAGS = -g -O2 -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong
+LIBS = libUseful-5/libUseful.a -lssl -lcrypto -lz  
 INSTALL=/usr/bin/install -c
-prefix=/usr
+prefix=/usr/local
 bindir=$(prefix)${exec_prefix}/bin
-FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1
+FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1
 OBJ=common.o encodings.o command-line-args.o ssh.o http.o fingerprint.o include-exclude.o files.o filesigning.o xattr.o check-hash.o find.o otp.o memcached.o frontend.o cgi.o xdialog.o output.o
 EXE=hashrat
 
@@ -74,7 +74,7 @@ check: hashrat
 	@./check.sh
 
 clean:
-	-rm -f *.o */*.o */*.a */*.so *.orig $(EXE)
+	-rm -f *.o */*.o */*.a */*.so *.orig *.out $(EXE)
 	-rm -f config.log config.status */config.log */config.status
 	-rm -fr autom4te.cache */autom4te.cache
 
diff --git a/Makefile.in b/Makefile.in
index b4058f3..c698652 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ check: hashrat
 	@./check.sh
 
 clean:
-	-rm -f *.o */*.o */*.a */*.so *.orig $(EXE)
+	-rm -f *.o */*.o */*.a */*.so *.orig *.out $(EXE)
 	-rm -f config.log config.status */config.log */config.status
 	-rm -fr autom4te.cache */autom4te.cache
 
diff --git a/README.md b/README.md
index fa5aafa..47104b6 100644
--- a/README.md
+++ b/README.md
@@ -67,8 +67,8 @@ OPTIONS
   -period <n>     Produce TOTP code with period/lifetime of <n> seconds.
   -8              Encode with octal instead of hex
   -10             Encode with decimal instead of hex
-  -H              Encode with UPPERCASE hexadecimal
-  -HEX            Encode with UPPERCASE hexadecimal
+  -H              Encode with UPPERCASE hexadecimal instead of lowercase
+  -HEX            Encode with UPPERCASE hexadecimal instead of lowercase
   -32             Encode with base32 instead of hex
   -base32         Encode with base32 instead of hex
   -c32            Encode with Crockford base32 instead of hex
@@ -348,7 +348,6 @@ Hashrat can be used as a TOTP authenticator, and defaults to google-authenticato
 
 
 
-
 HOOKSCRIPTS
 ===========
 
@@ -359,6 +358,22 @@ Hookscripts, defined using the `-h` or `-hook` command-line options, are scripts
 * 'Find duplicates' mode: The hookscript is called if a file is a duplicate of another file. It is passed the paths of both files.
 
 
+
+MATCH Mode
+==========
+
+The '-m' function allows matching a list of file hashes input on stdin. It differs from check mode in that, instead of checking a specific file against a hash supplied for the file, it accepts a hash and goes looking for any files that match that hash. However, this causes problems if different hash functions are used in the file input. Hashrat's native format allows specifying the hash-type that is supplied on a hash-by-hash basis. This works fine for 'check' mode, but in 'match' mode hashrat does not know which fingerprint/hash a file will match before it hashes it. Therefore hashrat will expect all the supplied hashes to be the same hash format when in match mode. This if suppling native-format hashes like this:
+
+```
+hash='sha1:c04b4a87e789eceb7c10c2d6a785f91820bf9db4' type='file' mode='100664' uid='1000' gid='1000' size='5759' mtime='1718700145' inode='8436275' path='tests/help.txt'
+hash='md5:10fc712fd1298e2cb7a34303242d8ae4' type='file' mode='100664' uid='1000' gid='1000' size='621' mtime='1718700145' inode='8436276' path='tests/quotes.txt'
+```
+
+Hashrat will honor the LAST format given (in this case md5) and use it for matching all files.
+
+Basically, don't mix hash types when using 'match' mode.
+
+
 CGI Mode
 ========
 
diff --git a/cgi.c b/cgi.c
index d55f51b..6e27fe2 100644
--- a/cgi.c
+++ b/cgi.c
@@ -19,8 +19,8 @@ static void CGIPrintSelect(const char *Name, const char *CurrType, ListNode *Ite
     Curr=ListGetNext(Items);
     while(Curr)
     {
-        if (StrValid(CurrType) && (strcmp(Curr->Tag,CurrType)==0)) printf("<option selected value=%s> %s\r\n",Curr->Tag, Curr->Item);
-        else printf("<option value=%s> %s\r\n",Curr->Tag, Curr->Item);
+        if (StrValid(CurrType) && (strcmp(Curr->Tag,CurrType)==0)) printf("<option selected value=%s> %s\r\n",Curr->Tag, (char *) Curr->Item);
+        else printf("<option value=%s> %s\r\n",Curr->Tag, (char *) Curr->Item);
         Curr=ListGetNext(Curr);
     }
     printf("</select>\r\n");
@@ -146,7 +146,7 @@ static void CGIDrawHashResult(const char *Hash)
     printf("<tr><th bgcolor=red><font color=white>Your Hash is:</font></th></tr>\r\n");
 //	printf("<tr><td><b>%s</b></td>\r\n",Hash);
 //	printf("<tr><td>Here it is in a text box so you can 'select all'</td>\r\n");
-    printf("<tr><td align=center><textarea align=center rows=1 cols=%d readonly style=\"font-weight: bold;  font-size:16px\">%s</textarea></td>\n",StrLen(Hash)+2, Hash);
+    printf("<tr><td align=center><textarea align=center rows=1 cols=%lu readonly style=\"font-weight: bold;  font-size:16px\">%s</textarea></td>\n",StrLen(Hash)+2, Hash);
     printf("</table>\r\n");
     printf("<p /><p />\r\n");
 }
@@ -219,8 +219,7 @@ void CGIDisplayPage()
 //as root, or something like that, let's try to chroot, so no weird attacks are possible
 
 //shouldn't work, because we shouldn't be running as root
-    chdir("/var/empty");
-    chroot(".");
+    if (chdir("/var/empty")==0) chroot(".");
 
 //Send HTTP Headers
     printf("Content-type: text/html\r\n");
@@ -249,7 +248,7 @@ void CGIDisplayPage()
         i=MatchTokenFromList(Encoding, EncodingNames, 0);
         if (i > -1) Ctx->Encoding=Encodings[i];
 
-        if (StrLen(LineEnding))
+        if (StrValid(LineEnding))
         {
             if (strcmp(LineEnding, "crlf")==0) Text=CatStr(Text,"\r\n");
             if (strcmp(LineEnding, "lf")==0) Text=CatStr(Text,"\n");
@@ -273,9 +272,9 @@ void CGIDisplayPage()
         printf("<input type=hidden name=\"LineEnding\" value=\"%s\">\n",LineEnding);
         printf("<input type=hidden name=\"OutputLength\" value=\"%d\">\n",OutputLength);
         printf("<input type=hidden name=\"SegmentLength\" value=\"%d\">\n",SegmentLength);
-        if (StrLen(SegmentChar)) printf("<input type=hidden name=\"SegmentChar\" value=\"%s\">\n",SegmentChar);
+        if (StrValid(SegmentChar)) printf("<input type=hidden name=\"SegmentChar\" value=\"%s\">\n",SegmentChar);
         printf("<input type=hidden name=\"NoOptions\" value=\"Y\">\n");
-        //if (StrLen(OptionsFile)) printf("<input type=hidden name=\"OptionsFile\" value=\"%d\">\n",OptionsFile);
+        //if (StrValid(OptionsFile)) printf("<input type=hidden name=\"OptionsFile\" value=\"%d\">\n",OptionsFile);
     }
     else CGIDisplayOptions(HashType, Encoding, LineEnding, OutputLength);
 
diff --git a/check-hash.c b/check-hash.c
index 8a87fb4..90f0b17 100644
--- a/check-hash.c
+++ b/check-hash.c
@@ -137,7 +137,7 @@ int CheckHashesFromList(HashratCtx *Ctx)
     FP=FingerprintRead(ListStream);
     while (FP)
     {
-        if (StrLen(FP->HashType)) Ctx->HashType=CopyStr(Ctx->HashType, FP->HashType);
+        if (StrValid(FP->HashType)) Ctx->HashType=CopyStr(Ctx->HashType, FP->HashType);
         if (StatFile(Ctx,FP->Path,&Stat) != -1) HashItem(Ctx, Ctx->HashType, FP->Path, &Stat, &HashStr);
 
         if (! HashratCheckFile(Ctx, FP->Path, &Stat, HashStr, FP)) Errors++;
diff --git a/check.sh b/check.sh
index 9636e8a..7d9f709 100755
--- a/check.sh
+++ b/check.sh
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/bash 
 
 EXIT=0
 
@@ -42,6 +42,7 @@ fi
 while [ "$I" -lt "$ITER" ]
 do
 	HR_OUT=`echo -n "The sky above the port was the color of television, tuned to a dead channel. " | ./hashrat -$1`
+
 	if [ "$HR_OUT" != "$3" ]
 	then
 		RESULT=FAIL
@@ -61,7 +62,7 @@ fi
 
 TestLocate()
 {
-HR_OUT=`echo $1 | ./hashrat -m -r .`
+HR_OUT=`echo $1 | ./hashrat -m -md5 -r .`
 
 if [ "$HR_OUT" = "$2" ]
 then
@@ -75,7 +76,7 @@ fi
 TestLocateHook()
 {
 rm -f locatehook.out
-HR_OUT=`echo $1 | ./hashrat -m -r . -hook "echo found > locatehook.out"`
+HR_OUT=`echo $1 | ./hashrat -m -md5 -r . -hook "echo found > locatehook.out"`
 
 if [ -e locatehook.out ]
 then
@@ -98,16 +99,16 @@ FindDuplicates)
 ;;
 
 HashFile)
-	HR_OUT=`./hashrat $2`
+	HR_OUT=`./hashrat -md5 $2`
 	EXIT_FOUND=$?
 	HR_OUT=`./hashrat nonexistent 2>/dev/null`
 	EXIT_NOTFOUND=$?
 ;;
 
 *) 
-	HR_OUT=`echo $1 $2 | ./hashrat $3 2>/dev/null`
+	HR_OUT=`echo $1 $2 | ./hashrat -md5 $3 2>/dev/null`
 	EXIT_FOUND=$?
-	HR_OUT=`echo $1x $2 | ./hashrat $3 2>/dev/null`
+	HR_OUT=`echo $1x $2 | ./hashrat -md5 $3 2>/dev/null`
 	EXIT_NOTFOUND=$?
 ;;
 esac
@@ -149,21 +150,22 @@ TestHash whirlpool "1000 whirlpool" b690486285b18a9cbea3105a8f7e8ee439ef878530fe
 TestHash jh384 "1000 jh384" 55c63e4c22303227495c076ba0b11cda09a77856b98ee7d285283509415ca47141b09136daaada9fa3f10522456484db 1000
 
 Title "Testing Encoding"
-TestHash 8 "base 8 (octal) encoding" 150350216173106240373330245114211062322251161015
-TestHash 10 "base 10 (decimal) encoding" 104232142123070160251216165076137050210169113013
-TestHash HEX "UPPERCASE base 16 (HEX) encoding" 68E88E7B46A0FBD8A54C8932D2A9710D
-TestHash 64 "base 64 encoding" aOiOe0ag+9ilTIky0qlxDQ==
-TestHash u64 "uu-encode style base 64 encoding" ":.B.>T:@^]BE3(DRTJEQ#0''"
-TestHash x64 "xx-encode style base 64 encoding" "OCWCSoOUyxWZH6YmoeZl1E++"
-TestHash p64 "'website compatible' base 64 encoding" "PDXDToPVyxX_I8Zmoe_l3F"
-TestHash a85 "ASCII85 encoding" "B]tJ7\KYV+c_d]%3"
-TestHash z85 "ZEROMQ85 encoding" "wX%ElWFTQ9+Z=X4h"
+TestHash 8 "base 8 (octal) encoding" 322177026032202322203112374315246277301321013040044374156300
+TestHash 10 "base 10 (decimal) encoding" 210127022026130210131074252205166191193209011032036252110192
+TestHash 16 "lowercase base 16 (hex) encoding" d27f161a82d2834afccda6bfc1d10b2024fc6ec0
+TestHash HEX "UPPERCASE base 16 (HEX) encoding" D27F161A82D2834AFCCDA6BFC1D10B2024FC6EC0
+TestHash 32 "base 32 encoding" "2J7RMGUC2KBUV7GNU274DUILEASPY3WA========"
+TestHash 64 "base 64 encoding" "0n8WGoLSg0r8zaa/wdELICT8bsA="
+TestHash x64 "xx-encode style base 64 encoding" "obwK4c9GUofwnOOzkR2960HwPg++"
+TestHash p64 "'website compatible' base 64 encoding" "obwL6cAHVofwnPPzkS4A82IwQg0"
+TestHash a85 "ASCII85 encoding" 'dXN#K$o9r6;+_9iW,lDP'
+TestHash z85 "ZEROMQ85 encoding" "=SI2F3[n}kp9Zn?Ra>yK"
 
 
 Title "Testing Misc. Features"
 
 HR_OUT=`./hashrat -version`
-if [ "$HR_OUT" = "version: 1.15" ]
+if [ "$HR_OUT" = "version: 1.20" ]
 then
 	OkayMessage "Version (-version) works"
 else
@@ -197,7 +199,7 @@ else
 fi
 
 HR_OUT=`./hashrat -trad -f tests/test.lst | ./hashrat -trad -md5`
-if [ "$HR_OUT" = "85842879a67baa126b105130ed3f7683" ]
+if [ "$HR_OUT" = "d6ab85e877b3bef43975a168f22be006" ]
 then
 	OkayMessage "File hashing from a listfile works"
 else
@@ -206,7 +208,7 @@ fi
 
 
 HR_OUT=`cat tests/test.lst | ./hashrat -trad -f - | ./hashrat -trad -md5`
-if [ "$HR_OUT" = "85842879a67baa126b105130ed3f7683" ]
+if [ "$HR_OUT" = "d6ab85e877b3bef43975a168f22be006" ]
 then
 	OkayMessage "File hashing from a list on stdin works"
 else
@@ -248,10 +250,10 @@ TestLocateHook "hash='md5:6933ee7eb504d29312b23a47d2dac374' mode='100644' uid='0
 
 Title "Testing exit codes for different operations"
 TestExitCodes "6ec9de513a8ff1768eb4768236198cf3" "tests/help.txt" "" "HashFile"
-TestExitCodes "tests" "libUseful-4" "-r -dups" "FindDuplicates"
+TestExitCodes "tests" "libUseful-5" "-r -dups" "FindDuplicates"
 TestExitCodes "6ec9de513a8ff1768eb4768236198cf3" "tests/help.txt" "-cf" "CheckHash"
 TestExitCodes "6ec9de513a8ff1768eb4768236198cf3" "tests/help.txt" "-m -r ." "Locate"
-TestExitCodes "tests" "libUseful-4" "-r -dups" "FindDuplicates"
+TestExitCodes "tests" "libUseful-5" "-r -dups" "FindDuplicates"
 
 echo
 echo
diff --git a/common.h b/common.h
index ceb4dda..6cff64a 100644
--- a/common.h
+++ b/common.h
@@ -5,7 +5,7 @@
 #include "libUseful-5/libUseful.h"
 #include "glob.h"
 
-#define VERSION "1.19"
+#define VERSION "1.20"
 
 #define ACT_NONE 0
 #define ACT_HASH 1
diff --git a/configure b/configure
index 87ba6e5..74fbef6 100755
--- a/configure
+++ b/configure
@@ -707,7 +707,11 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_largefile
+enable_fortify
+enable_stack_protect
+enable_harden
 enable_xattr
+enable_zlib
 enable_ssl
 with_system_libuseful
 '
@@ -1336,7 +1340,11 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-largefile     omit support for large files
+  --enable-fortify            use 'FORTIFY_SOURCE=3' to harden source code
+  --enable-stack-protect      use '-fstack-protector-strong' to harden source code
+  --enable-harden             use 'FORTIFY_SOURCE=3' and stack-protect to harden source code
   --enable-xattr       enable extended file attributes support
+  --enable-zlib               use ZLib Compression
   --enable-ssl       use Secure Sockets Layer
 
 Optional Packages:
@@ -2342,6 +2350,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3466,6 +3475,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
 
 ac_header= ac_cache=
 for ac_item in $ac_header_c_list
@@ -3565,9 +3576,6 @@ printf "%s\n" "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change.  They are probably safe to remove.
-
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 printf %s "checking for egrep... " >&6; }
 if test ${ac_cv_path_EGREP+y}
@@ -3847,6 +3855,51 @@ rm -rf conftest*
 fi
 
 
+# Check whether --enable-fortify was given.
+if test ${enable_fortify+y}
+then :
+  enableval=$enable_fortify; cf_use_fortify=$enableval
+else $as_nop
+  cf_use_fortify=no
+fi
+
+# Check whether --enable-stack-protect was given.
+if test ${enable_stack_protect+y}
+then :
+  enableval=$enable_stack_protect; cf_use_stackprotect=$enableval
+else $as_nop
+  cf_use_stackprotect=no
+fi
+
+# Check whether --enable-harden was given.
+if test ${enable_harden+y}
+then :
+  enableval=$enable_harden; cf_use_harden=$enableval
+else $as_nop
+  cf_use_harden=no
+fi
+
+
+
+
+if test "$cf_use_harden" = "yes"
+then
+cf_use_fortify="yes"
+cf_use_stackprotect="yes"
+fi
+
+
+if test "$cf_use_fortify" = "yes"
+then
+CFLAGS="$CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"
+fi
+
+if test "$cf_use_stackprotect" = "yes"
+then
+CFLAGS="$CFLAGS -fstack-protector-strong"
+fi
+
+
 # Check whether --enable-xattr was given.
 if test ${enable_xattr+y}
 then :
@@ -3854,6 +3907,7 @@ then :
 fi
 
 
+
 if test "$cf_enable_xattr" = "yes"
 then
 ac_fn_c_check_header_compile "$LINENO" "sys/extattr.h" "ac_cv_header_sys_extattr_h" "$ac_includes_default"
@@ -3927,6 +3981,65 @@ fi
 	fi
 fi
 
+
+# Check whether --enable-zlib was given.
+if test ${enable_zlib+y}
+then :
+  enableval=$enable_zlib; cf_use_zlib=$enableval
+else $as_nop
+  cf_use_zlib=yes
+fi
+
+
+if test "$cf_use_zlib" = "yes" -o "$cf_use_ssl" = "yes"
+then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
+printf %s "checking for deflate in -lz... " >&6; }
+if test ${ac_cv_lib_z_deflate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char deflate ();
+int
+main (void)
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_z_deflate=yes
+else $as_nop
+  ac_cv_lib_z_deflate=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
+printf "%s\n" "$ac_cv_lib_z_deflate" >&6; }
+if test "x$ac_cv_lib_z_deflate" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h
+
+  LIBS="-lz $LIBS"
+
+fi
+
+cf_have_libz=$ac_cv_lib_z_deflate
+fi
+
+
 # Check whether --enable-ssl was given.
 if test ${enable_ssl+y}
 then :
diff --git a/configure.ac b/configure.ac
index 67b1547..9e36d60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,46 @@
 
-AC_INIT([main.c])
+AC_INIT
+AC_CONFIG_SRCDIR([main.c])
 
 
 AC_PROG_CC 
-AC_LANG_C 
+AC_LANG([C]) 
 AC_PROG_MAKE_SET 
 AC_PROG_INSTALL 
-AC_HEADER_STDC 
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+ 
 AC_SYS_LARGEFILE
 
+AC_ARG_ENABLE(fortify, [  --enable-fortify            use 'FORTIFY_SOURCE=3' to harden source code], cf_use_fortify=$enableval, cf_use_fortify=no )
+AC_ARG_ENABLE(stack-protect, [  --enable-stack-protect      use '-fstack-protector-strong' to harden source code], cf_use_stackprotect=$enableval, cf_use_stackprotect=no )
+AC_ARG_ENABLE(harden, [  --enable-harden             use 'FORTIFY_SOURCE=3' and stack-protect to harden source code], cf_use_harden=$enableval, cf_use_harden=no )
+
+
+
+if test "$cf_use_harden" = "yes"
+then
+cf_use_fortify="yes"
+cf_use_stackprotect="yes"
+fi
+
+
+if test "$cf_use_fortify" = "yes"
+then
+CFLAGS="$CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"
+fi
+
+if test "$cf_use_stackprotect" = "yes"
+then
+CFLAGS="$CFLAGS -fstack-protector-strong"
+fi
+
+
 AC_ARG_ENABLE(xattr, [  --enable-xattr       enable extended file attributes support], cf_enable_xattr=$enableval )
 
+
 if test "$cf_enable_xattr" = "yes"
 then
 AC_CHECK_HEADER([sys/extattr.h],[cf_extended_attribs=extattr],[])
@@ -30,6 +60,16 @@ then
 	fi
 fi
 
+
+AC_ARG_ENABLE(zlib, [  --enable-zlib               use ZLib Compression], cf_use_zlib=$enableval, cf_use_zlib=yes)
+
+if test "$cf_use_zlib" = "yes" -o "$cf_use_ssl" = "yes"
+then
+AC_CHECK_LIB(z,deflate,,)
+cf_have_libz=$ac_cv_lib_z_deflate
+fi
+
+
 AC_ARG_ENABLE(ssl, [  --enable-ssl       use Secure Sockets Layer], cf_use_ssl=$enableval, cf_use_ssl=yes )
 
 if test "$cf_use_ssl" = "yes"
@@ -127,5 +167,6 @@ echo
 echo
 
 dnl read Makefile.in and write Makefile 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 
diff --git a/find.c b/find.c
index f9c683e..5ad18a1 100644
--- a/find.c
+++ b/find.c
@@ -236,7 +236,7 @@ int LoadFromIOC(const char *XML, int Flags)
 
 
 
-void *MatchesLoad(int Flags)
+void *MatchesLoad(HashratCtx *Ctx, int Flags)
 {
     char *Line=NULL, *Tempstr=NULL, *Type=NULL, *ptr;
     TFingerprint *FP;
@@ -266,7 +266,12 @@ void *MatchesLoad(int Flags)
         {
             StripTrailingWhitespace(Line);
             FP=TFingerprintParse(Line);
+	    if (FP)
+	    {
             if (MatchAdd(FP, "", Flags)) count++;
+	    //native format can specify the type of hash that it is supplying
+	    if (StrValid(FP->HashType)) Ctx->HashType=CopyStr(Ctx->HashType, FP->HashType);
+            }
             Line=STREAMReadLine(Line, S);
         }
     }
diff --git a/find.h b/find.h
index 782608f..bd976ff 100644
--- a/find.h
+++ b/find.h
@@ -5,7 +5,7 @@
 #include "common.h"
 
 
-void *MatchesLoad();
+void *MatchesLoad(HashratCtx *Ctx, int Flags);
 void LoadMatchesToMemcache();
 void OutputUnmatched(HashratCtx *Ctx);
 int MatchAdd(TFingerprint *FP, const char *Path, int Flags);
diff --git a/fingerprint.c b/fingerprint.c
index 8256b09..00d4d73 100644
--- a/fingerprint.c
+++ b/fingerprint.c
@@ -100,7 +100,7 @@ TFingerprint *TFingerprintParse(const char *Data)
         ptr=GetNameValuePair(Data," ","=",&Name,&Value);
         while (ptr)
         {
-            if (StrLen(Name))
+            if (StrValid(Name))
             {
                 if (strcmp(Name,"path")==0) FP->Path=UnQuoteStr(FP->Path,Value);
                 if (strcmp(Name,"size")==0)
@@ -149,7 +149,7 @@ TFingerprint *TFingerprintParse(const char *Data)
         else ParseTradFormat(Data, &FP->Hash, &FP->Path);
     }
 
-    if (StrLen(FP->Hash)) strlwr(FP->Hash);
+    if (StrValid(FP->Hash)) strlwr(FP->Hash);
     Destroy(Name);
     Destroy(Value);
 
diff --git a/include-exclude.c b/include-exclude.c
index 3ce2148..d05240e 100644
--- a/include-exclude.c
+++ b/include-exclude.c
@@ -117,7 +117,6 @@ static int IncludeExcludeCheckFilenames(HashratCtx *Ctx, const char *Path, struc
 
             	case INEX_EXCLUDE_DIR:
             	if (strncmp(mptr,dptr,StrLen(mptr))==0) result=FALSE;
-            	printf("FNMD: [%s] [%s] %d\n",mptr,dptr,result);
             	break;
             */
         }
diff --git a/libUseful-5/CHANGELOG b/libUseful-5/CHANGELOG
index acffa3d..ab3fae4 100644
--- a/libUseful-5/CHANGELOG
+++ b/libUseful-5/CHANGELOG
@@ -1,5 +1,43 @@
+v5.14 (2024-06-03)
+  * add ini file support to DataParser
+  * fix/add 'bcast' socket type
+
+v5.13 (2024-04-17)
+  * Fix soname issue. 
+
+v5.12 (2024-04-06)
+  * Added TerminalProgress progress bars
+  * Fix ~W escape sequence for setting white background
+	* Fixes to TerminalTheme
+
+v5.11 (2024-02-27)
+  * Don't follow symbolic links in FileSystemRmDir
+  * detect NULL streams passed to STREAMReadToTerminator 
+  * honor prefix/sysconfdir when open unicode-names.conf 
+  * STREAMSendDgram added to Stream.h
+  * clean out example .exe files with 'make clean'"
+
+v5.10 (2024-02-21)
+  * Added 'x' (O_EXCL) option to file streams
+  * Added ''GetUserHomeDir' function
+  * Install now creates symlinks from libUseful-<major> to libUseful-<major>-<minor> rather than making two directories as suggested by andreasstieger@github.com
+  * Added soname to library when building under gcc, again as suggested by andreasstieger@github.com
+
+v5.9 (2024-02-07)
+  * Fix more build errors when building without openssl
+  * added options for compiling with -Wall, -Werror, FORTIFY_SOURCE and -fstack-protector to ./configure 
+
+v5.8 (2024-01-15)
+  * Fix build error when building without openssl
+  * Give in to autoconf insisting upgrade to modern format
+
+v5.7 (2024-01-15)
+  * Fix base32 misunderstanding
+  * Tidyups suggested by andreasstieger@github.com, including flags not returned by ProcessApplyLateConfig.
+  * libcapabilites support now defaults to 'no' 
+
 v5.6 (2024-01-14)
-	* TOTP function added
+  * TOTP function added
   * base32 decode functions now return length
 
 v5.5 (2024-01-13)
diff --git a/libUseful-5/Compression.c b/libUseful-5/Compression.c
index 586f849..d03c7b2 100644
--- a/libUseful-5/Compression.c
+++ b/libUseful-5/Compression.c
@@ -94,8 +94,8 @@ int zlibProcessorRead(TProcessingModule *ProcMod, const char *InData, unsigned l
 
     while ((ZData->z_in.avail_in > 0) || Flush)
     {
-	//We do not need Z_FINISH here, 
-	result=inflate(& ZData->z_in, Z_NO_FLUSH);
+        //We do not need Z_FINISH here,
+        result=inflate(& ZData->z_in, Z_NO_FLUSH);
         bytes_read=(*OutLen)-ZData->z_in.avail_out;
 
 
diff --git a/libUseful-5/DataParser.c b/libUseful-5/DataParser.c
index 8b81815..072cc27 100644
--- a/libUseful-5/DataParser.c
+++ b/libUseful-5/DataParser.c
@@ -732,6 +732,7 @@ static const char *ParserCMONItems(int ParserType, const char *Doc, ListNode *Pa
         {
         case '#':
             ptr=GetToken(ptr,"\n",&Token,0);
+            Token=CopyStr(Token,"");
             break;
 
         case ':':
@@ -793,6 +794,80 @@ static const char *ParserCMONItems(int ParserType, const char *Doc, ListNode *Pa
 
 
 
+#define INI_TOKENS " |	|#|=|;|[|]|\r|\n"
+
+static const char *ParserINIItems(int ParserType, const char *Doc, ListNode *Parent, int IndentLevel)
+{
+    const char *ptr, *p_prev;
+    char *Token=NULL, *PrevToken=NULL;
+    int BreakOut=FALSE;
+
+
+    ptr=Doc;
+    while (ptr && (! BreakOut))
+    {
+        //while (isspace(*ptr)) ptr++;
+				p_prev=ptr;
+        ptr=GetToken(ptr, INI_TOKENS, &Token, GETTOKEN_MULTI_SEP|GETTOKEN_INCLUDE_SEP|GETTOKEN_HONOR_QUOTES);
+
+        switch (*Token)
+        {
+        case '#':
+        case ';':
+            ptr=GetToken(ptr,"\n",&Token,0);
+            Token=CopyStr(Token,"");
+            break;
+
+        case '[':
+						if (IndentLevel > 0)
+						{
+							Destroy(PrevToken);
+							Destroy(Token);
+							return(p_prev);
+						}
+
+            if (! StrValid(PrevToken))
+            {
+                ptr=GetToken(ptr,"]",&Token,0);
+                ptr=ParserAddNewStructure(ptr, ParserType, Parent, ITEM_ENTITY, Token, IndentLevel+1);
+                //we don't want token to be used as a 'PrevToken', because we've already consumed it
+                Token=CopyStr(Token,"");
+            }
+            else
+            {
+                PrevToken=CatStr(PrevToken, Token);
+                ptr=GetToken(ptr,"=",&Token,0);
+                PrevToken=CatStr(PrevToken, Token);
+            }
+            break;
+
+        case '=':
+            ptr=GetToken(ptr, "\n", &Token, GETTOKEN_QUOTES);
+            StripLeadingWhitespace(Token);
+            StripTrailingWhitespace(Token);
+            StripQuotes(PrevToken);
+            StripQuotes(Token);
+            ParserAddValue(Parent, PrevToken, Token);
+            break;
+
+        case ' ':
+        case '	':
+        case '\r':
+            break;
+
+        default:
+            PrevToken=CopyStr(PrevToken, Token);
+            StripTrailingWhitespace(PrevToken);
+            StripLeadingWhitespace(PrevToken);
+            break;
+        }
+    }
+
+    DestroyString(PrevToken);
+    DestroyString(Token);
+    return(ptr);
+}
+
 
 
 
@@ -823,6 +898,7 @@ static const char *ParserURLItems(int ParserType, const char *Doc, ListNode *Par
 
 const char *ParserParseItems(int Type, const char *Doc, ListNode *Parent, int IndentLevel)
 {
+
     switch (Type)
     {
     case PARSER_XML:
@@ -846,7 +922,9 @@ const char *ParserParseItems(int Type, const char *Doc, ListNode *Parent, int In
     case PARSER_CMON:
         return(ParserCMONItems(Type, Doc, Parent, IndentLevel));
         break;
-
+    case PARSER_INI:
+        return(ParserINIItems(Type, Doc, Parent, IndentLevel));
+        break;
     }
     return(NULL);
 }
@@ -875,8 +953,12 @@ ListNode *ParserParseDocument(const char *TypeStr, const char *Doc)
     Items=ListCreate();
     ptr=Doc;
     while (isspace(*ptr)) ptr++;
-    if (*ptr=='{') ptr++;
-    if (*ptr=='[') ptr++;
+
+    if (Type == PARSER_JSON)
+    {
+        if (*ptr=='{') ptr++;
+        if (*ptr=='[') ptr++;
+    }
     ParserParseItems(Type, ptr, Items, 0);
 
     fflush(NULL);
diff --git a/libUseful-5/Encodings.c b/libUseful-5/Encodings.c
index d65c6e5..2ba5662 100644
--- a/libUseful-5/Encodings.c
+++ b/libUseful-5/Encodings.c
@@ -29,7 +29,7 @@ int EncodingParse(const char *Str)
 
         case '8':
             if (strcasecmp(Str,"8")==0) Encode=ENCODE_OCTAL;
-						break;
+            break;
 
         case 'a':
         case 'A':
@@ -106,11 +106,11 @@ int EncodingParse(const char *Str)
             else if (strcasecmp(Str,"uuenc")==0) Encode=ENCODE_UUENC;
             break;
 
-				case 'w':
-				case 'W':
+        case 'w':
+        case 'W':
             if (strcasecmp(Str,"wbase32")==0) Encode=ENCODE_WBASE32;
             else if (strcasecmp(Str,"w32")==0) Encode=ENCODE_WBASE32;
-						break;
+            break;
 
         case 'x':
         case 'X':
@@ -190,25 +190,25 @@ char *EncodeBytes(char *Buffer, const char *Bytes, int len, int Encoding)
     RetStr=CopyStr(Buffer,"");
     switch (Encoding)
     {
-		case ENCODE_BASE32:
-				RetStr=base32encode(RetStr, Bytes, len, BASE32_RFC4648_CHARS, '=');
-		break;
+    case ENCODE_BASE32:
+        RetStr=base32encode(RetStr, Bytes, len, BASE32_RFC4648_CHARS, '=');
+        break;
 
-		case ENCODE_CBASE32:
-				RetStr=base32encode(RetStr, Bytes, len, BASE32_CROCKFORD_CHARS, '\0');
-		break;
+    case ENCODE_CBASE32:
+        RetStr=base32encode(RetStr, Bytes, len, BASE32_CROCKFORD_CHARS, '\0');
+        break;
 
-		case ENCODE_HBASE32:
-				RetStr=base32encode(RetStr, Bytes, len, BASE32_HEX_CHARS, '=');
-		break;
+    case ENCODE_HBASE32:
+        RetStr=base32encode(RetStr, Bytes, len, BASE32_HEX_CHARS, '=');
+        break;
 
-		case ENCODE_ZBASE32:
-				RetStr=base32encode(RetStr, Bytes, len, BASE32_ZBASE32_CHARS, '\0');
-		break;
+    case ENCODE_ZBASE32:
+        RetStr=base32encode(RetStr, Bytes, len, BASE32_ZBASE32_CHARS, '\0');
+        break;
 
-		case ENCODE_WBASE32:
-				RetStr=base32encode(RetStr, Bytes, len, BASE32_WORDSAFE_CHARS, '=');
-		break;
+    case ENCODE_WBASE32:
+        RetStr=base32encode(RetStr, Bytes, len, BASE32_WORDSAFE_CHARS, '=');
+        break;
 
     case ENCODE_BASE64:
         RetStr=SetStrLen(RetStr,len * 4);
@@ -347,25 +347,25 @@ int DecodeBytes(char **Return, const char *Text, int Encoding)
         len=StrLen(*Return);
         break;
 
-		case ENCODE_BASE32:
-				len=base32decode(*Return, Text, BASE32_RFC4648_CHARS);	
-				break;
+    case ENCODE_BASE32:
+        len=base32decode(*Return, Text, BASE32_RFC4648_CHARS);
+        break;
 
-		case ENCODE_CBASE32:
-				len=base32decode(*Return, Text, BASE32_CROCKFORD_CHARS);	
-				break;
+    case ENCODE_CBASE32:
+        len=base32decode(*Return, Text, BASE32_CROCKFORD_CHARS);
+        break;
 
-		case ENCODE_HBASE32:
-				len=base32decode(*Return, Text, BASE32_HEX_CHARS);	
-				break;
+    case ENCODE_HBASE32:
+        len=base32decode(*Return, Text, BASE32_HEX_CHARS);
+        break;
 
-		case ENCODE_WBASE32:
-				len=base32decode(*Return, Text, BASE32_WORDSAFE_CHARS);	
-				break;
+    case ENCODE_WBASE32:
+        len=base32decode(*Return, Text, BASE32_WORDSAFE_CHARS);
+        break;
 
-		case ENCODE_ZBASE32:
-				len=base32decode(*Return, Text, BASE32_ZBASE32_CHARS);	
-				break;
+    case ENCODE_ZBASE32:
+        len=base32decode(*Return, Text, BASE32_ZBASE32_CHARS);
+        break;
 
     case ENCODE_BASE64:
         len=Radix64tobits(*Return,Text,BASE64_CHARS,'=');
diff --git a/libUseful-5/FileSystem.c b/libUseful-5/FileSystem.c
index 002ad44..4efd21c 100644
--- a/libUseful-5/FileSystem.c
+++ b/libUseful-5/FileSystem.c
@@ -491,7 +491,7 @@ int FileSystemUnMountFlagsDepth(const char *MountPoint, int UnmountFlags, int Ex
             glob(Path, 0, 0, &Glob);
             for (i=0; i < Glob.gl_pathc; i++)
             {
-                if (stat(Glob.gl_pathv[i],&FStat)==0)
+                if (lstat(Glob.gl_pathv[i],&FStat)==0)
                 {
                     if (S_ISDIR(FStat.st_mode))
                     {
diff --git a/libUseful-5/GeneralFunctions.c b/libUseful-5/GeneralFunctions.c
index ce301ff..c83dbcf 100644
--- a/libUseful-5/GeneralFunctions.c
+++ b/libUseful-5/GeneralFunctions.c
@@ -20,60 +20,60 @@ void Destroy(void *Obj)
 
 uint32_t reverse_uint32(uint32_t Input)
 {
-uint32_t Output;
+    uint32_t Output;
 
-Output = (Input & 0xFF) << 24;
-Output |= (Input & 0xFF00) << 8;
-Output |= (Input & 0xFF0000) >> 8;
-Output |= (Input & 0xFF000000) >> 24;
+    Output = (Input & 0xFF) << 24;
+    Output |= (Input & 0xFF00) << 8;
+    Output |= (Input & 0xFF0000) >> 8;
+    Output |= (Input & 0xFF000000) >> 24;
 
-return(Output);
+    return(Output);
 }
 
 
 uint8_t parse_bcd_byte(const char *In)
 {
-uint8_t val=0;
-int bit, len, i;
-const char *ptr;
+    uint8_t val=0;
+    int bit, len, i;
+    const char *ptr;
 
-len=StrLen(In);
-if (len < 1) return(0);
-if (len > 8) len=8;
-bit=1 << (len -1);
+    len=StrLen(In);
+    if (len < 1) return(0);
+    if (len > 8) len=8;
+    bit=1 << (len -1);
 
-ptr=In;
-for (i=0; i < len; i++)
-{
-if (*ptr=='1') val |= bit;
-ptr++;
-bit=bit >> 1;
-}
+    ptr=In;
+    for (i=0; i < len; i++)
+    {
+        if (*ptr=='1') val |= bit;
+        ptr++;
+        bit=bit >> 1;
+    }
 
-return(val);
+    return(val);
 }
 
 
 
 char *encode_bcd_bytes(char *RetStr, unsigned const char *Bytes, int Len)
 {
-unsigned const char *ptr, *end;
-int bit, i;
+    unsigned const char *ptr, *end;
+    int bit, i;
 
-end=Bytes+Len;
+    end=Bytes+Len;
 
-for (ptr=Bytes; ptr < end; ptr++)
-{
-bit=128;
-for (i=0; i < 8; i++)
-{
-	if (*ptr & bit) RetStr=CatStr(RetStr, "1");
-	else RetStr=CatStr(RetStr, "0");
-	bit = bit >> 1;
-}
-}
+    for (ptr=Bytes; ptr < end; ptr++)
+    {
+        bit=128;
+        for (i=0; i < 8; i++)
+        {
+            if (*ptr & bit) RetStr=CatStr(RetStr, "1");
+            else RetStr=CatStr(RetStr, "0");
+            bit = bit >> 1;
+        }
+    }
 
-return(RetStr);
+    return(RetStr);
 }
 
 
diff --git a/libUseful-5/HttpServer.c b/libUseful-5/HttpServer.c
index 22aebd8..5bc53fd 100644
--- a/libUseful-5/HttpServer.c
+++ b/libUseful-5/HttpServer.c
@@ -104,7 +104,7 @@ void HTTPServerParseClientHeaders(STREAM *S)
 
 void HTTPServerAccept(STREAM *S)
 {
-HTTPServerParseClientHeaders(S);
+    HTTPServerParseClientHeaders(S);
 }
 
 
@@ -164,6 +164,7 @@ int HTTPServerSendFile(STREAM *S, const char *Path, const char *iContentType, co
 {
     struct stat FStat;
     char *Tempstr=NULL, *ContentType=NULL;
+    int bytes_sent=0;
     STREAM *F;
 
     if (stat(Path, &FStat) != 0) HTTPServerSendHeaders(S, 404, "NOT FOUND", NULL);
@@ -180,10 +181,12 @@ int HTTPServerSendFile(STREAM *S, const char *Path, const char *iContentType, co
             if (StrValid(ContentType)) Tempstr=MCatStr(Tempstr, "Content-Type=", ContentType, " ", NULL);
             Tempstr=CatStr(Tempstr, Headers);
             HTTPServerSendHeaders(S, 200, "OKAY", Tempstr);
-            STREAMSendFile(F, S, 0, SENDFILE_LOOP);
+            bytes_sent=STREAMSendFile(F, S, 0, SENDFILE_LOOP);
             STREAMClose(F);
         }
     }
     Destroy(Tempstr);
     Destroy(ContentType);
+
+    return(bytes_sent);
 }
diff --git a/libUseful-5/Inet.h b/libUseful-5/Inet.h
old mode 100755
new mode 100644
diff --git a/libUseful-5/LICENCE b/libUseful-5/LICENCE
old mode 100755
new mode 100644
diff --git a/libUseful-5/Makefile b/libUseful-5/Makefile
index c55ef76..7310698 100644
--- a/libUseful-5/Makefile
+++ b/libUseful-5/Makefile
@@ -1,20 +1,26 @@
 CC = gcc
-VERSION = 5.6
-CFLAGS = -g -O2 
+VERSION = 5.14
+MAJOR=5
+LIBFILE=libUseful.so.$(VERSION)
+SONAME=libUseful.so.$(MAJOR)
+CFLAGS = -g -O2 -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong  -Wl,-soname,${SONAME}
 LDFLAGS=
-LIBS = -lssl -lcrypto -lc -lc -lc -lc 
-FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -fPIC -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBC=1 -DHAVE_GET_CURR_DIR=1 -DHAVE_PTSNAME_R=1 -DHAVE_CLEARENV=1 -DHAVE_SETRESUID=1 -DHAVE_INITGROUPS=1 -DHAVE_POLL=1 -DHAVE_MLOCK=1 -DHAVE_MLOCKALL=1 -DHAVE_MUNLOCKALL=1 -DHAVE_MADVISE=1 -DHAVE_MKOSTEMP=1 -DHAVE_MOUNT=1 -DHAVE_UMOUNT=1 -DHAVE_UMOUNT2=1 -DHAVE_GETENTROPY=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SENDFILE=1 -DUSE_INET6=1 -DHAVE_LIBC=1 -DHAVE_XATTR=1 -DHAVE_LIBC=1 -DHAVE_UNSHARE=1 -DHAVE_LIBC=1 -DHAVE_SETNS=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_EVP_MD_CTX_NEW=1 -DHAVE_EVP_MD_CTX_FREE=1 -DHAVE_EVP_BF_CBC=1 -DHAVE_EVP_RC2_CBC=1 -DHAVE_EVP_RC4=1 -DHAVE_EVP_DES_CBC=1 -DHAVE_EVP_DESX_CBC=1 -DHAVE_EVP_CAST5_CBC=1 -DHAVE_EVP_AES_128_CBC=1 -DHAVE_EVP_AES_256_CBC=1 -DHAVE_X509_CHECK_HOST=1 -DHAVE_DECL_OPENSSL_ADD_ALL_ALGORITHMS=1 -DHAVE_OPENSSL_ADD_ALL_ALGORITHMS=1 -DHAVE_DECL_SSL_SET_TLSEXT_HOST_NAME=1 -DHAVE_SSL_SET_TLSEXT_HOST_NAME=1 -DVERSION=\"$(VERSION)\"
-prefix=/usr
-OBJ=StrLenCache.o String.o Array.o List.o IPAddress.o Socket.o Server.o UnixSocket.o Stream.o StreamAuth.o Errors.o Unicode.o TerminalKeys.o Terminal.o TerminalWidget.o TerminalMenu.o TerminalChoice.o TerminalBar.o TerminalTheme.o FileSystem.o GeneralFunctions.o DataProcessing.o Pty.o Log.o HttpUtil.o HttpChunkedTransfer.o Http.o Gemini.o Smtp.o Inet.o Expect.o base32.o base64.o  crc32.o md5c.o sha1.o sha2.o whirlpool.o jh_ref.o HashCRC32.o HashMD5.o HashSHA.o HashJH.o HashWhirlpool.o HashOpenSSL.o Hash.o HMAC.o Ssh.o Compression.o OAuth.o LibSettings.o Vars.o Time.o Markup.o SpawnPrograms.o Tokenizer.o StringList.o PatternMatch.o URL.o DataParser.o ConnectionChain.o OpenSSL.o Process.o Encodings.o RawData.o SecureMem.o CommandLineParser.o SysInfo.o Entropy.o Users.o UnitsOfMeasure.o HttpServer.o WebSocket.o ContentType.o PasswordFile.o OTP.o
+LIBS = -lz -lssl -lcrypto -lc -lc -lc -lc 
+prefix=/usr/local
+sysconfdir=${prefix}/etc
+FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -fPIC -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DHAVE_LIBC=1 -DHAVE_GET_CURR_DIR=1 -DHAVE_PTSNAME_R=1 -DHAVE_CLEARENV=1 -DHAVE_SETRESUID=1 -DHAVE_INITGROUPS=1 -DHAVE_POLL=1 -DHAVE_MLOCK=1 -DHAVE_MLOCKALL=1 -DHAVE_MUNLOCKALL=1 -DHAVE_MADVISE=1 -DHAVE_MKOSTEMP=1 -DHAVE_MOUNT=1 -DHAVE_UMOUNT=1 -DHAVE_UMOUNT2=1 -DHAVE_GETENTROPY=1 -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DHAVE_SENDFILE=1 -DUSE_INET6=1 -DHAVE_LIBC=1 -DHAVE_XATTR=1 -DHAVE_LIBC=1 -DHAVE_UNSHARE=1 -DHAVE_LIBC=1 -DHAVE_SETNS=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_EVP_MD_CTX_NEW=1 -DHAVE_EVP_MD_CTX_FREE=1 -DHAVE_EVP_BF_CBC=1 -DHAVE_EVP_RC2_CBC=1 -DHAVE_EVP_RC4=1 -DHAVE_EVP_DES_CBC=1 -DHAVE_EVP_DESX_CBC=1 -DHAVE_EVP_CAST5_CBC=1 -DHAVE_EVP_AES_128_CBC=1 -DHAVE_EVP_AES_256_CBC=1 -DHAVE_X509_CHECK_HOST=1 -DHAVE_DECL_OPENSSL_ADD_ALL_ALGORITHMS=1 -DHAVE_OPENSSL_ADD_ALL_ALGORITHMS=1 -DHAVE_DECL_SSL_SET_TLSEXT_HOST_NAME=1 -DHAVE_SSL_SET_TLSEXT_HOST_NAME=1 -DHAVE_LIBZ=1 -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+OBJ=StrLenCache.o String.o Array.o List.o IPAddress.o Socket.o Server.o UnixSocket.o Stream.o StreamAuth.o Errors.o Unicode.o TerminalKeys.o Terminal.o TerminalWidget.o TerminalMenu.o TerminalChoice.o TerminalBar.o TerminalProgress.o TerminalTheme.o FileSystem.o GeneralFunctions.o DataProcessing.o Pty.o Log.o HttpUtil.o HttpChunkedTransfer.o Http.o Gemini.o Smtp.o Inet.o Expect.o base32.o base64.o  crc32.o md5c.o sha1.o sha2.o whirlpool.o jh_ref.o HashCRC32.o HashMD5.o HashSHA.o HashJH.o HashWhirlpool.o HashOpenSSL.o Hash.o HMAC.o Ssh.o Compression.o OAuth.o LibSettings.o Vars.o Time.o Markup.o SpawnPrograms.o Tokenizer.o StringList.o PatternMatch.o URL.o DataParser.o ConnectionChain.o OpenSSL.o Process.o Encodings.o RawData.o SecureMem.o CommandLineParser.o SysInfo.o Entropy.o Users.o UnitsOfMeasure.o HttpServer.o WebSocket.o ContentType.o PasswordFile.o OTP.o
 
 
 all: $(OBJ)
-	$(CC) $(FLAGS) -shared -o libUseful-$(VERSION).so $(OBJ) $(LIBS) $(LDFLAGS)
+	$(CC) $(FLAGS) -shared -o $(LIBFILE) $(OBJ) $(LIBS) $(LDFLAGS)
+	-ln -s -r -f $(LIBFILE) libUseful-$(VERSION).so
+	-ln -s -r -f $(LIBFILE) libUseful-$(MAJOR).so
+	-ln -s -r -f $(LIBFILE) $(SONAME)
+	-ln -s -r -f $(LIBFILE) libUseful.so
 	ar rcs libUseful-$(VERSION).a $(OBJ)
-	-ln -s libUseful-$(VERSION).so libUseful-5.so &>/dev/null
-	-ln -s libUseful-$(VERSION).a libUseful-5.a &>/dev/null
-	-ln -s libUseful-$(VERSION).so libUseful.so &>/dev/null
-	-ln -s libUseful-$(VERSION).a libUseful.a &>/dev/null
+	-ln -s -r -f libUseful-$(VERSION).a libUseful-$(MAJOR).a
+	-ln -s -r -f libUseful-$(VERSION).a libUseful.a
 
 
 StrLenCache.o: StrLenCache.h StrLenCache.c
@@ -86,6 +92,9 @@ TerminalChoice.o: TerminalChoice.h TerminalChoice.c
 TerminalBar.o: TerminalBar.h TerminalBar.c
 	$(CC) $(FLAGS) -c TerminalBar.c
 
+TerminalProgress.o: TerminalProgress.h TerminalProgress.c
+	$(CC) $(FLAGS) -c TerminalProgress.c
+
 TerminalTheme.o: TerminalTheme.h TerminalTheme.c
 	$(CC) $(FLAGS) -c TerminalTheme.c
 
@@ -248,17 +257,17 @@ LibSettings.o: LibSettings.h LibSettings.c
 	$(CC) $(FLAGS) -c LibSettings.c
 
 clean:
-	-rm -f *.o *.so *.a *.orig
+	-rm -f *.o *.so *.so.* *.a *.orig
 	-rm config.log config.status 
 	-rm -r autom4te.cache config.cache
+	-$(MAKE) clean -C examples
 
 install: libUseful.so
 	-mkdir -p $(DESTDIR)$(prefix)/lib 
-	cp -P *.so *.a $(DESTDIR)$(prefix)/lib  
+	cp -P *.so *.so.* *.a $(DESTDIR)$(prefix)/lib  
 	-mkdir -p $(DESTDIR)$(prefix)/include/libUseful-$(VERSION)
 	cp *.h $(DESTDIR)$(prefix)/include/libUseful-$(VERSION)
-	-mkdir -p $(DESTDIR)$(prefix)/include/libUseful-5
-	cp *.h $(DESTDIR)$(prefix)/include/libUseful-5
+	-ln -s -r -f $(DESTDIR)$(prefix)/include/libUseful-$(VERSION) $(DESTDIR)$(prefix)/include/libUseful-5
 	-mkdir -p $(DESTDIR)$(prefix)/etc
 	cp *.conf $(DESTDIR)$(prefix)/etc
 
diff --git a/libUseful-5/Makefile.in b/libUseful-5/Makefile.in
old mode 100755
new mode 100644
index 5fce578..0007231
--- a/libUseful-5/Makefile.in
+++ b/libUseful-5/Makefile.in
@@ -1,20 +1,26 @@
 CC = @CC@
-VERSION = 5.6
-CFLAGS = @CFLAGS@ @SIMD_CFLAGS@
+VERSION = 5.14
+MAJOR=5
+LIBFILE=libUseful.so.$(VERSION)
+SONAME=libUseful.so.$(MAJOR)
+CFLAGS = @CFLAGS@ @SIMD_CFLAGS@ @SONAME_FLAGS@
 LDFLAGS=@LDFLAGS@
 LIBS = @LIBS@
-FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -fPIC @DEFS@ -DVERSION=\"$(VERSION)\"
 prefix=@prefix@
-OBJ=StrLenCache.o String.o Array.o List.o IPAddress.o Socket.o Server.o UnixSocket.o Stream.o StreamAuth.o Errors.o Unicode.o TerminalKeys.o Terminal.o TerminalWidget.o TerminalMenu.o TerminalChoice.o TerminalBar.o TerminalTheme.o FileSystem.o GeneralFunctions.o DataProcessing.o Pty.o Log.o HttpUtil.o HttpChunkedTransfer.o Http.o Gemini.o Smtp.o Inet.o Expect.o base32.o base64.o  crc32.o md5c.o sha1.o sha2.o whirlpool.o jh_ref.o HashCRC32.o HashMD5.o HashSHA.o HashJH.o HashWhirlpool.o HashOpenSSL.o Hash.o HMAC.o Ssh.o Compression.o OAuth.o LibSettings.o Vars.o Time.o Markup.o SpawnPrograms.o Tokenizer.o StringList.o PatternMatch.o URL.o DataParser.o ConnectionChain.o OpenSSL.o Process.o Encodings.o RawData.o SecureMem.o CommandLineParser.o SysInfo.o Entropy.o Users.o UnitsOfMeasure.o HttpServer.o WebSocket.o ContentType.o PasswordFile.o OTP.o
+sysconfdir=@sysconfdir@
+FLAGS=$(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -fPIC @DEFS@ -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+OBJ=StrLenCache.o String.o Array.o List.o IPAddress.o Socket.o Server.o UnixSocket.o Stream.o StreamAuth.o Errors.o Unicode.o TerminalKeys.o Terminal.o TerminalWidget.o TerminalMenu.o TerminalChoice.o TerminalBar.o TerminalProgress.o TerminalTheme.o FileSystem.o GeneralFunctions.o DataProcessing.o Pty.o Log.o HttpUtil.o HttpChunkedTransfer.o Http.o Gemini.o Smtp.o Inet.o Expect.o base32.o base64.o  crc32.o md5c.o sha1.o sha2.o whirlpool.o jh_ref.o HashCRC32.o HashMD5.o HashSHA.o HashJH.o HashWhirlpool.o HashOpenSSL.o Hash.o HMAC.o Ssh.o Compression.o OAuth.o LibSettings.o Vars.o Time.o Markup.o SpawnPrograms.o Tokenizer.o StringList.o PatternMatch.o URL.o DataParser.o ConnectionChain.o OpenSSL.o Process.o Encodings.o RawData.o SecureMem.o CommandLineParser.o SysInfo.o Entropy.o Users.o UnitsOfMeasure.o HttpServer.o WebSocket.o ContentType.o PasswordFile.o OTP.o
 
 
 all: $(OBJ)
-	$(CC) $(FLAGS) -shared -o libUseful-$(VERSION).so $(OBJ) $(LIBS) $(LDFLAGS)
+	$(CC) $(FLAGS) -shared -o $(LIBFILE) $(OBJ) $(LIBS) $(LDFLAGS)
+	-ln -s -r -f $(LIBFILE) libUseful-$(VERSION).so
+	-ln -s -r -f $(LIBFILE) libUseful-$(MAJOR).so
+	-ln -s -r -f $(LIBFILE) $(SONAME)
+	-ln -s -r -f $(LIBFILE) libUseful.so
 	ar rcs libUseful-$(VERSION).a $(OBJ)
-	-ln -s libUseful-$(VERSION).so libUseful-5.so &>/dev/null
-	-ln -s libUseful-$(VERSION).a libUseful-5.a &>/dev/null
-	-ln -s libUseful-$(VERSION).so libUseful.so &>/dev/null
-	-ln -s libUseful-$(VERSION).a libUseful.a &>/dev/null
+	-ln -s -r -f libUseful-$(VERSION).a libUseful-$(MAJOR).a
+	-ln -s -r -f libUseful-$(VERSION).a libUseful.a
 
 
 StrLenCache.o: StrLenCache.h StrLenCache.c
@@ -86,6 +92,9 @@ TerminalChoice.o: TerminalChoice.h TerminalChoice.c
 TerminalBar.o: TerminalBar.h TerminalBar.c
 	$(CC) $(FLAGS) -c TerminalBar.c
 
+TerminalProgress.o: TerminalProgress.h TerminalProgress.c
+	$(CC) $(FLAGS) -c TerminalProgress.c
+
 TerminalTheme.o: TerminalTheme.h TerminalTheme.c
 	$(CC) $(FLAGS) -c TerminalTheme.c
 
@@ -248,17 +257,17 @@ LibSettings.o: LibSettings.h LibSettings.c
 	$(CC) $(FLAGS) -c LibSettings.c
 
 clean:
-	-rm -f *.o *.so *.a *.orig
+	-rm -f *.o *.so *.so.* *.a *.orig
 	-rm config.log config.status 
 	-rm -r autom4te.cache config.cache
+	-$(MAKE) clean -C examples
 
 install: libUseful.so
 	-mkdir -p $(DESTDIR)$(prefix)/lib 
-	cp -P *.so *.a $(DESTDIR)$(prefix)/lib  
+	cp -P *.so *.so.* *.a $(DESTDIR)$(prefix)/lib  
 	-mkdir -p $(DESTDIR)$(prefix)/include/libUseful-$(VERSION)
 	cp *.h $(DESTDIR)$(prefix)/include/libUseful-$(VERSION)
-	-mkdir -p $(DESTDIR)$(prefix)/include/libUseful-5
-	cp *.h $(DESTDIR)$(prefix)/include/libUseful-5
+	-ln -s -r -f $(DESTDIR)$(prefix)/include/libUseful-$(VERSION) $(DESTDIR)$(prefix)/include/libUseful-5
 	-mkdir -p $(DESTDIR)$(prefix)/etc
 	cp *.conf $(DESTDIR)$(prefix)/etc
 
diff --git a/libUseful-5/Markup.h b/libUseful-5/Markup.h
old mode 100755
new mode 100644
diff --git a/libUseful-5/OAuth.c b/libUseful-5/OAuth.c
index 6788d19..541ba38 100644
--- a/libUseful-5/OAuth.c
+++ b/libUseful-5/OAuth.c
@@ -215,7 +215,7 @@ static int OAuthParseReply(OAUTH *Ctx, const char *ContentType, const char *Repl
             Curr=ListGetNext(P);
             while (Curr)
             {
-                if (LibUsefulDebugActive()) fprintf(stderr, "OAuthParseReply: SetVar: [%s] [%s]\n", Curr->Tag, Curr->Item);
+                if (LibUsefulDebugActive()) fprintf(stderr, "OAuthParseReply: SetVar: [%s] [%s]\n", Curr->Tag, (char *) Curr->Item);
                 SetVar(Ctx->Vars, Curr->Tag, (char *) Curr->Item);
                 Curr=ListGetNext(Curr);
             }
diff --git a/libUseful-5/OTP.c b/libUseful-5/OTP.c
index c0b0005..3ee65ef 100644
--- a/libUseful-5/OTP.c
+++ b/libUseful-5/OTP.c
@@ -7,35 +7,35 @@
 
 char *TOTP(char *RetStr, const char *HashType, const char *EncodedSecret, int SecretEncoding, int Digits, int Interval)
 {
-uint64_t totp=0;
-uint32_t code;
-char *Tempstr=NULL, *Secret=NULL;
-const char *ptr;
-int len, pos;
+    uint64_t totp=0;
+    uint32_t code;
+    char *Tempstr=NULL, *Secret=NULL;
+    const char *ptr;
+    int len, pos;
 
-len=DecodeBytes(&Secret, EncodedSecret, SecretEncoding);
-totp=(uint64_t) htonll((uint64_t) (time(NULL) / Interval));
+    len=DecodeBytes(&Secret, EncodedSecret, SecretEncoding);
+    totp=(uint64_t) htonll((uint64_t) (time(NULL) / Interval));
 
-len=HMACBytes(&Tempstr, HashType, Secret, len, (unsigned char *) &totp, sizeof(uint64_t), ENCODE_NONE);
+    len=HMACBytes(&Tempstr, HashType, Secret, len, (unsigned char *) &totp, sizeof(uint64_t), ENCODE_NONE);
 
-ptr=Tempstr + len -1;
-pos=*ptr & 0xf;
-memcpy(&code, Tempstr + pos, 4);
+    ptr=Tempstr + len -1;
+    pos=*ptr & 0xf;
+    memcpy(&code, Tempstr + pos, 4);
 
-code=htonl(code);
-code &= 0x7fffffff;
+    code=htonl(code);
+    code &= 0x7fffffff;
 
-Tempstr=FormatStr(Tempstr, "%u", code);
-RetStr=CopyStrLen(RetStr, Tempstr + StrLen(Tempstr) - Digits, Digits);
+    Tempstr=FormatStr(Tempstr, "%u", code);
+    RetStr=CopyStrLen(RetStr, Tempstr + StrLen(Tempstr) - Digits, Digits);
 
-Destroy(Tempstr);
-Destroy(Secret);
+    Destroy(Tempstr);
+    Destroy(Secret);
 
-return(RetStr);
+    return(RetStr);
 }
 
 
 char *GoogleTOTP(char *RetStr, const char *EncodedSecret)
 {
-return(TOTP(RetStr, "sha1", EncodedSecret, ENCODE_BASE32, 6, 30));
+    return(TOTP(RetStr, "sha1", EncodedSecret, ENCODE_BASE32, 6, 30));
 }
diff --git a/libUseful-5/OpenSSL.c b/libUseful-5/OpenSSL.c
index 4c47c41..f3d6168 100644
--- a/libUseful-5/OpenSSL.c
+++ b/libUseful-5/OpenSSL.c
@@ -81,7 +81,11 @@ static void STREAM_INTERNAL_SSL_ADD_SECURE_KEYS(STREAM *S, SSL_CTX *ctx)
 
 }
 
-static int OpenSSLVerifyCallback(int PreverifyStatus, X509_STORE_CTX *X509)
+
+
+//do not configure this function as static, it is useful for autoconf checks to discover if libUseful
+//has been compiled with SSL included
+int OpenSSLVerifyCallback(int PreverifyStatus, X509_STORE_CTX *X509)
 {
 //This does nothing. verification is done in 'OpenSSLVerifyCertificate' instead
     return(1);
@@ -134,6 +138,114 @@ static char *OpenSSLGetCertFingerprint(char *RetStr, X509 *cert)
 }
 
 
+
+
+static void OpenSSLSetupECDH(SSL_CTX *ctx)
+{
+    EC_KEY* ecdh;
+
+    ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+//ecdh = EC_KEY_new_by_curve_name( NID_secp384r1);
+
+    if (ecdh)
+    {
+        SSL_CTX_set_tmp_ecdh(ctx, ecdh);
+        EC_KEY_free(ecdh);
+    }
+
+}
+
+
+static void OpenSSLReseedRandom()
+{
+    int len=32;
+    char *Tempstr=NULL;
+
+
+    len=GenerateRandomBytes(&Tempstr, len, ENCODE_NONE);
+    RAND_seed(Tempstr,len);
+    memset(Tempstr,0,len); //extra paranoid step, don't keep those bytes in memory!
+
+    DestroyString(Tempstr);
+}
+
+
+
+
+
+
+
+static void OpenSSLSetupDH(SSL_CTX *ctx)
+{
+    char *Tempstr=NULL;
+    const char *ptr;
+    DH *dh=NULL;
+    FILE *paramfile;
+
+    if (CachedDH) dh=CachedDH;
+    else
+    {
+        ptr=LibUsefulGetValue("SSL:DHParams-File");
+        if (StrValid(ptr))
+        {
+            Tempstr=CopyStr(Tempstr,ptr);
+
+            paramfile = fopen(Tempstr, "r");
+            if (paramfile)
+            {
+                CachedDH = PEM_read_DHparams(paramfile, NULL, NULL, NULL);
+                dh=CachedDH;
+                fclose(paramfile);
+            }
+        }
+    }
+
+    if (dh) SSL_CTX_set_tmp_dh(ctx, dh);
+
+//Don't free these parameters, as they are cached
+//DH_KEY_free(dh);
+
+    DestroyString(Tempstr);
+}
+
+
+
+
+static int INTERNAL_SSL_INIT()
+{
+    char *Tempstr=NULL;
+    static int InitDone=FALSE;
+
+//Always reseed RAND on a new connection
+//OpenSSLReseedRandom();
+
+    if (InitDone) return(TRUE);
+
+    SSL_library_init();
+#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
+    OpenSSL_add_all_algorithms();
+#endif
+    SSL_load_error_strings();
+    Tempstr=MCopyStr(Tempstr,"openssl:",SSLeay_version(SSLEAY_VERSION)," : ", SSLeay_version(SSLEAY_BUILT_ON), " : ",SSLeay_version(SSLEAY_CFLAGS),NULL);
+    LibUsefulSetValue("SSL:Library", Tempstr);
+    if (! StrValid(LibUsefulGetValue("SSL:Level"))) LibUsefulSetValue("SSL:Level", "tls");
+    DestroyString(Tempstr);
+    InitDone=TRUE;
+    return(TRUE);
+}
+
+
+
+#endif
+//end of static functions that only exist if we have libssl
+
+
+
+//everything after this exists even if we don't have libssl, and returns a fail value if called without
+//libssl being compiled in. These are functions that can/might be called by programs, and thus need
+//to always exist, even if only as stubs
+
+
 char *OpenSSLCertDetailsGetCommonName(char *RetStr, const char *CertDetails)
 {
     char *Name=NULL, *Value=NULL;
@@ -161,6 +273,8 @@ int OpenSSLVerifyCertificate(STREAM *S, int Flags)
     char *Value=NULL;
     const char *ptr;
     int val;
+
+#ifdef HAVE_LIBSSL
     X509 *cert=NULL;
     SSL *ssl;
 
@@ -315,6 +429,7 @@ int OpenSSLVerifyCertificate(STREAM *S, int Flags)
     }
     else OpenSSLCertError(S,"peer provided no certificate");
 
+#endif
 
     DestroyString(Value);
 
@@ -331,7 +446,8 @@ int OpenSSLVerifyCertificate(STREAM *S, int Flags)
 // tls1.3 - allow TLSv.13 and up
 // default. Currently equivalent to tls but may change in future
 
-static int OpenSSLSetOptions(STREAM *S, SSL *ssl, int Options)
+#ifdef HAVE_LIBSSL
+int OpenSSLSetOptions(STREAM *S, SSL *ssl, int Options)
 {
     const char *ptr;
     int level=LEVEL_SSL3, val;
@@ -406,114 +522,10 @@ static int OpenSSLSetOptions(STREAM *S, SSL *ssl, int Options)
 
 
     SSL_set_options(ssl, Options);
-    return(Options);
-}
-
-
-
-static void OpenSSLSetupECDH(SSL_CTX *ctx)
-{
-    EC_KEY* ecdh;
-
-    ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-//ecdh = EC_KEY_new_by_curve_name( NID_secp384r1);
-
-    if (ecdh)
-    {
-        SSL_CTX_set_tmp_ecdh(ctx, ecdh);
-        EC_KEY_free(ecdh);
-    }
-
-}
-
-
-static void OpenSSLReseedRandom()
-{
-    int len=32;
-    char *Tempstr=NULL;
-
-
-    len=GenerateRandomBytes(&Tempstr, len, ENCODE_NONE);
-    RAND_seed(Tempstr,len);
-    memset(Tempstr,0,len); //extra paranoid step, don't keep those bytes in memory!
-
-    DestroyString(Tempstr);
-}
-
-
-
-
-
-
-
-static void OpenSSLSetupDH(SSL_CTX *ctx)
-{
-    char *Tempstr=NULL;
-    const char *ptr;
-    DH *dh=NULL;
-    FILE *paramfile;
-
-    if (CachedDH) dh=CachedDH;
-    else
-    {
-        ptr=LibUsefulGetValue("SSL:DHParams-File");
-        if (StrValid(ptr))
-        {
-            Tempstr=CopyStr(Tempstr,ptr);
-
-            paramfile = fopen(Tempstr, "r");
-            if (paramfile)
-            {
-                CachedDH = PEM_read_DHparams(paramfile, NULL, NULL, NULL);
-                dh=CachedDH;
-                fclose(paramfile);
-            }
-        }
-    }
-
-    if (dh) SSL_CTX_set_tmp_dh(ctx, dh);
-
-//Don't free these parameters, as they are cached
-//DH_KEY_free(dh);
-
-    DestroyString(Tempstr);
-}
-
-
-
-
-static int INTERNAL_SSL_INIT()
-{
-    char *Tempstr=NULL;
-    static int InitDone=FALSE;
-
-//Always reseed RAND on a new connection
-//OpenSSLReseedRandom();
-
-    if (InitDone) return(TRUE);
 
-    SSL_library_init();
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
-    OpenSSL_add_all_algorithms();
-#endif
-    SSL_load_error_strings();
-    Tempstr=MCopyStr(Tempstr,"openssl:",SSLeay_version(SSLEAY_VERSION)," : ", SSLeay_version(SSLEAY_BUILT_ON), " : ",SSLeay_version(SSLEAY_CFLAGS),NULL);
-    LibUsefulSetValue("SSL:Library", Tempstr);
-    if (! StrValid(LibUsefulGetValue("SSL:Level"))) LibUsefulSetValue("SSL:Level", "tls");
-    DestroyString(Tempstr);
-    InitDone=TRUE;
-    return(TRUE);
+    return(Options);
 }
-
-
-
 #endif
-//end of static functions that only exist if we have libssl
-
-
-
-//everything after this exists even if we don't have libssl, and returns a fail value if called
-
 
 
 
@@ -820,21 +832,21 @@ int OpenSSLSTREAMReadBytes(STREAM *S, char *Data, int len)
             //and if we don't, the connection is effectively closed
             bytes_read=-1;
 
-	/*
-            val=SSL_get_error(SSL_OBJ, bytes_read);
-            switch (val)
-            {
-            //these all mean SSL is waiting for more data, and has nothing to offer us right now
-            case SSL_ERROR_WANT_READ:
-            	bytes_read=0;
-             break;
+            /*
+                    val=SSL_get_error(SSL_OBJ, bytes_read);
+                    switch (val)
+                    {
+                    //these all mean SSL is waiting for more data, and has nothing to offer us right now
+                    case SSL_ERROR_WANT_READ:
+                    	bytes_read=0;
+                     break;
 
-            //for anything else consider the connection closed
-            default:
-            	bytes_read=-1;
-            break;
-            }
-	 */
+                    //for anything else consider the connection closed
+                    default:
+                    	bytes_read=-1;
+                    break;
+                    }
+             */
         }
     }
 #endif
diff --git a/libUseful-5/Process.c b/libUseful-5/Process.c
index 4fe2694..e68f615 100644
--- a/libUseful-5/Process.c
+++ b/libUseful-5/Process.c
@@ -889,6 +889,8 @@ int ProcessApplyLateConfig(int Flags, const char *Config)
     Destroy(Name);
     Destroy(Value);
     Destroy(Capabilities);
+
+    return(Flags);
 }
 
 
diff --git a/libUseful-5/README.md b/libUseful-5/README.md
old mode 100755
new mode 100644
diff --git a/libUseful-5/Socket.c b/libUseful-5/Socket.c
index 7d9d85a..230ef55 100644
--- a/libUseful-5/Socket.c
+++ b/libUseful-5/Socket.c
@@ -346,7 +346,7 @@ int BindSock(int Type, const char *Address, int Port, int Flags)
 int GetHostARP(const char *IP, char **Device, char **MAC)
 {
     char *Tempstr=NULL, *Token=NULL;
-    int result=FALSE;
+    int result=FALSE, len;
     const char *ptr;
     FILE *F;
 
@@ -764,13 +764,13 @@ int IPReconnect(int sock, const char *Host, int Port, int Flags)
 int NetConnectWithSettings(const char *Proto, const char *LocalHost, const char *InHost, int Port, TSockSettings *Settings)
 {
     const char *p_LocalHost=LocalHost;
-		char *Host=NULL;
+    char *Host=NULL;
     int sock, result;
 
 
-		//we have preserved 'host' with '[ addr ]' wrapper for IP6 until now
-		if (*InHost=='[') Host=CopyStrLen(Host, InHost+1, StrLen(InHost)-2);
-		else Host=CopyStr(Host, InHost);
+    //we have preserved 'host' with '[ addr ]' wrapper for IP6 until now
+    if (*InHost=='[') Host=CopyStrLen(Host, InHost+1, StrLen(InHost)-2);
+    else Host=CopyStr(Host, InHost);
 
 
     if ((! StrValid(p_LocalHost)) && IsIP6Address(Host)) p_LocalHost="::";
@@ -791,8 +791,8 @@ int NetConnectWithSettings(const char *Proto, const char *LocalHost, const char
 
     result=IPReconnect(sock, Host, Port, Settings->Flags);
 
-		Destroy(Host);
-		
+    Destroy(Host);
+
     if (result==-1)
     {
         close(sock);
diff --git a/libUseful-5/Socket.h b/libUseful-5/Socket.h
index b577f16..ae307f4 100644
--- a/libUseful-5/Socket.h
+++ b/libUseful-5/Socket.h
@@ -204,6 +204,10 @@ int TCPConnect(const char *Host, int Port, const char *Config);
 int STREAMNetConnect(STREAM *S, const char *Proto, const char *Host, int Port, const char *Config);
 int STREAMConnect(STREAM *S, const char *URL, const char *Config);
 
+//Send a UDP dgram (or maybe unix socket dgram) 
+int STREAMSendDgram(STREAM *S, const char *Host, int Port, char *Data, int len);
+
+
 //these are internal functions that you won't usually be concerned with
 int STREAMProtocolConnect(STREAM *S, const char *URL, const char *Config);
 int STREAMDirectConnect(STREAM *S, const char *URL, int Flags);
diff --git a/libUseful-5/SpawnPrograms.c b/libUseful-5/SpawnPrograms.c
index 8517030..6392d93 100644
--- a/libUseful-5/SpawnPrograms.c
+++ b/libUseful-5/SpawnPrograms.c
@@ -184,25 +184,25 @@ pid_t SpawnWithIO(const char *CommandLine, const char *Config, int StdIn, int St
 //This creates an STDIO pipe, unless 'ToNull' is true
 static int PipeSpawnCreateStdOutPipe(const char *Type, int channel[2], int ToNull)
 {
-int fd=-1, result;
+    int fd=-1, result;
 
-channel[0]=-1;
-channel[1]=-1;
+    channel[0]=-1;
+    channel[1]=-1;
 
 //if we ask for this to be set to null, then we map leave fd set to -1
 //which maps to /dev/null in xforkio
-if (! ToNull) 
-{
-	result=pipe(channel);
-  if (result==0) 
-	{
-	  if (strcmp(Type, "stdin")==0) fd=channel[0];
-		else fd=channel[1];
-	}
-  else RaiseError(ERRFLAG_ERRNO, "PipeSpawnFunction", "Failed to create pipe for %s", Type);
-}
+    if (! ToNull)
+    {
+        result=pipe(channel);
+        if (result==0)
+        {
+            if (strcmp(Type, "stdin")==0) fd=channel[0];
+            else fd=channel[1];
+        }
+        else RaiseError(ERRFLAG_ERRNO, "PipeSpawnFunction", "Failed to create pipe for %s", Type);
+    }
 
-return(fd);
+    return(fd);
 }
 
 
@@ -247,13 +247,13 @@ pid_t PipeSpawnFunction(int *infd, int *outfd, int *errfd, BASIC_FUNC Func, void
         {
             close(channel1[0]);
             *infd=channel1[1];
-						if (*infd == -1) *infd=open("/dev/null", O_RDWR);
+            if (*infd == -1) *infd=open("/dev/null", O_RDWR);
         }
         if (outfd)
         {
             close(channel2[1]);
             *outfd=channel2[0];
-						if (*outfd == -1) *outfd=open("/dev/null", O_RDWR);
+            if (*outfd == -1) *outfd=open("/dev/null", O_RDWR);
         }
 
         if (errfd)
diff --git a/libUseful-5/Ssh.h b/libUseful-5/Ssh.h
old mode 100755
new mode 100644
diff --git a/libUseful-5/Stream.c b/libUseful-5/Stream.c
index fd38cc2..0e75753 100644
--- a/libUseful-5/Stream.c
+++ b/libUseful-5/Stream.c
@@ -42,7 +42,7 @@ typedef struct
 #include <poll.h>
 #include <math.h>
 
-static void *SelectAddFD(TSelectSet *Set, int type, int fd)
+static void SelectAddFD(TSelectSet *Set, int type, int fd)
 {
     struct pollfd *items;
 
@@ -800,6 +800,7 @@ STREAM *STREAMFileOpen(const char *Path, int Flags)
 
     if (Flags & STREAM_APPEND) Mode |=O_APPEND;
     if (Flags & SF_CREATE) Mode |=O_CREAT;
+    if (Flags & SF_EXCL) Mode |=O_EXCL;
 
     if (CompareStr(Path,"-")==0)
     {
@@ -990,6 +991,12 @@ static int STREAMParseConfig(const char *Config)
             case 't':
                 Flags |= SF_TMPNAME;
                 break;
+            case 'x':
+                //for local files this is 'exclusive open' with O_EXCL.
+                //for ssh connections this is the 'execute' flag that indicates
+                //a command is to be run
+                Flags |= SF_EXCL;
+                break;
             case 'z':
                 Flags |= SF_COMPRESSED;
                 break;
@@ -1087,6 +1094,7 @@ STREAM *STREAMOpen(const char *URL, const char *Config)
     case 't':
     case 's':
     case 'u':
+    case 'b': //b for 'bcast'
         if ( (CompareStr(URL,"-")==0) || (strcasecmp(URL,"stdio:")==0) ) S=STREAMFromDualFD(dup(0), dup(1));
         else if (strcasecmp(URL,"stdin:")==0) S=STREAMFromFD(dup(0));
         else if (strcasecmp(URL,"stdout:")==0) S=STREAMFromFD(dup(1));
@@ -1955,6 +1963,12 @@ char *STREAMReadToTerminator(char *Buffer, STREAM *S, unsigned char Term)
     const unsigned char *p_Term;
     int IsClosed=FALSE;
 
+    if (! S)
+    {
+        RaiseError(0, "STREAMReadToterminator", "NULL stream object passed to function");
+        Destroy(Buffer);
+        return(NULL);
+    }
 
     RetStr=CopyStr(Buffer,"");
     while (1)
@@ -2319,20 +2333,22 @@ int STREAMFind(STREAM *S, const char *Item, const char *Delimiter, char **RetStr
 
 static int UseKernelSendFile(STREAM *In, STREAM *Out, int Flags)
 {
-if (! (Flags & SENDFILE_KERNEL)) return(FALSE);
-switch (In->Type)
-{
-case STREAM_TYPE_FILE:
-case STREAM_TYPE_PIPE:
-break;
+    if (! (Flags & SENDFILE_KERNEL)) return(FALSE);
+    switch (In->Type)
+    {
+    case STREAM_TYPE_FILE:
+    case STREAM_TYPE_PIPE:
+        break;
 
-default: return(FALSE); break;
-}
+    default:
+        return(FALSE);
+        break;
+    }
 
-if  (ListSize(In->ProcessingModules) > 0) return(FALSE);
-if  (ListSize(Out->ProcessingModules) > 0) return(FALSE);
+    if  (ListSize(In->ProcessingModules) > 0) return(FALSE);
+    if  (ListSize(Out->ProcessingModules) > 0) return(FALSE);
 
-return(TRUE);
+    return(TRUE);
 }
 
 
diff --git a/libUseful-5/Stream.h b/libUseful-5/Stream.h
index 8669fce..aabc6a7 100644
--- a/libUseful-5/Stream.h
+++ b/libUseful-5/Stream.h
@@ -22,10 +22,11 @@ The first argument can be any of the following types:
 file:///tmp/myfile.txt                   file, web-browser style. Note 3 '/' symbols. 
 mmap:/tmp/myfile.txt                     memory mapped file
 tty:/dev/ttyS0:38400                     open a serial device, in this case at 38400 baud
-udp:192.168.2.1:53                       udp network connection
+udp:192.168.2.1:53                       udp socket (Use STREAMSendDgram, from Socket.h to send packets)
 tcp:192.168.2.1:25                       tcp network connection
 ssl:192.168.2.1:443                      tcp network connection with encryption
 tls:192.168.2.1:443                      tcp network connection with encryption
+bcast:255.255.255.255:5353               udp broadcast socket (Use STREAMSendDgram, from Socket.h to send packets)
 ws:nos.lol/                              websocket
 wss:nos.lol/                             secure websocket
 unix:/tmp/socket                         unix socket
@@ -74,11 +75,12 @@ L     lock/unlock file on each write
 i     allow this file to be inherited across an exec (default is close-on-exec)
 t     make a unique temporary file name. the file path must be a mktemp style template, with the last six characters being 'XXXXXX'
 S     file contents are sorted
-x     treat file path as a command to execute (currently on in ssh: streams) 
+x     exclusive open using O_EXCL. Only create/open file if it doesn't exist.
 z     compress/uncompress with gzip
 
 
-for tcp/unix/udp network connections the 'config argument' is normally 'rw' followed by name-value pairs with the following values
+for tcp/unix/udp network connections the 'config argument' defaults to 'rw' if blank. 
+Otherwise it is made up of the following options
 
 r  - 'read' mode (a non-op as all sockets are readable)
 w  - 'write' mode (a non-op as all sockets are writeable)
@@ -90,7 +92,7 @@ F  - TCP Fastopen
 R  - Don't route (equivalent to applying SOCKOPT_DONTROUTE)
 N  - TCP no-delay (disable Nagle algo)
 
-Name-value pairs are:
+This argument can be followed by name-value pairs such as:
 
 ttl=<seconds>       set ttl of socket
 tos=<value>         set tos of socket
@@ -99,6 +101,25 @@ keepalive=<y/n>     turn on/off socket keepalives
 timeout=<centisecs> connect/read timeout for socket
 
 
+
+For SSH streams config argument is a string of characters each of which represents an option 
+that modifies stream behavior, as with 'fopen'. By default SSH streams are treated as a 
+stream to a file, much like http, but if the 'x' flag is used, the file name is instead
+treated as a command to be run, with the contents of the stream being the output from and
+input to that command.
+
+c     create file
+r     read only
+w     write only
+a     append 
++     make read-only, append or write-only be read-write
+E     raise an error if this file fails to open
+i     allow this file to be inherited across an exec (default is close-on-exec)
+S     file contents are sorted
+x     treat file path as a command to execute (currently on in ssh: streams) 
+z     compress/uncompress with gzip
+
+
 for 'http', 'https', 'ws' and 'wss' URLs the first argument is a character list (though only one character long) with the following values
 
 r    GET method (default if no method specified)
@@ -108,16 +129,16 @@ D    DELETE method
 P    PATCH method
 H    HEAD  method
 
-after this initial argument come name-value pairs with the following values
 
+method=<method>  //override method (GET/POST etc) with any default value
 oauth=<oauth config to use>
-content-type=<content type>
-content-length=<content length>
+content-type=<content type>         //content type of sent data (for PUT/POST)
+content-length=<content length>     //content length of sent data (for PUT/POST)
 user=<username>
 useragent=<user agent>
 user-agent=<user agent>
-timeout=<centisecs>
-hostauth
+timeout=<centisecs>    //socket timeout in centisecs, this applies both to connection timeout and read timeout. If a different value is desired for read, set it with 'STREAMSetTimeout'
+hostauth   //send auth details without waiting for 401 from server
 
 Note, 'hostauth' is not a name/value pair, just a config flag that enables sending authentication without waiting for a 401 Response from the server. This means that we can't know the authentication realm for the server, and so internally use the hostname as the realm for looking up logon credentials. This is mostly useful for the github api.
 
@@ -189,9 +210,10 @@ typedef enum {STREAM_TYPE_FILE, STREAM_TYPE_PIPE, STREAM_TYPE_TTY, STREAM_TYPE_U
 #define SF_TLS    4096     //ONLY FOR SOCKETS: use SSL/TLS
 #define SF_SECURE 8192     //lock internal buffers into memory so they aren't written to swap or coredumps
 #define SF_NONBLOCK 16384  //nonblocking open (you must use select to check that the file is ready to use)
+#define SF_EXCL     32768  //ONLY FOR FILES: exclusive create with O_EXCL, file must not pre-exist
 #define SF_TLS_AUTO 32768  //nothing to see here, move along
 #define SF_ERROR 65536     //raise an error if open or connect fails
-#define SF_EXEC_INHERIT 131072  //allow file to be inherited across an exec (default is close-on-exec)
+#define SF_EXEC_INHERIT 131072  //allow stream to be inherited across an exec (default is close-on-exec)
 #define SF_BINARY       262144  //'binary mode' for websocket etc
 #define SF_NOCACHE 524288       //don't cache file data in filesystem cache
 #define SF_SORTED  1048576      //file is sorted, this is a hint to 'STREAMFind'
diff --git a/libUseful-5/StreamAuth.c b/libUseful-5/StreamAuth.c
index 5c703d9..d7ca67d 100644
--- a/libUseful-5/StreamAuth.c
+++ b/libUseful-5/StreamAuth.c
@@ -9,7 +9,7 @@
 static int STREAMAuthValueFile(const char *Path, const char *Value)
 {
 
-
+    return(FALSE);
 }
 
 //did the client provide an SSL certificate as authentication?
@@ -18,6 +18,7 @@ static int STREAMAuthProcessCertificate(STREAM *S, const char *CertName, const c
     char *Require=NULL;
     int AuthResult=FALSE;
 
+#ifdef HAVE_LIBSSL
 //does the certificate name/subject match out expectation?
     Require=OpenSSLCertDetailsGetCommonName(Require, STREAMGetValue(S, CommonName));
     if (CompareStr(CertName, Require)==0)
@@ -25,6 +26,7 @@ static int STREAMAuthProcessCertificate(STREAM *S, const char *CertName, const c
         //is certificate valid
         if (CompareStr(STREAMGetValue(S, "SSL:CertificateVerify"), "OK")==0) AuthResult=TRUE;
     }
+#endif
 
     Destroy(Require);
     return(AuthResult);
@@ -70,7 +72,7 @@ static int STREAMAuthProcess(STREAM *S, const char *AuthTypes)
         printf("AUTH: %s\n", Key);
         if (CompareStrNoCase(Key, "basic")==0)
         {
-	    Tempstr=EncodeBytes(Tempstr, Value, StrLen(Value), ENCODE_BASE64);
+            Tempstr=EncodeBytes(Tempstr, Value, StrLen(Value), ENCODE_BASE64);
             if (CompareStr(Tempstr, STREAMGetValue(S, "Auth:Basic"))==0) AuthResult=TRUE;
         }
         else if (
diff --git a/libUseful-5/Terminal.c b/libUseful-5/Terminal.c
index dcd44cd..ff23d1d 100644
--- a/libUseful-5/Terminal.c
+++ b/libUseful-5/Terminal.c
@@ -322,9 +322,9 @@ void TerminalInternalConfig(const char *Config, int *ForeColor, int *BackColor,
             if (strcasecmp(Name,"mouse")==0) *Flags=TERM_MOUSE;
             break;
 
-	case 'n':
+        case 'n':
             if (strcasecmp(Name,"nocolor")==0) *Flags=TERM_NOCOLOR;
-	    break;
+            break;
 
         case 'r':
         case 'R':
@@ -524,7 +524,7 @@ const char *TerminalParseColor(const char *Str, int *Fg, int *Bg)
         *Fg=ANSI_WHITE + offset;
         break;
     case 'W':
-        *Fg=ANSI_WHITE + offset;
+        *Bg=ANSI_WHITE + offset;
         break;
     case 'y':
         *Fg=ANSI_YELLOW + offset;
@@ -656,7 +656,7 @@ const char *TerminalFormatSubStr(const char *Str, char **RetStr, STREAM *Term)
                 Fg=0;
                 Bg=0;
                 ptr=TerminalParseColor(ptr, &Fg, &Bg);
-		//if we have a Term object, then TERM_STREAM_NOCOLOR must not be set
+                //if we have a Term object, then TERM_STREAM_NOCOLOR must not be set
                 if ((! Term) || (! (Term->Flags & TERM_STREAM_NOCOLOR))) *RetStr=TerminalCommandStr(*RetStr, TERM_COLOR, Fg, Bg);
                 break;
 
diff --git a/libUseful-5/Terminal.h b/libUseful-5/Terminal.h
index 1ce52ae..368c9d8 100644
--- a/libUseful-5/Terminal.h
+++ b/libUseful-5/Terminal.h
@@ -19,6 +19,8 @@ and the following 'tilde command' formatting values
 ~B        switch background to blue
 ~n        switch color to black ('night' or 'noir')
 ~N        switch background to black ('night' or 'noir')
+~w        switch color to white
+~W        switch background to white
 ~y        switch color to yellow
 ~Y        switch background to yellow
 ~m        switch color to magenta
@@ -32,6 +34,8 @@ and the following 'tilde command' formatting values
 ~+B       switch background to bright blue
 ~+n       switch color to bright black ('night' or 'noir')
 ~+N       switch background to bright black ('night' or 'noir')
+~+w       switch color to bright white
+~+w       switch background to bright white 
 ~+y       switch color to bright yellow
 ~+Y       switch background to bright yellow
 ~+m       switch color to bright magenta
diff --git a/libUseful-5/TerminalChoice.h b/libUseful-5/TerminalChoice.h
index e0a4df0..eb13d4a 100644
--- a/libUseful-5/TerminalChoice.h
+++ b/libUseful-5/TerminalChoice.h
@@ -66,29 +66,29 @@ Copyright (c) 2015 Colum Paget <colums.projects@googlemail.com>
  */
 
 
-#ifndef LIBUSEFUL_TERMINAL_MENUBAR_H
-#define LIBUSEFUL_TERMINAL_MENUBAR_H
+#ifndef LIBUSEFUL_TERMINAL_CHOICE_H
+#define LIBUSEFUL_TERMINAL_CHOICE_H
 
 #include "includes.h"
 #include "Unicode.h"
 #include "KeyCodes.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "Terminal.h"
 #include "TerminalMenu.h"
 
 #define TERMCHOICE TERMMENU
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define TerminalChoiceDestroy TerminalWidgetDestroy
 #define TerminalChoiceSetOptions TerminalWidgetSetOptions
 
 TERMCHOICE *TerminalChoiceCreate(STREAM *Term, const char *Config);
-void TerminalChoiceDraw(TERMCHOICE *MB);
-char *TerminalChoiceOnKey(char *RetStr, TERMCHOICE *MB, int key);
-char *TerminalChoiceProcess(char *RetStr, TERMCHOICE *MB);
+void TerminalChoiceDraw(TERMCHOICE *Chooser);
+char *TerminalChoiceOnKey(char *RetStr, TERMCHOICE *Chooser, int key);
+char *TerminalChoiceProcess(char *RetStr, TERMCHOICE *Chooser);
 char *TerminalChoice(char *RetStr, STREAM *Term, const char *Config);
 
 
diff --git a/libUseful-5/TerminalProgress.c b/libUseful-5/TerminalProgress.c
new file mode 100644
index 0000000..fcc95b8
--- /dev/null
+++ b/libUseful-5/TerminalProgress.c
@@ -0,0 +1,63 @@
+#include "TerminalProgress.h"
+#include "TerminalTheme.h"
+
+TERMPROGRESS *TerminalProgressCreate(STREAM *Term, const char *Config)
+{
+    TERMPROGRESS *TP;
+
+    TP=TerminalWidgetCreate(Term, "progress=* remain=' ' left-contain=' [' right-contain='] '");
+    TerminalThemeApply(TP, "Progress");
+    TerminalWidgetParseConfig(TP, Config);
+    return(TP);
+}
+
+
+void TerminalProgressDraw(TERMPROGRESS *TP, float Fract, const char *Info)
+{
+    char *Tempstr=NULL, *Bar=NULL, *Remain=NULL;
+    int i, len;
+
+    if (TP->Flags & TERMMENU_POSITIONED) TerminalCommand(TERM_CURSOR_MOVE, TP->x, TP->y, TP->Term);
+    else Tempstr=CopyStr(Tempstr, "\r");
+
+    if (StrValid(TP->Text)) Tempstr=CatStr(Tempstr, TP->Text);
+
+    Tempstr=MCatStr(Tempstr, GetVar(TP->Options, "LeftContainer"), TP->SelectedAttribs, NULL);
+
+    len=(int) (TP->wid * Fract + 0.5);
+    Bar=PadStr(Bar, *TP->CursorLeft, len);
+
+    Tempstr=CatStr(Tempstr, Bar);
+
+    if (StrValid(TP->Attribs)) Tempstr=CatStr(Tempstr, TP->Attribs);
+    else if (StrValid(TP->SelectedAttribs)) Tempstr=CatStr(Tempstr, "~0");
+
+    Remain=PadStr(Remain, *TP->CursorRight, TP->wid - len);
+    Tempstr=CatStr(Tempstr, Remain);
+
+    if (StrValid(TP->Attribs)) Tempstr=CatStr(Tempstr, "~0");
+    Tempstr=CatStr(Tempstr, GetVar(TP->Options, "RightContainer"));
+    if (StrValid(Info)) Tempstr=MCatStr(Tempstr, Info, "~>", NULL);
+
+    TerminalPutStr(Tempstr, TP->Term);
+    STREAMFlush(TP->Term);
+
+    Destroy(Tempstr);
+    Destroy(Remain);
+    Destroy(Bar);
+}
+
+
+
+
+float TerminalProgressUpdate(TERMPROGRESS *TP, int Value, int Max, const char *Info)
+{
+    float Fract;
+
+    Fract=((float) Value) / ((float) Max);
+
+    TerminalProgressDraw(TP, Fract, Info);
+    return(Fract);
+}
+
+
diff --git a/libUseful-5/TerminalProgress.h b/libUseful-5/TerminalProgress.h
new file mode 100644
index 0000000..fb5f681
--- /dev/null
+++ b/libUseful-5/TerminalProgress.h
@@ -0,0 +1,82 @@
+/*
+Copyright (c) 2015 Colum Paget <colums.projects@googlemail.com>
+* SPDX-License-Identifier: GPL-3.0
+*/
+
+/* This implements a simple terminal progress bar
+ *
+ * Example Usage:
+
+STREAM *Term;
+char *Tempstr=NULL;
+TERMPROGRESS *TP;
+int i;
+
+Term=STREAMFromDualFD(0,1);
+TerminalInit(Term, TERM_RAWKEYS | TERM_SAVEATTRIBS);
+TerminalClear(Term);
+
+TP=TerminalProgressCreate(Term, "prompt='progress: ' left-contain=' -=' right-contain='=- ' progress=| width=20");
+for (i=0; i <= 20; i++) 
+{
+Tempstr=FormatStr(Tempstr, "NOW AT: %d", i);
+TerminalProgressUpdate(TP, i, 20, Tempstr);
+sleep(1);
+}
+
+TerminalReset(Term);
+}
+
+ *
+ *  The 'Config' parameter of TerminalProgressCreate takes the following entries:
+ *
+ *  prompt=            A text or prompt that preceeds the progress bar
+ *  x=                 Position the progress-bar at terminal column 'x'. Without x and/or y the progress-bar will be on the current line
+ *  y=                 Position the progress-bar at terminal row 'y'. Without x and/or y the progress-bar will be on the current line
+ *  width=             Width in characters of progress-bar NOT INCLUDING prompt, left container, right container etc
+ *  progress=          A character to use for the progress part of the bar, defaults to '*'
+ *  remain=            A character to use for the remaining part of the bar, defaults to ' '
+ *  remainder=         A character to use for the remaining part of the bar, defaults to ' '
+ *  remaining=         A character to use for the remaining part of the bar, defaults to ' '
+ *  attrib=            Set attributes of REMAINDER part of the bar
+ *  progress-attrib=   Set attributes of PROGRESS part of the bar
+ *  left-contain=      A string to be the left 'container' of the bar, defaults to ' ['
+ *  right-contain=     A string to be the right 'container' of the bar, defaults to '] '
+ *
+ *  attrib and progress-attrib can be used to create bars based only around colored blocks, like so
+
+TP=TerminalProgressCreate(Term, "prompt='progress: ' progress=' ' attribs=~B progress-attribs=~W left-contain='' right-contain=' ' width=20");
+ *
+ */
+
+
+#ifndef LIBUSEFUL_TERMINAL_PROGRESS_H
+#define LIBUSEFUL_TERMINAL_PROGRESS_H
+
+#include "includes.h"
+#include "Unicode.h"
+#include "KeyCodes.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "Terminal.h"
+#include "TerminalMenu.h"
+
+#define TERMPROGRESS TERMWIDGET
+
+#define TerminalProgressDestroy TerminalWidgetDestroy
+#define TerminalProgressSetOptions TerminalWidgetSetOptions
+
+TERMPROGRESS *TerminalProgressCreate(STREAM *Term, const char *Config);
+void TerminalProgressDraw(TERMPROGRESS *TP, float Perc, const char *Info);
+char *TerminalProgressProcess(char *RetStr, TERMPROGRESS *TP);
+float TerminalProgressUpdate(TERMPROGRESS *TP, int Value, int Max, const char *Info);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/libUseful-5/TerminalTheme.c b/libUseful-5/TerminalTheme.c
index 10205d9..874ab67 100644
--- a/libUseful-5/TerminalTheme.c
+++ b/libUseful-5/TerminalTheme.c
@@ -43,21 +43,26 @@ void TerminalThemeSet(const char *Name, const char *Value)
     SetVar(TermTheme, Name, Value);
 }
 
-void TerminalThemeApply(TERMWIDGET *TW, const char *Type)
+static char *TerminalThemeLoadValue(char *RetStr, const char *Theme, const char *Attrib)
 {
     char *Tempstr=NULL;
+    const char *ptr;
 
     if (! TermTheme) TerminalThemeInit();
-    Tempstr=MCopyStr(Tempstr, Type, ":Attribs", NULL);
-    TW->Attribs=CopyStr(TW->Attribs, TerminalThemeGet(Tempstr));
-    Tempstr=MCopyStr(Tempstr, Type, ":CursorAttribs", NULL);
-    TW->CursorAttribs=CopyStr(TW->CursorAttribs, TerminalThemeGet(Tempstr));
-    Tempstr=MCopyStr(Tempstr, Type, ":SelectedAttribs", NULL);
-    TW->SelectedAttribs=CopyStr(TW->SelectedAttribs, TerminalThemeGet(Tempstr));
-    Tempstr=MCopyStr(Tempstr, Type, ":CursorLeft", NULL);
-    TW->CursorLeft=CopyStr(TW->CursorLeft, TerminalThemeGet(Tempstr));
-    Tempstr=MCopyStr(Tempstr, Type, ":CursorRight", NULL);
-    TW->CursorRight=CopyStr(TW->CursorRight, TerminalThemeGet(Tempstr));
+
+    Tempstr=MCopyStr(Tempstr, Theme, ":", Attrib, NULL);
+    ptr=TerminalThemeGet(Tempstr);
+    if (StrValid(ptr)) RetStr=CopyStr(RetStr, ptr);
 
     Destroy(Tempstr);
+    return(RetStr);
+}
+
+void TerminalThemeApply(TERMWIDGET *TW, const char *Type)
+{
+    TW->Attribs=TerminalThemeLoadValue(TW->Attribs, Type, "Attribs");
+    TW->CursorAttribs=TerminalThemeLoadValue(TW->CursorAttribs, Type, "CursorAttribs");
+    TW->SelectedAttribs=TerminalThemeLoadValue(TW->SelectedAttribs, Type, "SelectedAttribs");
+    TW->CursorLeft=TerminalThemeLoadValue(TW->CursorLeft, Type, "CursorLeft");
+    TW->CursorRight=TerminalThemeLoadValue(TW->CursorRight, Type, "CursorRight");
 }
diff --git a/libUseful-5/TerminalWidget.c b/libUseful-5/TerminalWidget.c
index 91cbb79..331dd76 100644
--- a/libUseful-5/TerminalWidget.c
+++ b/libUseful-5/TerminalWidget.c
@@ -32,6 +32,7 @@ void TerminalWidgetParseConfig(TERMWIDGET *TW, const char *Config)
     ptr=GetNameValuePair(Config, "\\S", "=", &Name, &Value);
     while (ptr)
     {
+        strrep(Name, '-', '_');
         switch (*Name)
         {
         case 'x':
@@ -50,12 +51,19 @@ void TerminalWidgetParseConfig(TERMWIDGET *TW, const char *Config)
 
         case 'c':
             if (strcasecmp(Name, "cursor")==0) TW->CursorLeft=CopyStr(TW->CursorLeft, Value);
-            else if (strcasecmp(Name, "choices")==0) TerminalWidgetSetOptions(TW, Value);
+            else if (strcasecmp(Name, "cursor_left")==0) TW->CursorLeft=CopyStr(TW->CursorLeft, Value);
+            else if (strcasecmp(Name, "cursor_right")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
             else if (strcasecmp(Name, "cursor_attribs")==0) TW->CursorAttribs=CopyStr(TW->CursorAttribs, Value);
+            else if (strcasecmp(Name, "choices")==0) TerminalWidgetSetOptions(TW, Value);
             break;
 
         case 'l':
-            if (strcasecmp(Name, "left-cursor")==0) TW->CursorLeft=CopyStr(TW->CursorLeft, Value);
+            if (strcasecmp(Name, "left_cursor")==0) TW->CursorLeft=CopyStr(TW->CursorLeft, Value);
+            if (strcasecmp(Name, "left_contain")==0) SetVar(TW->Options, "LeftContainer", Value);
+            break;
+
+        case 'h':
+            if (strcasecmp(Name, "height")==0) TW->high=atoi(Value);
             break;
 
         case 'o':
@@ -64,16 +72,26 @@ void TerminalWidgetParseConfig(TERMWIDGET *TW, const char *Config)
 
         case 'p':
             if (strcasecmp(Name, "prompt")==0) TW->Text=CopyStr(TW->Text, Value);
+            if (strcasecmp(Name, "progress")==0) TW->CursorLeft=CopyStr(TW->CursorLeft, Value);
+            if (strcasecmp(Name, "progress_attribs")==0) TW->SelectedAttribs=CopyStr(TW->SelectedAttribs, Value);
             break;
 
         case 'r':
-            if (strcasecmp(Name, "right-cursor")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
+            if (strcasecmp(Name, "right_cursor")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
+            if (strcasecmp(Name, "right_contain")==0) SetVar(TW->Options, "RightContainer", Value);
+            if (strcasecmp(Name, "remain")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
+            if (strcasecmp(Name, "remaining")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
+            if (strcasecmp(Name, "remainder")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
             break;
 
 
         case 's':
             if (strcasecmp(Name, "selected_attribs")==0) TW->SelectedAttribs=CopyStr(TW->SelectedAttribs, Value);
-            else if (strcasecmp(Name, "select-right")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
+            else if (strcasecmp(Name, "select_right")==0) TW->CursorRight=CopyStr(TW->CursorRight, Value);
+            break;
+
+        case 'w':
+            if (strcasecmp(Name, "width")==0) TW->wid=atoi(Value);
             break;
         }
 
diff --git a/libUseful-5/TerminalWidget.h b/libUseful-5/TerminalWidget.h
index 002be01..7897687 100644
--- a/libUseful-5/TerminalWidget.h
+++ b/libUseful-5/TerminalWidget.h
@@ -5,7 +5,7 @@ Copyright (c) 2015 Colum Paget <colums.projects@googlemail.com>
 
 /*
  *
- * You probably have no interest in this module, it provides shared functionality used by TerminalMenu and TerminalChoice
+ * You probably have no interest in this module, it provides shared functionality used by TerminalMenu, TerminalChoice and TerminalProgress
  */
 
 
diff --git a/libUseful-5/URL.h b/libUseful-5/URL.h
old mode 100755
new mode 100644
diff --git a/libUseful-5/Unicode.c b/libUseful-5/Unicode.c
index aaa2c2b..61a6d87 100644
--- a/libUseful-5/Unicode.c
+++ b/libUseful-5/Unicode.c
@@ -173,7 +173,7 @@ char *UnicodeStrFromNameAtLevel(char *RetStr, int UnicodeLevel, const char *Name
 
     Tempstr=CopyStr(Tempstr, LibUsefulGetValue("Unicode:NamesFile"));
     if (StrValid(Tempstr)) Tempstr=CopyStr(Tempstr, getenv("UNICODE_NAMES_FILE"));
-    if (! StrValid(Tempstr)) Tempstr=CopyStr(Tempstr, "/etc/unicode-names.conf");
+    if (! StrValid(Tempstr)) Tempstr=MCopyStr(Tempstr, SYSCONFDIR,  "unicode-names.conf", NULL);
 
     S=STREAMOpen(Tempstr, "r");
     if (S)
diff --git a/libUseful-5/Users.c b/libUseful-5/Users.c
index 8e60d58..df55a87 100644
--- a/libUseful-5/Users.c
+++ b/libUseful-5/Users.c
@@ -107,7 +107,24 @@ int SwitchGroup(const char *NewGroup)
 
 
 
-char *GetCurrUserHomeDir()
+
+const char *GetUserHomeDir(const char *User)
+{
+    struct passwd *pwent;
+
+    if (! StrValid(User)) return(NULL);
+    pwent=getpwnam(User);
+    if (! pwent)
+    {
+        RaiseError(ERRFLAG_ERRNO, "getpwuid","Failed to get info for user [%s]", User);
+        return(NULL);
+    }
+    return(pwent->pw_dir);
+}
+
+
+
+const char *GetCurrUserHomeDir()
 {
     struct passwd *pwent;
 
diff --git a/libUseful-5/Users.h b/libUseful-5/Users.h
index 908bec8..2a0caa1 100644
--- a/libUseful-5/Users.h
+++ b/libUseful-5/Users.h
@@ -42,7 +42,13 @@ int SwitchGroup(const char *Group);
 
 //returns a string pointing to a users home directory. DO NOT FREE THIS STRING. Take a copy of it, as it's
 //an internal buffer and will change on the next call to this function
-char *GetCurrUserHomeDir();
+const char *GetUserHomeDir(const char *User);
+
+
+//returns a string pointing to the CURRENT USER'S home directory.
+// DO NOT FREE THIS STRING. Take a copy of it, as it's
+//an internal buffer and will change on the next call to this function
+const char *GetCurrUserHomeDir();
 
 
 #ifdef __cplusplus
diff --git a/libUseful-5/base32.c b/libUseful-5/base32.c
index 8e89ec9..3dc1741 100644
--- a/libUseful-5/base32.c
+++ b/libUseful-5/base32.c
@@ -6,7 +6,7 @@
 
 
 /* This is surely not the fastest base32 decoder, it is written for understanding/legiblity, not speed.
- * first we convert base32 into a binary, as a string of '1' and '0' characters (binary coded decimal). 
+ * first we convert base32 into a binary, as a string of '1' and '0' characters (binary coded decimal).
  * Then we work through this string converting it into eight-bit values.
  * The reason it's done this way is that it's tough to handle 'overlapping bits' when dealing with characters
  * that represent 5-bit chunks of a string of 8-bit values, and the resulting code of trying to do it all
@@ -15,55 +15,55 @@
 
 char *base32tobinary(char *RetStr, const char *In, const char *Encoder)
 {
-const char *ptr, *found;
-uint32_t val=0, count=0, bit;
+    const char *ptr, *found;
+    uint32_t val=0, count=0, bit;
 
-for (ptr=In; *ptr != '\0'; ptr++)
-{
+    for (ptr=In; *ptr != '\0'; ptr++)
+    {
 //find the position in the base32 characterset. That position is the 'value' of the character
-found=strchr(Encoder, *ptr); 
-if (found) val=(found - Encoder);
-else break;;
+        found=strchr(Encoder, *ptr);
+        if (found) val=(found - Encoder);
+        else break;;
 
 //the highest value a base 32 character can express is 16 (0x10)
-bit=16;
+        bit=16;
 
 //unpack the value into a string of 1's and 0's. As we add 1's and 0's from later characters
 //we will get a contiguous stream of 1's and 0's that we can then break up into 8-bit chunks
-while (bit > 0)
-{
-if (val & bit) RetStr=CatStr(RetStr, "1");
-else RetStr=CatStr(RetStr, "0");
-bit=bit >> 1;
-}
-}
-
-return(RetStr);
+        while (bit > 0)
+        {
+            if (val & bit) RetStr=CatStr(RetStr, "1");
+            else RetStr=CatStr(RetStr, "0");
+            bit=bit >> 1;
+        }
+    }
+
+    return(RetStr);
 }
 
 
 int base32decode(unsigned char *Out, const char *In, const char *Encoder)
 {
-char *Tempstr=NULL;
-unsigned char *p_Out;
-const char *ptr;
-uint32_t val;
+    char *Tempstr=NULL;
+    unsigned char *p_Out;
+    const char *ptr;
+    uint32_t val;
 
-Tempstr=base32tobinary(Tempstr, In, Encoder);
+    Tempstr=base32tobinary(Tempstr, In, Encoder);
 
-p_Out=Out;
-for (ptr=Tempstr; ptr < Tempstr+StrLen(Tempstr); ptr+=8)
-{
-  val=parse_bcd_byte(ptr);
-	*p_Out=val & 0xFF;
-  p_Out++;
-}
+    p_Out=Out;
+    for (ptr=Tempstr; ptr < Tempstr+StrLen(Tempstr); ptr+=8)
+    {
+        val=parse_bcd_byte(ptr);
+        *p_Out=val & 0xFF;
+        p_Out++;
+    }
 
-val=p_Out - Out;
+    val=p_Out - Out;
 
-Destroy(Tempstr);
+    Destroy(Tempstr);
 
-return(val);
+    return(val);
 }
 
 
@@ -71,26 +71,26 @@ return(val);
 
 char *base32encode(char *RetStr, const char *Input, int Len, const char *Encoder, char Pad)
 {
-char *Tempstr=NULL, *BCD=NULL;
-const char *ptr, *end;
-int val;
-
-RetStr=CopyStr(RetStr, "");
-BCD=encode_bcd_bytes(BCD, Input, Len);
-
-end=BCD+StrLen(BCD);
-for (ptr=BCD; ptr < end; ptr+=5)
-{
-Tempstr=CopyStrLen(Tempstr, ptr, 5); 
-Tempstr=PadStrTo(Tempstr, '0', 5);
-val=(int) parse_bcd_byte(Tempstr);
-RetStr=AddCharToStr(RetStr, Encoder[val]);
-}
-
-val=StrLen(RetStr) % 8;
-for (; val < 8; val++) RetStr=AddCharToStr(RetStr, Pad);
-
-Destroy(Tempstr);
-Destroy(BCD);
-return(RetStr);
+    char *Tempstr=NULL, *BCD=NULL;
+    const char *ptr, *end;
+    int val;
+
+    RetStr=CopyStr(RetStr, "");
+    BCD=encode_bcd_bytes(BCD, Input, Len);
+
+    end=BCD+StrLen(BCD);
+    for (ptr=BCD; ptr < end; ptr+=5)
+    {
+        Tempstr=CopyStrLen(Tempstr, ptr, 5);
+        Tempstr=PadStrTo(Tempstr, '0', 5);
+        val=(int) parse_bcd_byte(Tempstr);
+        RetStr=AddCharToStr(RetStr, Encoder[val]);
+    }
+
+    val=StrLen(RetStr) % 8;
+    for (; val < 8; val++) RetStr=AddCharToStr(RetStr, Pad);
+
+    Destroy(Tempstr);
+    Destroy(BCD);
+    return(RetStr);
 }
diff --git a/libUseful-5/base64.h b/libUseful-5/base64.h
old mode 100755
new mode 100644
diff --git a/libUseful-5/configure b/libUseful-5/configure
index 0b94941..5cd2801 100755
--- a/libUseful-5/configure
+++ b/libUseful-5/configure
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.71.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -14,14 +15,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -31,46 +34,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -79,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -94,8 +90,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -107,30 +107,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -152,20 +132,22 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -185,42 +167,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -228,14 +221,21 @@ fi
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -253,18 +253,19 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -291,6 +292,7 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -308,6 +310,14 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -322,7 +332,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -331,7 +341,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -370,12 +380,13 @@ as_fn_executable_p ()
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -387,18 +398,27 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -410,9 +430,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -439,7 +459,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -483,7 +503,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -497,6 +517,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -510,6 +534,13 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -575,56 +606,52 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="defines.h"
+PACKAGE_NAME=''
+PACKAGE_TARNAME=''
+PACKAGE_VERSION=''
+PACKAGE_STRING=''
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SIMD_CFLAGS
+CPP
+SONAME_FLAGS
 EGREP
 GREP
-CPP
 SET_MAKE
 OBJEXT
 EXEEXT
@@ -652,6 +679,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -675,12 +703,18 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_largefile
+enable_wall
+enable_werror
+enable_fortify
+enable_stack_protect
+enable_harden
+enable_soname
 enable_sendfile
 enable_ip6
 enable_xattr
 enable_namespaces
-enable_zlib
 enable_ssl
+enable_zlib
 enable_simd
 enable_capabilities
 '
@@ -731,6 +765,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -760,8 +795,6 @@ do
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -802,9 +835,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -828,9 +861,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -983,6 +1016,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1032,9 +1074,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1048,9 +1090,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1094,9 +1136,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1112,7 +1154,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1120,7 +1162,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1176,7 +1218,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1273,6 +1315,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1301,12 +1344,18 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-largefile     omit support for large files
-  --enable-sendfile       enable 'fastcopy' sendfile support
-  --enable-ip6       enable IPv6 support
-  --enable-xattr       enable filesystem xattr support
-  --enable-namespaces       enable linux namespace support
-  --enable-zlib       use ZLib Compression
-  --enable-ssl       use Secure Sockets Layer
+  --enable-wall               use -Wall to get maximum compile warnings
+  --enable-werror             treat compile warnings as errors
+  --enable-fortify            use 'FORTIFY_SOURCE=3' to harden source code
+  --enable-stack-protect      use '-fstack-protector-strong' to harden source code
+  --enable-harden             use 'FORTIFY_SOURCE=3' and stack-protect to harden source code
+  --enable-soname             use 'soname' in shared lib. Defaults to 'yes' for gcc 'no' otherwise
+  --enable-sendfile           enable 'fastcopy' sendfile support
+  --enable-ip6                enable IPv6 support
+  --enable-xattr              enable filesystem xattr support
+  --enable-namespaces         enable linux namespace support
+  --enable-ssl                use Secure Sockets Layer
+  --enable-zlib               use ZLib Compression
   --enable-simd=<level>       use SIMD cpu extensions, 'level' can be one of mmx, sse, sse2
   --enable-capabilities       enable linux capabilities support (default=no)
 
@@ -1339,9 +1388,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1369,7 +1418,8 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1377,7 +1427,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1387,9 +1437,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1406,14 +1456,14 @@ fi
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1421,14 +1471,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1438,99 +1489,20 @@ fi
 
 } # ac_fn_c_try_compile
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1538,17 +1510,18 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1569,11 +1542,12 @@ fi
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -1581,16 +1555,9 @@ else
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -1608,115 +1575,29 @@ choke me
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1724,49 +1605,54 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
+# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
+# ------------------------------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
+# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
+ac_fn_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+printf %s "checking whether $as_decl_name is declared... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  eval ac_save_FLAGS=\$$6
+  as_fn_append $6 " $5"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -1780,27 +1666,88 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  eval $6=\$ac_save_FLAGS
+
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_check_decl
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
 
-} # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -1833,8 +1780,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -1869,7 +1820,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1904,11 +1855,13 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -1919,8 +1872,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -1944,7 +1897,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -1952,14 +1905,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -1967,15 +1920,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -1983,8 +1936,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1998,63 +1951,48 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2064,61 +2002,378 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2128,11 +2383,12 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2146,6 +2402,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2154,11 +2419,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2166,11 +2432,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2181,11 +2451,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2194,11 +2464,12 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2206,11 +2477,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2221,11 +2496,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2233,8 +2508,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2247,11 +2522,12 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2259,11 +2535,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2274,11 +2554,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2287,11 +2567,12 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2300,15 +2581,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2324,18 +2609,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2346,11 +2631,12 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2358,11 +2644,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2373,11 +2663,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2390,11 +2680,12 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2402,11 +2693,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2417,11 +2712,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2433,34 +2728,138 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
+else
+  CC="$ac_cv_prog_CC"
 fi
 
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2470,7 +2869,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -2478,7 +2877,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -2490,9 +2889,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -2513,11 +2912,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2534,7 +2934,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -2550,44 +2950,46 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2601,15 +3003,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -2618,7 +3020,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -2630,8 +3032,8 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -2639,10 +3041,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -2650,39 +3052,40 @@ $as_echo "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -2696,11 +3099,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -2709,31 +3113,32 @@ $as_echo "$ac_try_echo"; } >&5
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -2743,29 +3148,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -2774,57 +3183,60 @@ else
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -2839,97 +3251,147 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
+$ac_c_conftest_c11_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -std=gnu11
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 fi
 
-ac_ext=c
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
+fi
+
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2941,13 +3403,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
@@ -2963,159 +3426,21 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -3123,10 +3448,15 @@ else
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
@@ -3135,13 +3465,13 @@ case `"$ac_path_GREP" --version 2>&1` in
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -3169,16 +3499,17 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
@@ -3189,10 +3520,15 @@ else
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
@@ -3201,13 +3537,13 @@ case `"$ac_path_EGREP" --version 2>&1` in
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -3236,135 +3572,26 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
 
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
+if test ${enable_largefile+y}
+then :
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+printf %s "checking for special C compiler options needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
@@ -3378,44 +3605,47 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_largefile_CC=' -n32'; break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test ${ac_cv_sys_file_offset_bits+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3424,22 +3654,23 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
@@ -3448,43 +3679,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=64; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
+printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test ${ac_cv_sys_large_files+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3493,22 +3724,23 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
@@ -3517,40 +3749,37 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf "%s\n" "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
+printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   fi
-
-
 fi
 
 
@@ -3564,12 +3793,110 @@ cf_use_xattr=no
 
 cf_use_hashopenssl=auto
 
+# Check whether --enable-wall was given.
+if test ${enable_wall+y}
+then :
+  enableval=$enable_wall; cf_use_wall=$enableval
+else $as_nop
+  cf_use_wall=no
+fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_current_dir_name in -lc" >&5
-$as_echo_n "checking for get_current_dir_name in -lc... " >&6; }
-if ${ac_cv_lib_c_get_current_dir_name+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test "$cf_use_wall" = "yes"
+then
+CFLAGS="$CFLAGS -Wall"
+fi
+
+
+# Check whether --enable-werror was given.
+if test ${enable_werror+y}
+then :
+  enableval=$enable_werror; cf_use_werror=$enableval
+else $as_nop
+  cf_use_werror=no
+fi
+
+if test "$cf_use_werror" = "yes"
+then
+CFLAGS="$CFLAGS -Werror"
+fi
+
+
+# Check whether --enable-fortify was given.
+if test ${enable_fortify+y}
+then :
+  enableval=$enable_fortify; cf_use_fortify=$enableval
+else $as_nop
+  cf_use_fortify=no
+fi
+
+# Check whether --enable-stack-protect was given.
+if test ${enable_stack_protect+y}
+then :
+  enableval=$enable_stack_protect; cf_use_stackprotect=$enableval
+else $as_nop
+  cf_use_stackprotect=no
+fi
+
+# Check whether --enable-harden was given.
+if test ${enable_harden+y}
+then :
+  enableval=$enable_harden; cf_use_harden=$enableval
+else $as_nop
+  cf_use_harden=no
+fi
+
+# Check whether --enable-soname was given.
+if test ${enable_soname+y}
+then :
+  enableval=$enable_soname; cf_use_soname=$enableval
+else $as_nop
+  cf_use_soname=gcc
+fi
+
+
+SONAME_FLAGS=""
+
+if test "$cf_use_soname" != "no"
+then
+  if test "$GCC" = "yes"
+  then
+        SONAME_FLAGS='-Wl,-soname,${SONAME}'
+
+  else
+      if test "$cf_use_soname" = "yes"
+      then
+        SONAME_FLAGS='-Wl,-soname,${SONAME}'
+
+      fi
+  fi
+fi
+
+
+if test "$cf_use_harden" = "yes"
+then
+cf_use_fortify="yes"
+cf_use_stackprotect="yes"
+fi
+
+
+if test "$cf_use_fortify" = "yes"
+then
+CFLAGS="$CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"
+fi
+
+if test "$cf_use_stackprotect" = "yes"
+then
+CFLAGS="$CFLAGS -fstack-protector-strong"
+fi
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for get_current_dir_name in -lc" >&5
+printf %s "checking for get_current_dir_name in -lc... " >&6; }
+if test ${ac_cv_lib_c_get_current_dir_name+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3578,33 +3905,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char get_current_dir_name ();
 int
-main ()
+main (void)
 {
 return get_current_dir_name ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_get_current_dir_name=yes
-else
+else $as_nop
   ac_cv_lib_c_get_current_dir_name=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_get_current_dir_name" >&5
-$as_echo "$ac_cv_lib_c_get_current_dir_name" >&6; }
-if test "x$ac_cv_lib_c_get_current_dir_name" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBC 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_get_current_dir_name" >&5
+printf "%s\n" "$ac_cv_lib_c_get_current_dir_name" >&6; }
+if test "x$ac_cv_lib_c_get_current_dir_name" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBC 1" >>confdefs.h
 
   LIBS="-lc $LIBS"
 
@@ -3613,65 +3937,163 @@ fi
 cf_have_get_current_dir_name=$ac_cv_lib_c_get_current_dir_name
 if test "$cf_have_get_current_dir_name" = "yes"
 then
-$as_echo "#define HAVE_GET_CURR_DIR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GET_CURR_DIR 1" >>confdefs.h
 
 fi
 
 
-for ac_func in ptsname_r clearenv setresuid initgroups poll mlock mlockall munlockall madvise htonll ntohll mkostemp mount umount umount2 getentropy
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "ptsname_r" "ac_cv_func_ptsname_r"
+if test "x$ac_cv_func_ptsname_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTSNAME_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "clearenv" "ac_cv_func_clearenv"
+if test "x$ac_cv_func_clearenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLEARENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setresuid" "ac_cv_func_setresuid"
+if test "x$ac_cv_func_setresuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETRESUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups"
+if test "x$ac_cv_func_initgroups" = xyes
+then :
+  printf "%s\n" "#define HAVE_INITGROUPS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+if test "x$ac_cv_func_poll" = xyes
+then :
+  printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mlock" "ac_cv_func_mlock"
+if test "x$ac_cv_func_mlock" = xyes
+then :
+  printf "%s\n" "#define HAVE_MLOCK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mlockall" "ac_cv_func_mlockall"
+if test "x$ac_cv_func_mlockall" = xyes
+then :
+  printf "%s\n" "#define HAVE_MLOCKALL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "munlockall" "ac_cv_func_munlockall"
+if test "x$ac_cv_func_munlockall" = xyes
+then :
+  printf "%s\n" "#define HAVE_MUNLOCKALL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "madvise" "ac_cv_func_madvise"
+if test "x$ac_cv_func_madvise" = xyes
+then :
+  printf "%s\n" "#define HAVE_MADVISE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "htonll" "ac_cv_func_htonll"
+if test "x$ac_cv_func_htonll" = xyes
+then :
+  printf "%s\n" "#define HAVE_HTONLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ntohll" "ac_cv_func_ntohll"
+if test "x$ac_cv_func_ntohll" = xyes
+then :
+  printf "%s\n" "#define HAVE_NTOHLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mkostemp" "ac_cv_func_mkostemp"
+if test "x$ac_cv_func_mkostemp" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKOSTEMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mount" "ac_cv_func_mount"
+if test "x$ac_cv_func_mount" = xyes
+then :
+  printf "%s\n" "#define HAVE_MOUNT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "umount" "ac_cv_func_umount"
+if test "x$ac_cv_func_umount" = xyes
+then :
+  printf "%s\n" "#define HAVE_UMOUNT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "umount2" "ac_cv_func_umount2"
+if test "x$ac_cv_func_umount2" = xyes
+then :
+  printf "%s\n" "#define HAVE_UMOUNT2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy"
+if test "x$ac_cv_func_getentropy" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETENTROPY 1" >>confdefs.h
 
 fi
-done
 
 
 
 # Check whether --enable-sendfile was given.
-if test "${enable_sendfile+set}" = set; then :
+if test ${enable_sendfile+y}
+then :
   enableval=$enable_sendfile; cf_use_sendfile=$enableval
-else
+else $as_nop
   cf_use_sendfile=auto
 fi
 
-
 if test "$cf_use_sendfile" != "no"
 then
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
+
+
+
 
-fi
 
-done
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "sys/sendfile.h" "ac_cv_header_sys_sendfile_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sendfile_h" = xyes; then :
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/sendfile.h" "ac_cv_header_sys_sendfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sendfile_h" = xyes
+then :
   cf_use_sendfile=yes
-else
+else $as_nop
   cf_use_sendfile=no
 fi
 
-
 if test "$cf_use_sendfile" != "no"
 then
 ac_fn_c_check_func "$LINENO" "sendfile" "ac_cv_func_sendfile"
-if test "x$ac_cv_func_sendfile" = xyes; then :
-  $as_echo "#define HAVE_SENDFILE 1" >>confdefs.h
+if test "x$ac_cv_func_sendfile" = xyes
+then :
+  printf "%s\n" "#define HAVE_SENDFILE 1" >>confdefs.h
 
 fi
 
@@ -3682,35 +4104,36 @@ fi
 
 
 # Check whether --enable-ip6 was given.
-if test "${enable_ip6+set}" = set; then :
+if test ${enable_ip6+y}
+then :
   enableval=$enable_ip6; cf_use_ip6=$enableval
-else
+else $as_nop
   cf_use_ip6=yes
 fi
 
-
 if test "$cf_use_ip6" = "yes"
 then
-$as_echo "#define USE_INET6 1" >>confdefs.h
+printf "%s\n" "#define USE_INET6 1" >>confdefs.h
 
 fi
 
 
 # Check whether --enable-xattr was given.
-if test "${enable_xattr+set}" = set; then :
+if test ${enable_xattr+y}
+then :
   enableval=$enable_xattr; cf_use_xattr=$enableval
-else
+else $as_nop
   cf_use_xattr=yes
 fi
 
-
 if test "$cf_use_xattr" = "yes"
 then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getxattr in -lc" >&5
-$as_echo_n "checking for getxattr in -lc... " >&6; }
-if ${ac_cv_lib_c_getxattr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getxattr in -lc" >&5
+printf %s "checking for getxattr in -lc... " >&6; }
+if test ${ac_cv_lib_c_getxattr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3719,33 +4142,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char getxattr ();
 int
-main ()
+main (void)
 {
 return getxattr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_getxattr=yes
-else
+else $as_nop
   ac_cv_lib_c_getxattr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getxattr" >&5
-$as_echo "$ac_cv_lib_c_getxattr" >&6; }
-if test "x$ac_cv_lib_c_getxattr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBC 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getxattr" >&5
+printf "%s\n" "$ac_cv_lib_c_getxattr" >&6; }
+if test "x$ac_cv_lib_c_getxattr" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBC 1" >>confdefs.h
 
   LIBS="-lc $LIBS"
 
@@ -3754,27 +4174,28 @@ fi
 cf_have_getxattr=$ac_cv_lib_c_getxattr
 if test "$cf_have_getxattr" = "yes"
 then
-$as_echo "#define HAVE_XATTR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_XATTR 1" >>confdefs.h
 
 fi
 fi
 
 
 # Check whether --enable-namespaces was given.
-if test "${enable_namespaces+set}" = set; then :
+if test ${enable_namespaces+y}
+then :
   enableval=$enable_namespaces; cf_use_namespaces=$enableval
-else
+else $as_nop
   cf_use_namespaces=yes
 fi
 
-
 if test "$cf_use_namespaces" = "yes"
 then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unshare in -lc" >&5
-$as_echo_n "checking for unshare in -lc... " >&6; }
-if ${ac_cv_lib_c_unshare+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unshare in -lc" >&5
+printf %s "checking for unshare in -lc... " >&6; }
+if test ${ac_cv_lib_c_unshare+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3783,33 +4204,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char unshare ();
 int
-main ()
+main (void)
 {
 return unshare ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_unshare=yes
-else
+else $as_nop
   ac_cv_lib_c_unshare=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_unshare" >&5
-$as_echo "$ac_cv_lib_c_unshare" >&6; }
-if test "x$ac_cv_lib_c_unshare" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBC 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_unshare" >&5
+printf "%s\n" "$ac_cv_lib_c_unshare" >&6; }
+if test "x$ac_cv_lib_c_unshare" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBC 1" >>confdefs.h
 
   LIBS="-lc $LIBS"
 
@@ -3818,15 +4236,16 @@ fi
         cf_have_unshare=$ac_cv_lib_c_unshare
         if test "$cf_have_unshare" = "yes"
         then
-                $as_echo "#define HAVE_UNSHARE 1" >>confdefs.h
+                printf "%s\n" "#define HAVE_UNSHARE 1" >>confdefs.h
 
         fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setns in -lc" >&5
-$as_echo_n "checking for setns in -lc... " >&6; }
-if ${ac_cv_lib_c_setns+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setns in -lc" >&5
+printf %s "checking for setns in -lc... " >&6; }
+if test ${ac_cv_lib_c_setns+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3835,33 +4254,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char setns ();
 int
-main ()
+main (void)
 {
 return setns ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_setns=yes
-else
+else $as_nop
   ac_cv_lib_c_setns=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_setns" >&5
-$as_echo "$ac_cv_lib_c_setns" >&6; }
-if test "x$ac_cv_lib_c_setns" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBC 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_setns" >&5
+printf "%s\n" "$ac_cv_lib_c_setns" >&6; }
+if test "x$ac_cv_lib_c_setns" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBC 1" >>confdefs.h
 
   LIBS="-lc $LIBS"
 
@@ -3870,75 +4286,18 @@ fi
         cf_have_setns=$ac_cv_lib_c_setns
         if test "$cf_have_setns" = "yes"
         then
-                $as_echo "#define HAVE_SETNS 1" >>confdefs.h
+                printf "%s\n" "#define HAVE_SETNS 1" >>confdefs.h
 
         fi
 fi
 
 
-# Check whether --enable-zlib was given.
-if test "${enable_zlib+set}" = set; then :
-  enableval=$enable_zlib; cf_use_zlib=$enableval
-else
-  cf_use_zlib=no
-fi
-
-
-if test "$cf_use_zlib" = "yes" -o "$cf_use_ssl" = "yes"
-then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
-$as_echo_n "checking for deflate in -lz... " >&6; }
-if ${ac_cv_lib_z_deflate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char deflate ();
-int
-main ()
-{
-return deflate ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_deflate=yes
-else
-  ac_cv_lib_z_deflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
-$as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-fi
-
-cf_have_libz=$ac_cv_lib_z_deflate
-fi
-
 
 # Check whether --enable-ssl was given.
-if test "${enable_ssl+set}" = set; then :
+if test ${enable_ssl+y}
+then :
   enableval=$enable_ssl; cf_use_ssl=$enableval
-else
+else $as_nop
   cf_use_ssl=yes
 fi
 
@@ -3946,18 +4305,18 @@ fi
 if test "$cf_use_ssl" = "yes"
 then
 
-ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_crypto_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_crypto_h" = xyes
+then :
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes
+then :
 
 fi
 
-
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
@@ -3967,11 +4326,12 @@ fi
 #include <openssl/asn1.h>
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_CIPHER_CTX_init in -lcrypto" >&5
-$as_echo_n "checking for EVP_CIPHER_CTX_init in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_EVP_CIPHER_CTX_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EVP_CIPHER_CTX_init in -lcrypto" >&5
+printf %s "checking for EVP_CIPHER_CTX_init in -lcrypto... " >&6; }
+if test ${ac_cv_lib_crypto_EVP_CIPHER_CTX_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3980,33 +4340,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char EVP_CIPHER_CTX_init ();
 int
-main ()
+main (void)
 {
 return EVP_CIPHER_CTX_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypto_EVP_CIPHER_CTX_init=yes
-else
+else $as_nop
   ac_cv_lib_crypto_EVP_CIPHER_CTX_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_CIPHER_CTX_init" >&5
-$as_echo "$ac_cv_lib_crypto_EVP_CIPHER_CTX_init" >&6; }
-if test "x$ac_cv_lib_crypto_EVP_CIPHER_CTX_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_CIPHER_CTX_init" >&5
+printf "%s\n" "$ac_cv_lib_crypto_EVP_CIPHER_CTX_init" >&6; }
+if test "x$ac_cv_lib_crypto_EVP_CIPHER_CTX_init" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBCRYPTO 1" >>confdefs.h
 
   LIBS="-lcrypto $LIBS"
 
@@ -4016,11 +4373,12 @@ cf_have_libcrypto=$ac_cv_lib_crypto_EVP_CIPHER_CTX_init
 
 if test "$cf_have_libcrypto" != "yes"
 then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_CIPHER_CTX_new in -lcrypto" >&5
-$as_echo_n "checking for EVP_CIPHER_CTX_new in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_EVP_CIPHER_CTX_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EVP_CIPHER_CTX_new in -lcrypto" >&5
+printf %s "checking for EVP_CIPHER_CTX_new in -lcrypto... " >&6; }
+if test ${ac_cv_lib_crypto_EVP_CIPHER_CTX_new+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4029,195 +4387,496 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char EVP_CIPHER_CTX_new ();
 int
-main ()
+main (void)
 {
 return EVP_CIPHER_CTX_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypto_EVP_CIPHER_CTX_new=yes
-else
+else $as_nop
   ac_cv_lib_crypto_EVP_CIPHER_CTX_new=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_CIPHER_CTX_new" >&5
-$as_echo "$ac_cv_lib_crypto_EVP_CIPHER_CTX_new" >&6; }
-if test "x$ac_cv_lib_crypto_EVP_CIPHER_CTX_new" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_CIPHER_CTX_new" >&5
+printf "%s\n" "$ac_cv_lib_crypto_EVP_CIPHER_CTX_new" >&6; }
+if test "x$ac_cv_lib_crypto_EVP_CIPHER_CTX_new" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBCRYPTO 1" >>confdefs.h
 
   LIBS="-lcrypto $LIBS"
 
 fi
 
-	cf_have_libcrypto=$ac_cv_lib_crypto_EVP_CIPHER_CTX_new
+	cf_have_libcrypto=$ac_cv_lib_crypto_EVP_CIPHER_CTX_new
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+printf %s "checking for SSL_library_init in -lssl... " >&6; }
+if test ${ac_cv_lib_ssl_SSL_library_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char SSL_library_init ();
+int
+main (void)
+{
+return SSL_library_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_ssl_SSL_library_init=yes
+else $as_nop
+  ac_cv_lib_ssl_SSL_library_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+printf "%s\n" "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBSSL 1" >>confdefs.h
+
+  LIBS="-lssl $LIBS"
+
+fi
+
+cf_have_libssl=$ac_cv_lib_ssl_SSL_library_init
+
+if test "$cf_have_libssl" != "yes"
+then
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5
+printf %s "checking for OPENSSL_init_ssl in -lssl... " >&6; }
+if test ${ac_cv_lib_ssl_OPENSSL_init_ssl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char OPENSSL_init_ssl ();
+int
+main (void)
+{
+return OPENSSL_init_ssl ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_ssl_OPENSSL_init_ssl=yes
+else $as_nop
+  ac_cv_lib_ssl_OPENSSL_init_ssl=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_OPENSSL_init_ssl" >&5
+printf "%s\n" "$ac_cv_lib_ssl_OPENSSL_init_ssl" >&6; }
+if test "x$ac_cv_lib_ssl_OPENSSL_init_ssl" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBSSL 1" >>confdefs.h
+
+  LIBS="-lssl $LIBS"
+
+fi
+
+	cf_have_libssl=$ac_cv_lib_ssl_OPENSSL_init_ssl
+fi
+
+
+
+if test "$cf_have_libssl" = "yes"
+then
+cf_use_zlib=yes
+
+ac_fn_c_check_func "$LINENO" "OpenSSL_add_all_algorithms" "ac_cv_func_OpenSSL_add_all_algorithms"
+if test "x$ac_cv_func_OpenSSL_add_all_algorithms" = xyes
+then :
+  printf "%s\n" "#define HAVE_OPENSSL_ADD_ALL_ALGORITHMS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_MD_CTX_create" "ac_cv_func_EVP_MD_CTX_create"
+if test "x$ac_cv_func_EVP_MD_CTX_create" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_MD_CTX_CREATE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_MD_CTX_new" "ac_cv_func_EVP_MD_CTX_new"
+if test "x$ac_cv_func_EVP_MD_CTX_new" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_MD_CTX_NEW 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_MD_CTX_destroy" "ac_cv_func_EVP_MD_CTX_destroy"
+if test "x$ac_cv_func_EVP_MD_CTX_destroy" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_MD_CTX_DESTROY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_MD_CTX_free" "ac_cv_func_EVP_MD_CTX_free"
+if test "x$ac_cv_func_EVP_MD_CTX_free" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_MD_CTX_FREE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_bf_cbc" "ac_cv_func_EVP_bf_cbc"
+if test "x$ac_cv_func_EVP_bf_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_BF_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_rc2_cbc" "ac_cv_func_EVP_rc2_cbc"
+if test "x$ac_cv_func_EVP_rc2_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_RC2_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_rc4" "ac_cv_func_EVP_rc4"
+if test "x$ac_cv_func_EVP_rc4" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_RC4 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_rc5_32_12_16_cbc" "ac_cv_func_EVP_rc5_32_12_16_cbc"
+if test "x$ac_cv_func_EVP_rc5_32_12_16_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_RC5_32_12_16_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_des_cbc" "ac_cv_func_EVP_des_cbc"
+if test "x$ac_cv_func_EVP_des_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_DES_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_desx_cbc" "ac_cv_func_EVP_desx_cbc"
+if test "x$ac_cv_func_EVP_desx_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_DESX_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_cast5_cbc" "ac_cv_func_EVP_cast5_cbc"
+if test "x$ac_cv_func_EVP_cast5_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_CAST5_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_idea_cbc" "ac_cv_func_EVP_idea_cbc"
+if test "x$ac_cv_func_EVP_idea_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_IDEA_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_aes_128_cbc" "ac_cv_func_EVP_aes_128_cbc"
+if test "x$ac_cv_func_EVP_aes_128_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_AES_128_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "EVP_aes_256_cbc" "ac_cv_func_EVP_aes_256_cbc"
+if test "x$ac_cv_func_EVP_aes_256_cbc" = xyes
+then :
+  printf "%s\n" "#define HAVE_EVP_AES_256_CBC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "X509_check_host" "ac_cv_func_X509_check_host"
+if test "x$ac_cv_func_X509_check_host" = xyes
+then :
+  printf "%s\n" "#define HAVE_X509_CHECK_HOST 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "SSL_set_tlsext_host_name" "ac_cv_func_SSL_set_tlsext_host_name"
+if test "x$ac_cv_func_SSL_set_tlsext_host_name" = xyes
+then :
+  printf "%s\n" "#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "SSL_set_min_proto_version" "ac_cv_func_SSL_set_min_proto_version"
+if test "x$ac_cv_func_SSL_set_min_proto_version" = xyes
+then :
+  printf "%s\n" "#define HAVE_SSL_SET_MIN_PROTO_VERSION 1" >>confdefs.h
+
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+if test ${ac_cv_c_undeclared_builtin_options+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_CFLAGS=$CFLAGS
+   ac_cv_c_undeclared_builtin_options='cannot detect'
+   for ac_arg in '' -fno-builtin; do
+     CFLAGS="$ac_save_CFLAGS $ac_arg"
+     # This test program should *not* compile successfully.
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SSL_library_init ();
 int
-main ()
+main (void)
 {
-return SSL_library_init ();
+(void) strchr;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_SSL_library_init=yes
-else
-  ac_cv_lib_ssl_SSL_library_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSSL 1
-_ACEOF
-
-  LIBS="-lssl $LIBS"
-
-fi
-
-cf_have_libssl=$ac_cv_lib_ssl_SSL_library_init
-
-if test "$cf_have_libssl" != "yes"
-then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5
-$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_OPENSSL_init_ssl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  # This test program should compile successfully.
+        # No library function is consistently available on
+        # freestanding implementations, so test against a dummy
+        # declaration.  Include always-available headers on the
+        # off chance that they somehow elicit warnings.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <float.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+extern void ac_decl (int, char *);
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char OPENSSL_init_ssl ();
 int
-main ()
+main (void)
 {
-return OPENSSL_init_ssl ();
+(void) ac_decl (0, (char *) 0);
+  (void) ac_decl;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_OPENSSL_init_ssl=yes
-else
-  ac_cv_lib_ssl_OPENSSL_init_ssl=no
+if ac_fn_c_try_compile "$LINENO"
+then :
+  if test x"$ac_arg" = x
+then :
+  ac_cv_c_undeclared_builtin_options='none needed'
+else $as_nop
+  ac_cv_c_undeclared_builtin_options=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+          break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_OPENSSL_init_ssl" >&5
-$as_echo "$ac_cv_lib_ssl_OPENSSL_init_ssl" >&6; }
-if test "x$ac_cv_lib_ssl_OPENSSL_init_ssl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSSL 1
-_ACEOF
-
-  LIBS="-lssl $LIBS"
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    done
+    CFLAGS=$ac_save_CFLAGS
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+  case $ac_cv_c_undeclared_builtin_options in #(
+  'cannot detect') :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot make $CC report undeclared builtins
+See \`config.log' for more details" "$LINENO" 5; } ;; #(
+  'none needed') :
+    ac_c_undeclared_builtin_options='' ;; #(
+  *) :
+    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
+esac
 
+ac_fn_check_decl "$LINENO" "OpenSSL_add_all_algorithms" "ac_cv_have_decl_OpenSSL_add_all_algorithms" "#include <openssl/ssl.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_OpenSSL_add_all_algorithms" = xyes
+then :
+  ac_have_decl=1
+else $as_nop
+  ac_have_decl=0
 fi
+printf "%s\n" "#define HAVE_DECL_OPENSSL_ADD_ALL_ALGORITHMS $ac_have_decl" >>confdefs.h
+if test $ac_have_decl = 1
+then :
+  printf "%s\n" "#define HAVE_OPENSSL_ADD_ALL_ALGORITHMS 1" >>confdefs.h
 
-	cf_have_libssl=$ac_cv_lib_ssl_OPENSSL_init_ssl
 fi
 
+ac_fn_check_decl "$LINENO" "SSL_set_tlsext_host_name" "ac_cv_have_decl_SSL_set_tlsext_host_name" "#include <openssl/ssl.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_SSL_set_tlsext_host_name" = xyes
+then :
+  ac_have_decl=1
+else $as_nop
+  ac_have_decl=0
+fi
+printf "%s\n" "#define HAVE_DECL_SSL_SET_TLSEXT_HOST_NAME $ac_have_decl" >>confdefs.h
+if test $ac_have_decl = 1
+then :
+  printf "%s\n" "#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1" >>confdefs.h
 
+fi
 
-if test "$cf_have_libssl" = "yes"
-then
-cf_use_zlib=yes
 
-for ac_func in OpenSSL_add_all_algorithms EVP_MD_CTX_create EVP_MD_CTX_new EVP_MD_CTX_destroy EVP_MD_CTX_free EVP_bf_cbc EVP_rc2_cbc EVP_rc4 EVP_rc5_32_12_16_cbc EVP_des_cbc EVP_desx_cbc EVP_cast5_cbc EVP_idea_cbc EVP_aes_128_cbc EVP_aes_256_cbc X509_check_host SSL_set_tlsext_host_name SSL_set_min_proto_version
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that OpenSSL Library is at least version 0.9.7" >&5
+printf %s "checking that OpenSSL Library is at least version 0.9.7... " >&6; }
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+		     Syntax error
 _ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
+else $as_nop
+  # Broken: fails on valid input.
+continue
 fi
-done
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  # Broken: success on invalid input.
+continue
+else $as_nop
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok
+then :
+  break
+fi
 
+    done
+    ac_cv_prog_CPP=$CPP
 
-ac_fn_c_check_decl "$LINENO" "OpenSSL_add_all_algorithms" "ac_cv_have_decl_OpenSSL_add_all_algorithms" "#include <openssl/ssl.h>
-"
-if test "x$ac_cv_have_decl_OpenSSL_add_all_algorithms" = xyes; then :
-  ac_have_decl=1
+fi
+  CPP=$ac_cv_prog_CPP
 else
-  ac_have_decl=0
+  ac_cv_prog_CPP=$CPP
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_OPENSSL_ADD_ALL_ALGORITHMS $ac_have_decl
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+		     Syntax error
 _ACEOF
-if test $ac_have_decl = 1; then :
-  $as_echo "#define HAVE_OPENSSL_ADD_ALL_ALGORITHMS 1" >>confdefs.h
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
+else $as_nop
+  # Broken: fails on valid input.
+continue
 fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-ac_fn_c_check_decl "$LINENO" "SSL_set_tlsext_host_name" "ac_cv_have_decl_SSL_set_tlsext_host_name" "#include <openssl/ssl.h>
-"
-if test "x$ac_cv_have_decl_SSL_set_tlsext_host_name" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+  # Broken: success on invalid input.
+continue
+else $as_nop
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SSL_SET_TLSEXT_HOST_NAME $ac_have_decl
-_ACEOF
-if test $ac_have_decl = 1; then :
-  $as_echo "#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1" >>confdefs.h
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok
+then :
 
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking that OpenSSL Library is at least version 0.9.7" >&5
-$as_echo_n "checking that OpenSSL Library is at least version 0.9.7... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#include <openssl/evp.h>
@@ -4227,30 +4886,91 @@ $as_echo_n "checking that OpenSSL Library is at least version 0.9.7... " >&6; }
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then :
+  $EGREP "yes" >/dev/null 2>&1
+then :
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 #    AC_DEFINE(USE_OPENSSL_ADD_ALL_ALGORITHMS, 1, [Use OpenSSL_add_all_algorithms])
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+rm -rf conftest*
+
+
+
+
+
+fi
+
+
 fi
-rm -f conftest*
 
 
 
+# Check whether --enable-zlib was given.
+if test ${enable_zlib+y}
+then :
+  enableval=$enable_zlib; cf_use_zlib=$enableval
+else $as_nop
+  cf_use_zlib=yes
+fi
+
 
+if test "$cf_use_zlib" = "yes" -o "$cf_use_ssl" = "yes"
+then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
+printf %s "checking for deflate in -lz... " >&6; }
+if test ${ac_cv_lib_z_deflate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char deflate ();
+int
+main (void)
+{
+return deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_z_deflate=yes
+else $as_nop
+  ac_cv_lib_z_deflate=no
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
+printf "%s\n" "$ac_cv_lib_z_deflate" >&6; }
+if test "x$ac_cv_lib_z_deflate" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h
+
+  LIBS="-lz $LIBS"
 
+fi
 
+cf_have_libz=$ac_cv_lib_z_deflate
 fi
 
 
 # Check whether --enable-simd was given.
-if test "${enable_simd+set}" = set; then :
+if test ${enable_simd+y}
+then :
   enableval=$enable_simd; cf_use_simd=$enableval
 fi
 
@@ -4268,36 +4988,38 @@ esac
 
 cf_have_capabilities=no
 # Check whether --enable-capabilities was given.
-if test "${enable_capabilities+set}" = set; then :
+if test ${enable_capabilities+y}
+then :
   enableval=$enable_capabilities; cf_use_capabilities=$enableval
-else
+else $as_nop
   cf_use_capabilities=no
 fi
 
 
 if test "$cf_use_capabilities" = "yes"
 then
-ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_capability_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_capability_h" = xyes
+then :
   cf_have_capabilities=yes
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "linux/capability.h" "ac_cv_header_linux_capability_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_capability_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "linux/capability.h" "ac_cv_header_linux_capability_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_capability_h" = xyes
+then :
   cf_have_capabilities=yes
 fi
 
-
 fi
 
 if test "$cf_have_capabilities" = "yes"
 then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_init in -lcap" >&5
-$as_echo_n "checking for cap_init in -lcap... " >&6; }
-if ${ac_cv_lib_cap_cap_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cap_init in -lcap" >&5
+printf %s "checking for cap_init in -lcap... " >&6; }
+if test ${ac_cv_lib_cap_cap_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcap  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4306,39 +5028,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char cap_init ();
 int
-main ()
+main (void)
 {
 return cap_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_cap_cap_init=yes
-else
+else $as_nop
   ac_cv_lib_cap_cap_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_init" >&5
-$as_echo "$ac_cv_lib_cap_cap_init" >&6; }
-if test "x$ac_cv_lib_cap_cap_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCAP 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_init" >&5
+printf "%s\n" "$ac_cv_lib_cap_cap_init" >&6; }
+if test "x$ac_cv_lib_cap_cap_init" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBCAP 1" >>confdefs.h
 
   LIBS="-lcap $LIBS"
 
 fi
 
-$as_echo "#define USE_CAPABILITIES 1" >>confdefs.h
+printf "%s\n" "#define USE_CAPABILITIES 1" >>confdefs.h
 
 fi
 
@@ -4372,8 +5091,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -4403,15 +5122,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -4425,8 +5144,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -4479,7 +5198,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -4495,8 +5214,8 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -4519,14 +5238,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -4536,46 +5257,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -4584,13 +5305,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -4599,8 +5313,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -4612,30 +5330,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -4648,13 +5346,14 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -4681,18 +5380,20 @@ as_fn_unset ()
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -4704,12 +5405,13 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -4740,7 +5442,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -4762,6 +5464,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -4775,6 +5481,12 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -4816,7 +5528,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -4825,7 +5537,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -4888,7 +5600,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4937,14 +5649,16 @@ $config_files
 Report bugs to the package provider."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -4981,21 +5695,21 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -5023,7 +5737,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -5037,7 +5751,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -5062,7 +5776,7 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -5290,7 +6004,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -5298,17 +6012,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -5325,7 +6039,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -5349,9 +6063,9 @@ $as_echo X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -5404,8 +6118,8 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -5447,9 +6161,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -5496,14 +6210,20 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
 echo
 echo
 echo "############# libUseful Build Config: #############"
+
+echo "compile with -Wall - $cf_use_wall"
+echo "compile with -Werror - $cf_use_werror"
+echo "compile with FORTIFY_SOURCE=3 - $cf_use_fortify"
+echo "compile with -fstack-protector-strong - $cf_use_stackprotect"
+
 if test "$ac_cv_sys_file_offset_bits" = "64"
 then
 echo "Largefiles ( > 2GB ) enabled"
@@ -5541,7 +6261,7 @@ else
 echo "SSL/TLS NOT enabled"
 fi
 
-if test "$cf_use_zlib" = "yes"
+if test "$cf_have_libz" = "yes"
 then
 echo "zlib support enabled"
 else
@@ -5562,3 +6282,4 @@ else
 echo "linux capabilities support NOT enabled"
 fi
 
+
diff --git a/libUseful-5/configure.ac b/libUseful-5/configure.ac
old mode 100755
new mode 100644
index b45ed1d..fc51238
--- a/libUseful-5/configure.ac
+++ b/libUseful-5/configure.ac
@@ -1,10 +1,9 @@
-#AC_INIT(libUseful,colums.projects@googlemail.com,,http://sites.google.com/site/columscode) 
-AC_INIT(defines.h)
+AC_INIT
 
 AC_PROG_CC
-AC_LANG_C
+AC_LANG([C])
 AC_PROG_MAKE_SET
-AC_HEADER_STDC
+AC_PROG_EGREP
 AC_SYS_LARGEFILE
 
 cf_have_libssl=no
@@ -17,6 +16,58 @@ cf_use_xattr=no
 
 cf_use_hashopenssl=auto
 
+AC_ARG_ENABLE(wall, [  --enable-wall               use -Wall to get maximum compile warnings], cf_use_wall=$enableval, cf_use_wall=no )
+if test "$cf_use_wall" = "yes"
+then
+CFLAGS="$CFLAGS -Wall"
+fi
+
+
+AC_ARG_ENABLE(werror, [  --enable-werror             treat compile warnings as errors], cf_use_werror=$enableval, cf_use_werror=no )
+if test "$cf_use_werror" = "yes"
+then
+CFLAGS="$CFLAGS -Werror"
+fi
+
+
+AC_ARG_ENABLE(fortify, [  --enable-fortify            use 'FORTIFY_SOURCE=3' to harden source code], cf_use_fortify=$enableval, cf_use_fortify=no )
+AC_ARG_ENABLE(stack-protect, [  --enable-stack-protect      use '-fstack-protector-strong' to harden source code], cf_use_stackprotect=$enableval, cf_use_stackprotect=no )
+AC_ARG_ENABLE(harden, [  --enable-harden             use 'FORTIFY_SOURCE=3' and stack-protect to harden source code], cf_use_harden=$enableval, cf_use_harden=no )
+AC_ARG_ENABLE(soname, [  --enable-soname             use 'soname' in shared lib. Defaults to 'yes' for gcc 'no' otherwise], cf_use_soname=$enableval, cf_use_soname=gcc )
+
+AC_SUBST(SONAME_FLAGS,"")
+if test "$cf_use_soname" != "no"
+then
+  if test "$GCC" = "yes"
+  then
+        AC_SUBST([SONAME_FLAGS], ['-Wl,-soname,${SONAME}'])
+  else
+      if test "$cf_use_soname" = "yes"
+      then
+        AC_SUBST([SONAME_FLAGS], ['-Wl,-soname,${SONAME}'])
+      fi
+  fi
+fi
+
+
+if test "$cf_use_harden" = "yes"
+then
+cf_use_fortify="yes"
+cf_use_stackprotect="yes"
+fi
+
+
+if test "$cf_use_fortify" = "yes"
+then
+CFLAGS="$CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"
+fi
+
+if test "$cf_use_stackprotect" = "yes"
+then
+CFLAGS="$CFLAGS -fstack-protector-strong"
+fi
+
+
 
 AC_CHECK_LIB(c,get_current_dir_name,,)
 cf_have_get_current_dir_name=$ac_cv_lib_c_get_current_dir_name
@@ -29,8 +80,7 @@ fi
 AC_CHECK_FUNCS(ptsname_r clearenv setresuid initgroups poll mlock mlockall munlockall madvise htonll ntohll mkostemp mount umount umount2 getentropy)
 
 
-AC_ARG_ENABLE(sendfile, [  --enable-sendfile       enable 'fastcopy' sendfile support], cf_use_sendfile=$enableval, cf_use_sendfile=auto )
-
+AC_ARG_ENABLE(sendfile, [  --enable-sendfile           enable 'fastcopy' sendfile support], cf_use_sendfile=$enableval, cf_use_sendfile=auto )
 if test "$cf_use_sendfile" != "no"
 then
 AC_CHECK_HEADER(sys/sendfile.h,cf_use_sendfile=yes,cf_use_sendfile=no,)
@@ -43,16 +93,14 @@ fi
 
 
 
-AC_ARG_ENABLE(ip6, [  --enable-ip6       enable IPv6 support], cf_use_ip6=$enableval, cf_use_ip6=yes )
-
+AC_ARG_ENABLE(ip6, [  --enable-ip6                enable IPv6 support], cf_use_ip6=$enableval, cf_use_ip6=yes )
 if test "$cf_use_ip6" = "yes"
 then
 AC_DEFINE([USE_INET6],1)
 fi
 
 
-AC_ARG_ENABLE(xattr, [  --enable-xattr       enable filesystem xattr support], cf_use_xattr=$enableval, cf_use_xattr=yes )
-
+AC_ARG_ENABLE(xattr, [  --enable-xattr              enable filesystem xattr support], cf_use_xattr=$enableval, cf_use_xattr=yes )
 if test "$cf_use_xattr" = "yes"
 then
 AC_CHECK_LIB(c,getxattr,,)
@@ -64,8 +112,7 @@ fi
 fi
 
 
-AC_ARG_ENABLE(namespaces, [  --enable-namespaces       enable linux namespace support], cf_use_namespaces=$enableval, cf_use_namespaces=yes )
-
+AC_ARG_ENABLE(namespaces, [  --enable-namespaces         enable linux namespace support], cf_use_namespaces=$enableval, cf_use_namespaces=yes )
 if test "$cf_use_namespaces" = "yes"
 then
         AC_CHECK_LIB(c,unshare,,)
@@ -84,16 +131,8 @@ then
 fi
 
 
-AC_ARG_ENABLE(zlib, [  --enable-zlib       use ZLib Compression], cf_use_zlib=$enableval, cf_use_zlib=no)
-
-if test "$cf_use_zlib" = "yes" -o "$cf_use_ssl" = "yes"
-then
-AC_CHECK_LIB(z,deflate,,)
-cf_have_libz=$ac_cv_lib_z_deflate
-fi
-
 
-AC_ARG_ENABLE(ssl, [  --enable-ssl       use Secure Sockets Layer], cf_use_ssl=$enableval, cf_use_ssl=yes )
+AC_ARG_ENABLE(ssl, [  --enable-ssl                use Secure Sockets Layer], cf_use_ssl=$enableval, cf_use_ssl=yes )
 
 if test "$cf_use_ssl" = "yes"
 then
@@ -163,6 +202,16 @@ fi
 fi
 
 
+
+AC_ARG_ENABLE(zlib, [  --enable-zlib               use ZLib Compression], cf_use_zlib=$enableval, cf_use_zlib=yes)
+
+if test "$cf_use_zlib" = "yes" -o "$cf_use_ssl" = "yes"
+then
+AC_CHECK_LIB(z,deflate,,)
+cf_have_libz=$ac_cv_lib_z_deflate
+fi
+
+
 AC_ARG_ENABLE(simd, [  --enable-simd=<level>       use SIMD cpu extensions, 'level' can be one of mmx, sse, sse2], cf_use_simd=$enableval )
 
 
@@ -190,11 +239,18 @@ fi
 
 
 dnl read Makefile.in and write Makefile 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 
 echo
 echo
 echo "############# libUseful Build Config: #############"
+
+echo "compile with -Wall - $cf_use_wall"
+echo "compile with -Werror - $cf_use_werror"
+echo "compile with FORTIFY_SOURCE=3 - $cf_use_fortify"
+echo "compile with -fstack-protector-strong - $cf_use_stackprotect"
+
 if test "$ac_cv_sys_file_offset_bits" = "64"
 then
 echo "Largefiles ( > 2GB ) enabled"
@@ -232,7 +288,7 @@ else
 echo "SSL/TLS NOT enabled"
 fi
 
-if test "$cf_use_zlib" = "yes"
+if test "$cf_have_libz" = "yes"
 then
 echo "zlib support enabled"
 else
diff --git a/libUseful-5/examples/.Hash.c.swp b/libUseful-5/examples/.Hash.c.swp
deleted file mode 100644
index 6e8ffadec646cc647975ad0dc557ea60a8511316..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI&K~BOz6vpv~2}`4a3sl_Th887+1GvxyJL|r{5E`b?PzVyD2lE2n!*~V=D|myj
z#e|*B|0Q3i=}ccbzh&D_@cP{LTD7`pUAx0?eR(3?v7IHy3n#`$V{N<H2!a!9+|<Xu
zp+6r_hQ5tEVP^U>>zlVINv+BJrzjiLx_|Uw8UX~(6}Su^?(4yA<;E+Q!gHH&9|8y<
zfB*srAb<b@2>erlX<Cr2KKq5Hs3{zx1BCzr2q1s}0tg_000IagfB*tH5r}#spI0K^
z8u$I*y#v_j`C7Bm{Al)bIoU7UKmY**5I_I{1Q0*~0R#|0AfE#7l1}2$v|p{bAM9Ti
OsmVl^l0@;SdM7)%St}&~

diff --git a/libUseful-5/examples/Hash.c b/libUseful-5/examples/Hash.c
index e20f251..3ffa267 100644
--- a/libUseful-5/examples/Hash.c
+++ b/libUseful-5/examples/Hash.c
@@ -13,7 +13,7 @@ ptr=GetToken(Types, ",", &Type, 0);
 while (ptr)
 {
 HashBytes(&Tempstr, Type, "testing123", 10, ENCODE_HEX);
-printf("%s: %s\n", Type,  Tempstr);
+printf("%s: %s\n", Type,  Tempstr); fflush(NULL);
 ptr=GetToken(ptr, ",", &Type, 0);
 }
 
diff --git a/libUseful-5/examples/Makefile b/libUseful-5/examples/Makefile
index a91ec77..502d896 100644
--- a/libUseful-5/examples/Makefile
+++ b/libUseful-5/examples/Makefile
@@ -8,6 +8,7 @@ all:
 	gcc -oHMAC.exe HMAC.c $(LIBS)
 	gcc -oTerminal.exe Terminal.c $(LIBS)
 	gcc -oTermBar.exe TermBar.c $(LIBS)
+	gcc -oTermProgress.exe TermProgress.c $(LIBS)
 	gcc -oVars.exe Vars.c $(LIBS)
 	gcc -oParseRSS.exe ParseRSS.c $(LIBS)
 	gcc -oFileCopy.exe FileCopy.c $(LIBS)
diff --git a/libUseful-5/examples/TermProgress.c b/libUseful-5/examples/TermProgress.c
new file mode 100644
index 0000000..814f9e0
--- /dev/null
+++ b/libUseful-5/examples/TermProgress.c
@@ -0,0 +1,28 @@
+#include "../libUseful.h"
+
+//demonstrates terminal progress bars
+
+main(int argc, char *argv[])
+{
+STREAM *Term;
+char *Tempstr=NULL;
+TERMPROGRESS *TP;
+int i;
+
+Term=STREAMFromDualFD(0,1);
+TerminalInit(Term, TERM_RAWKEYS | TERM_SAVEATTRIBS);
+TerminalClear(Term);
+
+//TP=TerminalProgressCreate(Term, "prompt='progress: ' left-contain=' -=' right-contain='=- ' progress=| width=20");
+//TP=TerminalProgressCreate(Term, "prompt='progress: ' progress=' ' progress-attribs=~i width=20");
+TP=TerminalProgressCreate(Term, "prompt='progress: ' progress=' ' attribs=~B progress-attribs=~W left-contain='' right-contain=' ' width=20");
+//TP=TerminalProgressCreate(Term, "prompt='progress: '  width=20");
+for (i=0; i <= 20; i++) 
+{
+Tempstr=FormatStr(Tempstr, "NOW AT: %d", i);
+TerminalProgressUpdate(TP, i, 20, Tempstr);
+sleep(1);
+}
+
+TerminalReset(Term);
+}
diff --git a/libUseful-5/examples/base32.c b/libUseful-5/examples/base32.c
index 5d74192..c54bdd6 100644
--- a/libUseful-5/examples/base32.c
+++ b/libUseful-5/examples/base32.c
@@ -7,12 +7,11 @@ main(int argc, char *argv[])
 char *Chars=NULL;
 
 
-/*
-if (argc < 2) printf("ERROR: no test string");
-else 
-DecodeBytes(&Chars, argv[1], ENCODE_BASE32);
-printf("%s\n", Chars);
-*/
+if (argc < 2) 
+{
+printf("ERROR: no test string, please supply one on the command-line\n");
+exit(1);
+}
 
 Chars=EncodeBytes(Chars, argv[1], StrLen(argv[1]), ENCODE_BASE32);
 printf("%s\n", Chars);
diff --git a/libUseful-5/examples/ssh-time.c b/libUseful-5/examples/ssh-time.c
new file mode 100644
index 0000000..f2555b4
--- /dev/null
+++ b/libUseful-5/examples/ssh-time.c
@@ -0,0 +1,31 @@
+#include "../libUseful.h"
+
+//test running a command on an ssh server
+
+main(int argc, const char *argv[])
+{
+    STREAM *S;
+    char *Tempstr=NULL;
+
+    if (argv < 2)
+    {
+        printf("Insufficient arguments: %s <ssh host>\n", argv[0]);
+        exit(1);
+    }
+
+    Tempstr=MCopyStr(Tempstr, "ssh:", argv[1], "/date '+%Y-%m-%d'", NULL);
+    S=STREAMOpen(Tempstr, "x");
+    if (S)
+    {
+        Tempstr=STREAMReadLine(Tempstr, S);
+        while (Tempstr)
+        {
+            StripTrailingWhitespace(Tempstr);
+            printf("%s\n", Tempstr);
+            Tempstr=STREAMReadLine(Tempstr, S);
+        }
+        STREAMClose(S);
+    }
+    else printf("ERROR: failed to connect to %s\n", Tempstr);
+
+}
diff --git a/libUseful-5/includes.h b/libUseful-5/includes.h
old mode 100755
new mode 100644
diff --git a/libUseful-5/libUseful.h b/libUseful-5/libUseful.h
index e61f91b..53ea6d6 100644
--- a/libUseful-5/libUseful.h
+++ b/libUseful-5/libUseful.h
@@ -63,6 +63,7 @@ Copyright (c) 2015 Colum Paget <colums.projects@googlemail.com>
 #include "Terminal.h"
 #include "TerminalMenu.h"
 #include "TerminalChoice.h"
+#include "TerminalProgress.h"
 #include "TerminalBar.h"
 #include "Process.h"
 #include "SecureMem.h"
diff --git a/libUseful-5/md5-global.h b/libUseful-5/md5-global.h
old mode 100755
new mode 100644
diff --git a/main.c b/main.c
index 6f08cf8..f5d5db4 100644
--- a/main.c
+++ b/main.c
@@ -117,6 +117,7 @@ int ProcessTargetItems(HashratCtx *Ctx)
     while(ptr)
     {
         type=StatFile(Ctx, Item, &Stat);
+
         if (type > -1) result=ProcessItem(Ctx, Item, &Stat, TRUE);
         else
         {
@@ -146,7 +147,8 @@ int main(int argc, char *argv[])
     gethostname(Tempstr, HOST_NAME_MAX);
     LocalHost=CopyStr(LocalHost, Tempstr);
     Tempstr=SetStrLen(Tempstr, HOST_NAME_MAX);
-    getdomainname(Tempstr, HOST_NAME_MAX);
+    result=getdomainname(Tempstr, HOST_NAME_MAX);
+    if (result > -1) Tempstr[result]='\0';
     LocalHost=MCatStr(LocalHost, ".", Tempstr, NULL);
 
     memset(&Stat,0,sizeof(struct stat)); //to keep valgrind happy
@@ -178,7 +180,7 @@ int main(int argc, char *argv[])
 
         case ACT_CHECK:
         case ACT_FINDMATCHES:
-            if (! MatchesLoad(0))
+            if (! MatchesLoad(Ctx, 0))
             {
                 printf("No hashes supplied on stdin.\n");
                 exit(1);
@@ -195,7 +197,7 @@ int main(int argc, char *argv[])
         case ACT_LOADMATCHES:
             ptr=GetVar(Ctx->Vars, "Memcached:Server");
             if (StrEnd(ptr)) printf("ERROR: No memcached server specified. Use the -memcached <server> command-line argument to specify one\n");
-            else MatchesLoad(FLAG_MEMCACHED);
+            else MatchesLoad(Ctx, FLAG_MEMCACHED);
             break;
 
         case ACT_FINDMATCHES_MEMCACHED:
diff --git a/output.c b/output.c
index 7de97a1..0cf4679 100644
--- a/output.c
+++ b/output.c
@@ -204,7 +204,12 @@ void OutputHash(HashratCtx *Ctx, const char *Hash, const char *Comment)
         p_Hash=Reformatted;
     }
 
-    Tempstr=MCopyStr(Tempstr, p_Hash, "  ", Comment, "\n", NULL);
+    //only add "  " if there's a comment we need to keep seperated from the has
+    //otherwise we'll make problems for programs (like ./check.sh) that read hash from hashrat
+    Tempstr=CopyStr(Tempstr, p_Hash);
+    if (StrValid(Comment)) Tempstr=MCatStr(Tempstr, "  ", Comment, NULL);
+    Tempstr=CatStr(Tempstr, "\n");
+
     STREAMWriteString(Tempstr, Ctx->Out);
 
     if (Flags & FLAG_CLIPBOARD) OutputToClipboard(Ctx, p_Hash);
diff --git a/xdialog.c b/xdialog.c
index 12e19f5..129ba60 100644
--- a/xdialog.c
+++ b/xdialog.c
@@ -155,7 +155,7 @@ int XDialogProcess(const char *Cmd, HashratCtx *Config)
         if (i > -1) Ctx->Encoding=Encodings[i];
         ptr=GetToken(ptr, "|", &LineEnding, 0);
 
-        if (StrLen(LineEnding))
+        if (StrValid(LineEnding))
         {
             if (strcmp(LineEnding, "crlf")==0) Text=CatStr(Text,"\r\n");
             if (strcmp(LineEnding, "lf")==0) Text=CatStr(Text,"\n");