aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2022-08-18 11:22:13 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2022-08-18 11:22:13 -0400
commit27f1774aac1f8ffe642b55e78dbe0b64ed082cc6 (patch)
treedb970d776f43186b844cf770b65f543e5a2122fe
parent08909e3aee6182a988da5bf5c1b543910ee096c7 (diff)
downloadpostgresql-27f1774aac1f8ffe642b55e78dbe0b64ed082cc6.tar.gz
postgresql-27f1774aac1f8ffe642b55e78dbe0b64ed082cc6.zip
Remove unused configure variable.
configure extracts TCL_SHLIB_LD_LIBS from tclConfig.sh, and puts the value into Makefile.global, but then we never use it anywhere. It looks like I removed the only usage in cd75f94da, but didn't notice that it was the only usage. Might as well mop this up while we're trying to get rid of unnecessary configure steps. Discussion: https://postgr.es/m/2442359.1660835043@sss.pgh.pa.us
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.global.in1
3 files changed, 1 insertions, 4 deletions
diff --git a/configure b/configure
index b7fd6c5f4ea..9e8ac510ac0 100755
--- a/configure
+++ b/configure
@@ -634,7 +634,6 @@ DBTOEPUB
FOP
XSLTPROC
XMLLINT
-TCL_SHLIB_LD_LIBS
TCL_SHARED_BUILD
TCL_LIB_SPEC
TCL_LIBS
@@ -18818,7 +18817,7 @@ eval TCL_LIBS=\"$TCL_LIBS\"
eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
- if test "$TCL_SHARED_BUILD" != 1; then
+ if test "$TCL_SHARED_BUILD" != 1; then
as_fn_error $? "cannot build PL/Tcl because Tcl is not a shared library
Use --without-tcl to disable building PL/Tcl." "$LINENO" 5
fi
diff --git a/configure.ac b/configure.ac
index e5740f4fb55..67cf317c3b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2252,7 +2252,6 @@ if test "$with_tcl" = yes; then
PGAC_PATH_TCLCONFIGSH([$with_tclconfig])
PGAC_EVAL_TCLCONFIGSH([$TCL_CONFIG_SH],
[TCL_INCLUDE_SPEC,TCL_LIBS,TCL_LIB_SPEC,TCL_SHARED_BUILD])
- AC_SUBST(TCL_SHLIB_LD_LIBS)dnl don't want to double-evaluate that one
if test "$TCL_SHARED_BUILD" != 1; then
AC_MSG_ERROR([cannot build PL/Tcl because Tcl is not a shared library
Use --without-tcl to disable building PL/Tcl.])
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 0625b60c434..5664c645f82 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -221,7 +221,6 @@ TCL_LIBS = @TCL_LIBS@
TCL_LIB_SPEC = @TCL_LIB_SPEC@
TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
TCL_SHARED_BUILD = @TCL_SHARED_BUILD@
-TCL_SHLIB_LD_LIBS = @TCL_SHLIB_LD_LIBS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@