mirror of
https://github.com/postgres/postgres.git
synced 2025-05-13 01:13:08 -04:00
Remove DLLTOOL, DLLWRAP from configure / Makefile.global.in
We got rid of the need for them in 4f5f485d10c and 846e91e0223. Discussion: https://postgr.es/m/20220915022626.5xx3ccgkzpkqw5mq@awork3.anarazel.de
This commit is contained in:
Andres Freund
parent
9d3ebba729
commit
8d513a6b71
186
configure
vendored
186
configure
vendored
@ -688,8 +688,6 @@ INSTALL_DATA
|
|||||||
INSTALL_SCRIPT
|
INSTALL_SCRIPT
|
||||||
INSTALL_PROGRAM
|
INSTALL_PROGRAM
|
||||||
WINDRES
|
WINDRES
|
||||||
DLLWRAP
|
|
||||||
DLLTOOL
|
|
||||||
AR
|
AR
|
||||||
STRIP_SHARED_LIB
|
STRIP_SHARED_LIB
|
||||||
STRIP_STATIC_LIB
|
STRIP_STATIC_LIB
|
||||||
@ -9774,190 +9772,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$PORTNAME" = "win32"; then
|
if test "$PORTNAME" = "win32"; then
|
||||||
if test -n "$ac_tool_prefix"; then
|
|
||||||
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
|
|
||||||
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
|
||||||
if ${ac_cv_prog_DLLTOOL+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test -n "$DLLTOOL"; then
|
|
||||||
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
DLLTOOL=$ac_cv_prog_DLLTOOL
|
|
||||||
if test -n "$DLLTOOL"; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
|
|
||||||
$as_echo "$DLLTOOL" >&6; }
|
|
||||||
else
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cv_prog_DLLTOOL"; then
|
|
||||||
ac_ct_DLLTOOL=$DLLTOOL
|
|
||||||
# Extract the first word of "dlltool", so it can be a program name with args.
|
|
||||||
set dummy dlltool; ac_word=$2
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
|
||||||
if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test -n "$ac_ct_DLLTOOL"; then
|
|
||||||
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
|
|
||||||
if test -n "$ac_ct_DLLTOOL"; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
|
|
||||||
$as_echo "$ac_ct_DLLTOOL" >&6; }
|
|
||||||
else
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_ct_DLLTOOL" = x; then
|
|
||||||
DLLTOOL="dlltool"
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
||||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
||||||
ac_tool_warned=yes ;;
|
|
||||||
esac
|
|
||||||
DLLTOOL=$ac_ct_DLLTOOL
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
DLLTOOL="$ac_cv_prog_DLLTOOL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
|
||||||
# Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args.
|
|
||||||
set dummy ${ac_tool_prefix}dllwrap; ac_word=$2
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
|
||||||
if ${ac_cv_prog_DLLWRAP+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test -n "$DLLWRAP"; then
|
|
||||||
ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap"
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
DLLWRAP=$ac_cv_prog_DLLWRAP
|
|
||||||
if test -n "$DLLWRAP"; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLWRAP" >&5
|
|
||||||
$as_echo "$DLLWRAP" >&6; }
|
|
||||||
else
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cv_prog_DLLWRAP"; then
|
|
||||||
ac_ct_DLLWRAP=$DLLWRAP
|
|
||||||
# Extract the first word of "dllwrap", so it can be a program name with args.
|
|
||||||
set dummy dllwrap; ac_word=$2
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
|
||||||
if ${ac_cv_prog_ac_ct_DLLWRAP+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test -n "$ac_ct_DLLWRAP"; then
|
|
||||||
ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_ac_ct_DLLWRAP="dllwrap"
|
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
|
|
||||||
if test -n "$ac_ct_DLLWRAP"; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLWRAP" >&5
|
|
||||||
$as_echo "$ac_ct_DLLWRAP" >&6; }
|
|
||||||
else
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_ct_DLLWRAP" = x; then
|
|
||||||
DLLWRAP="dllwrap"
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
||||||
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
||||||
ac_tool_warned=yes ;;
|
|
||||||
esac
|
|
||||||
DLLWRAP=$ac_ct_DLLWRAP
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
DLLWRAP="$ac_cv_prog_DLLWRAP"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
if test -n "$ac_tool_prefix"; then
|
||||||
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
|
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
|
||||||
set dummy ${ac_tool_prefix}windres; ac_word=$2
|
set dummy ${ac_tool_prefix}windres; ac_word=$2
|
||||||
|
|||||||
@ -1133,8 +1133,6 @@ AC_PROG_RANLIB
|
|||||||
PGAC_CHECK_STRIP
|
PGAC_CHECK_STRIP
|
||||||
AC_CHECK_TOOL(AR, ar, ar)
|
AC_CHECK_TOOL(AR, ar, ar)
|
||||||
if test "$PORTNAME" = "win32"; then
|
if test "$PORTNAME" = "win32"; then
|
||||||
AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
|
|
||||||
AC_CHECK_TOOL(DLLWRAP, dllwrap, dllwrap)
|
|
||||||
AC_CHECK_TOOL(WINDRES, windres, windres)
|
AC_CHECK_TOOL(WINDRES, windres, windres)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -284,8 +284,6 @@ ZIC = @ZIC@
|
|||||||
# Linking
|
# Linking
|
||||||
|
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
DLLTOOL = @DLLTOOL@
|
|
||||||
DLLWRAP = @DLLWRAP@
|
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
LDAP_LIBS_FE = @LDAP_LIBS_FE@
|
LDAP_LIBS_FE = @LDAP_LIBS_FE@
|
||||||
LDAP_LIBS_BE = @LDAP_LIBS_BE@
|
LDAP_LIBS_BE = @LDAP_LIBS_BE@
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user