summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2015-03-02 15:08:37 +0100
committerPavel Raiskup <praiskup@redhat.com>2015-03-02 15:08:37 +0100
commitf6c4b5674f9ea68634fa13197405a89fde64985f (patch)
treeb4996e7766e3092deff7dc12d005c95e9621999d /configure.ac
parent1b17292099daea774c2b335a85f8afebf7c99569 (diff)
postgresql-setup: better work with @SCLS@
* configure.ac (SCL_SOURCE): New variable sourcing needed scls. * postgresql-setup.in (initdb): Use @SCL_SOURCE@ instead of runtime generated $scls_initdb_hacks. (upgrade): Use @SCL_SOURCE@. For this we don't need to specify default "current" SCL when upgrading from other SCL in upgrade-configuration 'scls' option.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 8527a5f..aa82982 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,8 +174,10 @@ SCL_SHELL_WRAPPER=
if test -n "$SCLS"
then
SCL_SHELL_WRAPPER="$SCL_BINDIR/$SCL_BINARY enable $SCLS -- "
+ SCL_SOURCE="source scl_source enable $SCLS ;"
fi
add_sed_subst_var(SCL_SHELL_WRAPPER)
+add_sed_subst_var(SCL_SOURCE)
NAME_BINARYBASE="$NAME_BIN_PFX""postgresql$NAME_BIN_SFX"
NAME_PACKAGE="$NAME_PKG_PFX""postgresql$NAME_PKG_SFX"