From 4e07f1177266cbcad303edd953f54c8ca195aaa9 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Sat, 30 Sep 2017 10:06:32 -0700
Subject: [PATCH] [v9_9] add configured prefixes to summary

4746.	[cleanup]	Add configured prefixes to configure summary
			output. [RT #46153]

(cherry picked from commit c0f8a8f30a59fd1d35260deaccde4eee38dc6a93)
(cherry picked from commit 6d86c99e22b12d38001d889dd75787683272b54e)
---
 CHANGES      |  3 +++
 configure    | 24 ++++++++++++++++++++++--
 configure.in | 10 +++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 53a115dca0..c0263705d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4746.	[cleanup]	Add configured prefixes to configure summary
+			output. [RT #46153]
+
 4745.	[test]		Add color-coded pass/fail messages to system
 			tests when running on terminals that support them.
 			[RT #45977]
diff --git a/configure b/configure
index 8570a7d87d..3b8855c2f2 100755
--- a/configure
+++ b/configure
@@ -938,6 +938,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1086,6 +1087,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}'
@@ -1338,6 +1340,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=* \
@@ -1475,7 +1486,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.
@@ -1628,6 +1639,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]
@@ -24041,7 +24053,8 @@ report() {
     test "no" = "$use_dlz_stub" || \
         echo "        Stub (--with-dlz-stub)"
     test "no no no no no no no" = "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" && echo "        None"
-    echo
+
+    echo "------------------------------------------------------------------------"
 
     echo "Features disabled or unavailable on this platform:"
     $use_threads || echo "    Multiprocessing support (--enable-threads)"
@@ -24072,11 +24085,18 @@ report() {
     test "X$PYTHON" = "X" && echo "    Python tools (--with-python)"
     test "X$libxml2_libs" = "X" && echo "    XML statistics (--with-libxml2)"
 
+    echo "------------------------------------------------------------------------"
+    echo "Configured paths:"
+    echo "    prefix: $prefix"
+    echo "    sysconfdir: $sysconfdir"
+    echo "    localstatedir: $localstatedir"
+
     if test "X$ac_unrecognized_opts" != "X"; then
         echo
         echo "Unrecognized options:"
         echo "    $ac_unrecognized_opts"
     fi
+
     if test "yes" != "$enable_full_report"; then
         echo "------------------------------------------------------------------------"
         echo "For more detail, use --enable-full-report."
diff --git a/configure.in b/configure.in
index 3a7c397a4d..6d93326eb0 100644
--- a/configure.in
+++ b/configure.in
@@ -4492,7 +4492,8 @@ report() {
     test "no" = "$use_dlz_stub" || \
         echo "        Stub (--with-dlz-stub)"
     test "no no no no no no no" = "$use_dlz_bdb $use_dlz_ldap $use_dlz_mysql $use_dlz_odbc $use_dlz_postgres $use_dlz_filesystem $use_dlz_stub" && echo "        None"
-    echo
+
+    echo "------------------------------------------------------------------------"
 
     echo "Features disabled or unavailable on this platform:"
     $use_threads || echo "    Multiprocessing support (--enable-threads)"
@@ -4523,11 +4524,18 @@ report() {
     test "X$PYTHON" = "X" && echo "    Python tools (--with-python)"
     test "X$libxml2_libs" = "X" && echo "    XML statistics (--with-libxml2)"
 
+    echo "------------------------------------------------------------------------"
+    echo "Configured paths:"
+    echo "    prefix: $prefix"
+    echo "    sysconfdir: $sysconfdir"
+    echo "    localstatedir: $localstatedir"
+
     if test "X$ac_unrecognized_opts" != "X"; then
         echo
         echo "Unrecognized options:"
         echo "    $ac_unrecognized_opts"
     fi
+
     if test "yes" != "$enable_full_report"; then
         echo "------------------------------------------------------------------------"
         echo "For more detail, use --enable-full-report."