aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

configure: hoist defaulting of PG_CONFIG var to top of script

Browse Source 
See: https://github.com/ElementsProject/lightning/pull/3995#discussion_r478899639
This commit is contained in:
Matt Whitlock
2020-08-28 22:58:19 -04:00
committed by Rusty Russell
parent 94472f67c5
commit c1aa33a62a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@@ -8,6 +8,13 @@ CONFIG_VAR_FILE=config.vars
CONFIG_HEADER=ccan/config.h CONFIG_HEADER=ccan/config.h
BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror" BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror"
# You can set PG_CONFIG in the environment to direct configure to call
# a specific 'pg_config' binary. If you set it to an empty string, then
# PostgreSQL support will be explicitly disabled, even if a 'pg_config'
# binary exists in your PATH. If you leave it unset, then the following
# line enables the automagic detection that most users want.
: ${PG_CONFIG=pg_config}
usage_with_default() usage_with_default()
{ {
if [ $# = 4 ]; then if [ $# = 4 ]; then
@@ -231,9 +238,9 @@ require 'python3-mako' "You need the mako module for python3: see doc/INSTALL.md
POSTGRES_INCLUDE="" POSTGRES_INCLUDE=""
POSTGRES_LDLIBS="" POSTGRES_LDLIBS=""
if command -v "${PG_CONFIG-pg_config}" >/dev/null; then if command -v "${PG_CONFIG}" >/dev/null; then
POSTGRES_INCLUDE="-I$("${PG_CONFIG-pg_config}" --includedir)" POSTGRES_INCLUDE="-I$("${PG_CONFIG}" --includedir)"
POSTGRES_LDLIBS="-L$("${PG_CONFIG-pg_config}" --libdir) -lpq" POSTGRES_LDLIBS="-L$("${PG_CONFIG}" --libdir) -lpq"
fi fi
rm -f $CONFIG_VAR_FILE.$$ rm -f $CONFIG_VAR_FILE.$$