summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPeter Eisentraut2019-01-18 07:29:42 +0000
committerPeter Eisentraut2019-01-18 07:38:34 +0000
commit29b3ac75462625b78eec0a92a49a22c5e2c7a01f (patch)
tree275646c4350d065c7dff658aaa1896beab57e41e /configure
parent80971bc206b06deebe71e722f49949f6df4ce642 (diff)
configure: More use of AC_ARG_VAR
AC_ARG_VAR is necessary if an environment variable influences a configure result that is then used by other tests that are cached. With AC_ARG_VAR, a change in the variable is detected on subsequent configure runs and the user is then advised to remove the cache. This adds AC_ARG_VAR calls for: MSGFMT, PERL, PYTHON, TCLSH, XML2_CONFIG Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://www.postgresql.org/message-id/30672.1546816567@sss.pgh.pa.us
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 13 insertions, 3 deletions
diff --git a/configure b/configure
index 06fc3c6835..5e4204ae93 100755
--- a/configure
+++ b/configure
@@ -887,8 +887,13 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
ICU_CFLAGS
ICU_LIBS
+XML2_CONFIG
LDFLAGS_EX
-LDFLAGS_SL'
+LDFLAGS_SL
+PERL
+PYTHON
+MSGFMT
+TCLSH'
# Initialize some variables set by options.
@@ -1586,8 +1591,13 @@ Some influential environment variables:
path overriding pkg-config's built-in search path
ICU_CFLAGS C compiler flags for ICU, overriding pkg-config
ICU_LIBS linker flags for ICU, overriding pkg-config
+ XML2_CONFIG path to xml2-config utility
LDFLAGS_EX extra linker flags for linking executables only
LDFLAGS_SL extra linker flags for linking shared libraries only
+ PERL Perl program
+ PYTHON Python program
+ MSGFMT msgfmt program for NLS
+ TCLSH Tcl interpreter program (tclsh)
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -8185,7 +8195,7 @@ $as_echo_n "checking for XML2_CONFIG... " >&6; }
$as_echo "$XML2_CONFIG" >&6; }
fi
- if test -n "$XML2_CONFIG"; then
+ if test -n "$XML2_CONFIG"; then
for pgac_option in `$XML2_CONFIG --cflags`; do
case $pgac_option in
-I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";;
@@ -18097,7 +18107,7 @@ $as_echo_n "checking for MSGFMT... " >&6; }
$as_echo "$MSGFMT" >&6; }
fi
- if test -z "$MSGFMT"; then
+ if test -z "$MSGFMT"; then
as_fn_error $? "msgfmt is required for NLS" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for msgfmt flags" >&5