Skip to content

Commit 942ac47

Browse files
committed
README.rpm-dist: postgresql-libs subpackage is not mandatory
* README.rpm-dist.template: Opt-out *-libs docs. * configure.ac: Add --without-libs-pkg option.
1 parent 37cbf42 commit 942ac47

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

README.rpm-dist.template

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,12 @@ m4_divert[]m4_dnl
205205
<entry>@NAME_PACKAGE@:</entry>
206206
<entry>Key client programs and basic documentation</entry>
207207
</row>
208+
m4_ifelse([@LIBS_ENABLED@],[yes], [
208209
<row>
209210
<entry>@NAME_PACKAGE@-libs:</entry>
210211
<entry>Client shared libraries</entry>
211212
</row>
213+
])
212214
<row>
213215
<entry>@NAME_PACKAGE@-server:</entry>
214216
<entry>Server executables and data files</entry>
@@ -249,9 +251,11 @@ m4_divert[]m4_dnl
249251
</tgroup>
250252
</table>
251253
<para>
252-
You have to install @NAME_PACKAGE@ and @NAME_PACKAGE@-libs to do anything.
253-
@NAME_PACKAGE@-server is needed unless you only plan to use the clients to
254-
work with a remote PostgreSQL server. The others are optional.
254+
You have to install @NAME_PACKAGE@
255+
m4_ifelse([@LIBS_ENABLED@], [yes], [and @NAME_PACKAGE@-libs])
256+
to do anything.
257+
Package @NAME_PACKAGE@-server is needed unless you only plan to use the
258+
clients to work with a remote PostgreSQL server. The others are optional.
255259
</para>
256260
<para>
257261
Note that there are no @NAME_PACKAGE@-perl, @NAME_PACKAGE@-jdbc,

configure.ac

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ SCL_SOURCE=:
139139
SCL_SHELL_WRAPPER=
140140

141141
scl_enabled_build=false
142-
AC_ARG_WITH([scl], [Build against Software Collections RPM], [scl_enabled_build=:])
142+
AC_ARG_WITH([scl],
143+
[AS_HELP_STRING([--with-scl],
144+
[Build against Software Collections RPM])],
145+
[scl_enabled_build=:])
143146
if $scl_enabled_build; then
144147
AC_MSG_CHECKING([which SCL to build against])
145148
SCL=`rpm --eval %scl`
@@ -156,6 +159,12 @@ if $scl_enabled_build; then
156159
fi
157160
fi
158161

162+
AC_ARG_WITH([libs-pkg],
163+
[AS_HELP_STRING([--without-libs-pkg],
164+
[PostgreSQL installation will not have postgresql-libs])],
165+
[], [withval=yes])
166+
_AX_TEXT_TPL_SUBST([LIBS_ENABLED], [$withval])
167+
159168
PGSETUP_SUBST_OPT([NAME_SRV_PFX], [],
160169
[service name prefix, like (PFX)postgresql.service])
161170
PGSETUP_SUBST_OPT([NAME_SRV_SFX], [],

0 commit comments

Comments
 (0)