From d3e2f848eceafe6ea4e6119d219ffe5e07e2b5a1 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 29 Aug 2018 16:17:56 -0700
Subject: [PATCH] configure could loop if --with-pic was specified

---
 configure    | 16 ++++++++++++++--
 configure.in |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 795fb5bf63..42eed09577 100755
--- a/configure
+++ b/configure
@@ -863,6 +863,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1021,6 +1022,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_TARNAME}'
@@ -1273,6 +1275,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=* \
@@ -1410,7 +1421,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.
@@ -1563,6 +1574,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]
@@ -15570,7 +15582,7 @@ esac
 #
 # If PIC is disabled, shared libraries must also be
 #
-if "$pic_mode" = "no"; then :
+if test "$pic_mode" = "no"; then :
   enable_shared="no"
 fi
 
diff --git a/configure.in b/configure.in
index 23ecf2bbb4..6eb99f679f 100644
--- a/configure.in
+++ b/configure.in
@@ -909,7 +909,7 @@ AC_SUBST(INSTALL_LIBRARY)
 #
 # If PIC is disabled, shared libraries must also be
 #
-AS_IF(["$pic_mode" = "no"],
+AS_IF([test "$pic_mode" = "no"],
       [enable_shared="no"])
 
 CRYPTO=OpenSSL