Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8d513a6

Browse files
anarazelanarazel
committed
Remove DLLTOOL, DLLWRAP from configure / Makefile.global.in
We got rid of the need for them in 4f5f485 and 846e91e. Discussion: https://postgr.es/m/20220915022626.5xx3ccgkzpkqw5mq@awork3.anarazel.de
1 parent 9d3ebba commit 8d513a6

File tree

3 files changed

+0
-190
lines changed

3 files changed

+0
-190
lines changed

‎configure

-186
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,6 @@ INSTALL_DATA
688688
INSTALL_SCRIPT
689689
INSTALL_PROGRAM
690690
WINDRES
691-
DLLWRAP
692-
DLLTOOL
693691
AR
694692
STRIP_SHARED_LIB
695693
STRIP_STATIC_LIB
@@ -9774,190 +9772,6 @@ else
97749772
fi
97759773

97769774
if test "$PORTNAME" = "win32"; then
9777-
if test -n "$ac_tool_prefix"; then
9778-
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
9779-
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
9780-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9781-
$as_echo_n "checking for $ac_word... " >&6; }
9782-
if ${ac_cv_prog_DLLTOOL+:} false; then :
9783-
$as_echo_n "(cached) " >&6
9784-
else
9785-
if test -n "$DLLTOOL"; then
9786-
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
9787-
else
9788-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9789-
for as_dir in $PATH
9790-
do
9791-
IFS=$as_save_IFS
9792-
test -z "$as_dir" && as_dir=.
9793-
for ac_exec_ext in '' $ac_executable_extensions; do
9794-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9795-
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
9796-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9797-
break 2
9798-
fi
9799-
done
9800-
done
9801-
IFS=$as_save_IFS
9802-
9803-
fi
9804-
fi
9805-
DLLTOOL=$ac_cv_prog_DLLTOOL
9806-
if test -n "$DLLTOOL"; then
9807-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
9808-
$as_echo "$DLLTOOL" >&6; }
9809-
else
9810-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9811-
$as_echo "no" >&6; }
9812-
fi
9813-
9814-
9815-
fi
9816-
if test -z "$ac_cv_prog_DLLTOOL"; then
9817-
ac_ct_DLLTOOL=$DLLTOOL
9818-
# Extract the first word of "dlltool", so it can be a program name with args.
9819-
set dummy dlltool; ac_word=$2
9820-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9821-
$as_echo_n "checking for $ac_word... " >&6; }
9822-
if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
9823-
$as_echo_n "(cached) " >&6
9824-
else
9825-
if test -n "$ac_ct_DLLTOOL"; then
9826-
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
9827-
else
9828-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9829-
for as_dir in $PATH
9830-
do
9831-
IFS=$as_save_IFS
9832-
test -z "$as_dir" && as_dir=.
9833-
for ac_exec_ext in '' $ac_executable_extensions; do
9834-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9835-
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
9836-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9837-
break 2
9838-
fi
9839-
done
9840-
done
9841-
IFS=$as_save_IFS
9842-
9843-
fi
9844-
fi
9845-
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
9846-
if test -n "$ac_ct_DLLTOOL"; then
9847-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
9848-
$as_echo "$ac_ct_DLLTOOL" >&6; }
9849-
else
9850-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9851-
$as_echo "no" >&6; }
9852-
fi
9853-
9854-
if test "x$ac_ct_DLLTOOL" = x; then
9855-
DLLTOOL="dlltool"
9856-
else
9857-
case $cross_compiling:$ac_tool_warned in
9858-
yes:)
9859-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9860-
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9861-
ac_tool_warned=yes ;;
9862-
esac
9863-
DLLTOOL=$ac_ct_DLLTOOL
9864-
fi
9865-
else
9866-
DLLTOOL="$ac_cv_prog_DLLTOOL"
9867-
fi
9868-
9869-
if test -n "$ac_tool_prefix"; then
9870-
# Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args.
9871-
set dummy ${ac_tool_prefix}dllwrap; ac_word=$2
9872-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9873-
$as_echo_n "checking for $ac_word... " >&6; }
9874-
if ${ac_cv_prog_DLLWRAP+:} false; then :
9875-
$as_echo_n "(cached) " >&6
9876-
else
9877-
if test -n "$DLLWRAP"; then
9878-
ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
9879-
else
9880-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9881-
for as_dir in $PATH
9882-
do
9883-
IFS=$as_save_IFS
9884-
test -z "$as_dir" && as_dir=.
9885-
for ac_exec_ext in '' $ac_executable_extensions; do
9886-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9887-
ac_cv_prog_DLLWRAP="${ac_tool_prefix}dllwrap"
9888-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9889-
break 2
9890-
fi
9891-
done
9892-
done
9893-
IFS=$as_save_IFS
9894-
9895-
fi
9896-
fi
9897-
DLLWRAP=$ac_cv_prog_DLLWRAP
9898-
if test -n "$DLLWRAP"; then
9899-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLWRAP" >&5
9900-
$as_echo "$DLLWRAP" >&6; }
9901-
else
9902-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9903-
$as_echo "no" >&6; }
9904-
fi
9905-
9906-
9907-
fi
9908-
if test -z "$ac_cv_prog_DLLWRAP"; then
9909-
ac_ct_DLLWRAP=$DLLWRAP
9910-
# Extract the first word of "dllwrap", so it can be a program name with args.
9911-
set dummy dllwrap; ac_word=$2
9912-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9913-
$as_echo_n "checking for $ac_word... " >&6; }
9914-
if ${ac_cv_prog_ac_ct_DLLWRAP+:} false; then :
9915-
$as_echo_n "(cached) " >&6
9916-
else
9917-
if test -n "$ac_ct_DLLWRAP"; then
9918-
ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test.
9919-
else
9920-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9921-
for as_dir in $PATH
9922-
do
9923-
IFS=$as_save_IFS
9924-
test -z "$as_dir" && as_dir=.
9925-
for ac_exec_ext in '' $ac_executable_extensions; do
9926-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9927-
ac_cv_prog_ac_ct_DLLWRAP="dllwrap"
9928-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9929-
break 2
9930-
fi
9931-
done
9932-
done
9933-
IFS=$as_save_IFS
9934-
9935-
fi
9936-
fi
9937-
ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
9938-
if test -n "$ac_ct_DLLWRAP"; then
9939-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLWRAP" >&5
9940-
$as_echo "$ac_ct_DLLWRAP" >&6; }
9941-
else
9942-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9943-
$as_echo "no" >&6; }
9944-
fi
9945-
9946-
if test "x$ac_ct_DLLWRAP" = x; then
9947-
DLLWRAP="dllwrap"
9948-
else
9949-
case $cross_compiling:$ac_tool_warned in
9950-
yes:)
9951-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
9952-
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
9953-
ac_tool_warned=yes ;;
9954-
esac
9955-
DLLWRAP=$ac_ct_DLLWRAP
9956-
fi
9957-
else
9958-
DLLWRAP="$ac_cv_prog_DLLWRAP"
9959-
fi
9960-
99619775
if test -n "$ac_tool_prefix"; then
99629776
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
99639777
set dummy ${ac_tool_prefix}windres; ac_word=$2

‎configure.ac

-2
Original file line numberDiff line numberDiff line change
@@ -1133,8 +1133,6 @@ AC_PROG_RANLIB
11331133
PGAC_CHECK_STRIP
11341134
AC_CHECK_TOOL(AR, ar, ar)
11351135
if test "$PORTNAME" = "win32"; then
1136-
AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
1137-
AC_CHECK_TOOL(DLLWRAP, dllwrap, dllwrap)
11381136
AC_CHECK_TOOL(WINDRES, windres, windres)
11391137
fi
11401138

‎src/Makefile.global.in

-2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,6 @@ ZIC = @ZIC@
284284
# Linking
285285

286286
AR = @AR@
287-
DLLTOOL = @DLLTOOL@
288-
DLLWRAP = @DLLWRAP@
289287
LIBS = @LIBS@
290288
LDAP_LIBS_FE = @LDAP_LIBS_FE@
291289
LDAP_LIBS_BE = @LDAP_LIBS_BE@

0 commit comments

Comments
 (0)