Remove checks for Carbon Mac tools not used any longer
We don't use Rez, DeRez and SetFile any longer and they are not referenced in bakefile-generated makefiles any longer since the previous commit.
This commit is contained in:
Vadim Zeitlin
parent
0d394eec9c
commit
c77c43cf8c
160
configure
vendored
160
configure
vendored
@ -627,14 +627,9 @@ enable_option_checking=fatal
|
||||
ac_subst_vars='LTLIBOBJS
|
||||
LIBOBJS
|
||||
CPPUNIT_CONFIG
|
||||
RESCOMP
|
||||
DLLTOOL
|
||||
GCC
|
||||
MACSETFILE
|
||||
POSTLINK_COMMAND
|
||||
LIBWXMACRES
|
||||
WX_RESOURCES_MACOSX_DATA
|
||||
WX_RESOURCES_MACOSX_ASCII
|
||||
RESCOMP
|
||||
WX_VERSION_TAG
|
||||
DMALLOC_LIBS
|
||||
OPENGL_LIBS
|
||||
@ -664,7 +659,6 @@ USE_GUI
|
||||
WX_LIBRARY_BASENAME_GUI
|
||||
WX_LIBRARY_BASENAME_NOGUI
|
||||
SHARED
|
||||
DEREZ
|
||||
COND_wxUSE_ZLIB_builtin
|
||||
COND_wxUSE_REGEX_builtin
|
||||
COND_wxUSE_LIBTIFF_builtin
|
||||
@ -853,8 +847,6 @@ ICC_PCH_CREATE_SWITCH
|
||||
ICC_PCH
|
||||
GCC_PCH
|
||||
OBJCXXFLAGS
|
||||
SETFILE
|
||||
REZ
|
||||
WINDRES
|
||||
BK_DEPS
|
||||
DEPS_TRACKING
|
||||
@ -37298,85 +37290,6 @@ else
|
||||
fi
|
||||
|
||||
;;
|
||||
|
||||
*-*-darwin* | powerpc-apple-macos* )
|
||||
# Extract the first word of "Rez", so it can be a program name with args.
|
||||
set dummy Rez; 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_REZ+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$REZ"; then
|
||||
ac_cv_prog_REZ="$REZ" # 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_REZ="Rez"
|
||||
$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
|
||||
|
||||
test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
|
||||
fi
|
||||
fi
|
||||
REZ=$ac_cv_prog_REZ
|
||||
if test -n "$REZ"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $REZ" >&5
|
||||
$as_echo "$REZ" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
# Extract the first word of "SetFile", so it can be a program name with args.
|
||||
set dummy SetFile; 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_SETFILE+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$SETFILE"; then
|
||||
ac_cv_prog_SETFILE="$SETFILE" # 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_SETFILE="SetFile"
|
||||
$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
|
||||
|
||||
test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
|
||||
fi
|
||||
fi
|
||||
SETFILE=$ac_cv_prog_SETFILE
|
||||
if test -n "$SETFILE"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETFILE" >&5
|
||||
$as_echo "$SETFILE" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@ -37385,12 +37298,10 @@ fi
|
||||
|
||||
|
||||
|
||||
BAKEFILE_BAKEFILE_M4_VERSION="0.2.11"
|
||||
|
||||
|
||||
BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
|
||||
|
||||
|
||||
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
|
||||
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.11"
|
||||
|
||||
|
||||
|
||||
@ -38488,62 +38399,6 @@ if test "$wxUSE_MSW" = 1 ; then
|
||||
RESCOMP="$WINDRES"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
# Extract the first word of "DeRez", so it can be a program name with args.
|
||||
set dummy DeRez; 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_DEREZ+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$DEREZ"; then
|
||||
ac_cv_prog_DEREZ="$DEREZ" # 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_DEREZ="DeRez"
|
||||
$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
|
||||
|
||||
test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
|
||||
fi
|
||||
fi
|
||||
DEREZ=$ac_cv_prog_DEREZ
|
||||
if test -n "$DEREZ"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEREZ" >&5
|
||||
$as_echo "$DEREZ" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
|
||||
else
|
||||
MACSETFILE="@true"
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@ -38640,15 +38495,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
40
configure.in
40
configure.in
@ -8004,31 +8004,6 @@ if test "$wxUSE_MSW" = 1 ; then
|
||||
RESCOMP="$WINDRES"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
dnl base name of the resource file for wxMac must be the same
|
||||
dnl as library installation base name (-install_name)
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
dnl add the resources target for wxMac
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
dnl resources are bundled both with shared library and applications
|
||||
dnl since the carb resource *must* be included in the application
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
|
||||
else
|
||||
dnl default value is to (silently) do nothing in the makefile
|
||||
MACSETFILE="@true"
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
|
||||
fi
|
||||
dnl wxUSE_GUI = 1
|
||||
|
||||
@ -8179,22 +8154,11 @@ AC_SUBST(OPENGL_LIBS)
|
||||
AC_SUBST(DMALLOC_LIBS)
|
||||
AC_SUBST(WX_VERSION_TAG)
|
||||
|
||||
dnl additional resurces settings
|
||||
AC_SUBST(RESCOMP)
|
||||
AC_SUBST(WINDRES)
|
||||
AC_SUBST(REZ)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_DATA)
|
||||
|
||||
dnl additional for Mac OS X
|
||||
AC_SUBST(DEREZ)
|
||||
AC_SUBST(LIBWXMACRES)
|
||||
AC_SUBST(POSTLINK_COMMAND)
|
||||
AC_SUBST(MACSETFILE)
|
||||
|
||||
dnl other tools
|
||||
AC_SUBST(GCC)
|
||||
AC_SUBST(DLLTOOL)
|
||||
AC_SUBST(RESCOMP)
|
||||
AC_SUBST(WINDRES)
|
||||
|
||||
|
||||
dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user