From 781b2e30923ce90d769de8c4ee973582454bf2db Mon Sep 17 00:00:00 2001
From: William Brown <firstyear@redhat.com>
Date: Thu, 20 Apr 2017 14:00:22 +1000
Subject: [PATCH] Ticket 49224 - without --prefix, $prefixdir would be NONE in
 defaults.

Bug Description:  In the handling of $prefix, we set $prefix dir early
in the process, but later configure changes it to $ac_default_prefix
if $prefix == NONE.

Fix Description:  Check if $prefix is none, and update the value
based on $ac_default_prefix from that instead.

https://pagure.io/389-ds-base/issue/49224

Author: wibrown

Review by: ???
---
 configure.ac | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index 6674960..90615fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,13 @@ AM_CONDITIONAL(enable_nunc_stans,test "$enable_nunc_stans" = "yes")
 # the default prefix - override with --prefix or --with-fhs
 AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
 
+# If we have no prefix specified, we need to fix the prefix variable.
+# If we don't what happens is $prefixdir ends up as NONE, and then
+# later configure changes $prefix to $ac_default_prefix underneath us.
+if test "$prefix" = "NONE"; then
+    prefix=$ac_default_prefix
+fi
+
 m4_include(m4/fhs.m4)
 
 localrundir='/run'
-- 
1.8.3.1