mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 17:47:16 +00:00
configure: Remove no longer needed check for dlltool.
This commit is contained in:
parent
f88fecf80f
commit
37910bebfd
104
configure
vendored
104
configure
vendored
|
@ -761,7 +761,6 @@ COREFOUNDATION_LIBS
|
||||||
ac_ct_OBJC
|
ac_ct_OBJC
|
||||||
OBJCFLAGS
|
OBJCFLAGS
|
||||||
OBJC
|
OBJC
|
||||||
DLLTOOL
|
|
||||||
WINELOADER_PROGRAMS
|
WINELOADER_PROGRAMS
|
||||||
CONFIGURE_TARGETS
|
CONFIGURE_TARGETS
|
||||||
DISABLED_SUBDIRS
|
DISABLED_SUBDIRS
|
||||||
|
@ -9461,108 +9460,6 @@ libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'`
|
||||||
|
|
||||||
case $host_os in
|
case $host_os in
|
||||||
cygwin*|mingw32*)
|
cygwin*|mingw32*)
|
||||||
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
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_DLLTOOL+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
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
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
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"
|
|
||||||
printf "%s\n" "$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
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
|
|
||||||
printf "%s\n" "$DLLTOOL" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "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
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
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
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
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"
|
|
||||||
printf "%s\n" "$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
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
|
|
||||||
printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_ct_DLLTOOL" = x; then
|
|
||||||
DLLTOOL="false"
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
||||||
printf "%s\n" "$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
|
|
||||||
|
|
||||||
LIBEXT="dll"
|
LIBEXT="dll"
|
||||||
EXTRACFLAGS="-D__WINE_PE_BUILD"
|
EXTRACFLAGS="-D__WINE_PE_BUILD"
|
||||||
case $host_cpu in
|
case $host_cpu in
|
||||||
|
@ -23244,7 +23141,6 @@ SUBDIRS = $SUBDIRS
|
||||||
DISABLED_SUBDIRS = $DISABLED_SUBDIRS
|
DISABLED_SUBDIRS = $DISABLED_SUBDIRS
|
||||||
CONFIGURE_TARGETS = $CONFIGURE_TARGETS
|
CONFIGURE_TARGETS = $CONFIGURE_TARGETS
|
||||||
WINELOADER_PROGRAMS = $WINELOADER_PROGRAMS
|
WINELOADER_PROGRAMS = $WINELOADER_PROGRAMS
|
||||||
DLLTOOL = $DLLTOOL
|
|
||||||
OBJC = $OBJC
|
OBJC = $OBJC
|
||||||
OBJCFLAGS = $OBJCFLAGS
|
OBJCFLAGS = $OBJCFLAGS
|
||||||
ac_ct_OBJC = $ac_ct_OBJC
|
ac_ct_OBJC = $ac_ct_OBJC
|
||||||
|
|
|
@ -667,7 +667,6 @@ libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'`
|
||||||
|
|
||||||
case $host_os in
|
case $host_os in
|
||||||
cygwin*|mingw32*)
|
cygwin*|mingw32*)
|
||||||
AC_CHECK_TOOL(DLLTOOL,dlltool,false)
|
|
||||||
LIBEXT="dll"
|
LIBEXT="dll"
|
||||||
EXTRACFLAGS="-D__WINE_PE_BUILD"
|
EXTRACFLAGS="-D__WINE_PE_BUILD"
|
||||||
dnl Disable stdcall fixups to catch prototype mismatches
|
dnl Disable stdcall fixups to catch prototype mismatches
|
||||||
|
|
|
@ -157,7 +157,6 @@ static const char *ar;
|
||||||
static const char *ranlib;
|
static const char *ranlib;
|
||||||
static const char *rsvg;
|
static const char *rsvg;
|
||||||
static const char *icotool;
|
static const char *icotool;
|
||||||
static const char *dlltool;
|
|
||||||
static const char *msgfmt;
|
static const char *msgfmt;
|
||||||
static const char *ln_s;
|
static const char *ln_s;
|
||||||
static const char *sed_cmd;
|
static const char *sed_cmd;
|
||||||
|
@ -4480,7 +4479,6 @@ int main( int argc, char *argv[] )
|
||||||
ranlib = get_expanded_make_variable( top_makefile, "RANLIB" );
|
ranlib = get_expanded_make_variable( top_makefile, "RANLIB" );
|
||||||
rsvg = get_expanded_make_variable( top_makefile, "RSVG" );
|
rsvg = get_expanded_make_variable( top_makefile, "RSVG" );
|
||||||
icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" );
|
icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" );
|
||||||
dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" );
|
|
||||||
msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" );
|
msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" );
|
||||||
sed_cmd = get_expanded_make_variable( top_makefile, "SED_CMD" );
|
sed_cmd = get_expanded_make_variable( top_makefile, "SED_CMD" );
|
||||||
ln_s = get_expanded_make_variable( top_makefile, "LN_S" );
|
ln_s = get_expanded_make_variable( top_makefile, "LN_S" );
|
||||||
|
|
Loading…
Reference in a new issue