mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
Change PL/Tcl build to use configured compiler and Makefile.shlib
system, not Tcl-provided one. Make sure export file, if any, is cleaned. Tcl configuration is now read directly in configure and recorded in Makefile.global. This eliminates some duplicate efforts and allows for easier hand-editing of the results, if necessary.
This commit is contained in:
21
configure
vendored
21
configure
vendored
@ -16405,7 +16405,13 @@ fi
|
||||
|
||||
|
||||
|
||||
fi
|
||||
. "$TCL_CONFIG_SH"
|
||||
eval TCL_LIB_FILE=\"$TCL_LIB_FILE\"
|
||||
eval TCL_LIBS=\"$TCL_LIBS\"
|
||||
eval TCL_LIB_SPEC=\"$TCL_LIB_SPEC\"
|
||||
eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
|
||||
|
||||
fi
|
||||
|
||||
# Check for Tk configuration script tkConfig.sh
|
||||
if test "$with_tk" = yes; then
|
||||
@ -16444,6 +16450,11 @@ fi
|
||||
|
||||
|
||||
|
||||
. "$TK_CONFIG_SH"
|
||||
eval TK_LIBS=\"$TK_LIBS\"
|
||||
eval TK_LIB_SPEC=\"$TK_LIB_SPEC\"
|
||||
eval TK_XINCLUDES=\"$TK_XINCLUDES\"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@ -17435,7 +17446,15 @@ s,@XGETTEXT@,$XGETTEXT,;t t
|
||||
s,@localedir@,$localedir,;t t
|
||||
s,@TCLSH@,$TCLSH,;t t
|
||||
s,@TCL_CONFIG_SH@,$TCL_CONFIG_SH,;t t
|
||||
s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
|
||||
s,@TCL_LIBS@,$TCL_LIBS,;t t
|
||||
s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
|
||||
s,@TCL_SHARED_BUILD@,$TCL_SHARED_BUILD,;t t
|
||||
s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t
|
||||
s,@TK_CONFIG_SH@,$TK_CONFIG_SH,;t t
|
||||
s,@TK_LIBS@,$TK_LIBS,;t t
|
||||
s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
|
||||
s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t
|
||||
s,@NSGMLS@,$NSGMLS,;t t
|
||||
s,@JADE@,$JADE,;t t
|
||||
s,@have_docbook@,$have_docbook,;t t
|
||||
|
Reference in New Issue
Block a user