Use the ECHO_N and ECHO_C variables in lieu of echo -n since some shells need it.
Use cat /dev/null instead of echo -n in the non-Mac (but on OS X) POSTLINK_COMMAND and RESCOMP variables. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4849eced7f
commit
141fad6334
8
configure
vendored
8
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 47778 2007-07-28 12:23:33Z VZ .
|
||||
# From configure.in Id: configure.in 47800 2007-07-29 00:28:07Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -37438,8 +37438,8 @@ fi
|
||||
RESCOMP="$REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
|
||||
else
|
||||
POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="echo -n \| $REZ"
|
||||
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"
|
||||
fi
|
||||
|
||||
@ -55679,7 +55679,7 @@ echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITH
|
||||
|
||||
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
|
||||
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
|
||||
echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}"
|
||||
echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
|
||||
if test "$wxUSE_UNICODE" = "yes"; then
|
||||
if test "$wxUSE_UNICODE_UTF8" = "yes"; then
|
||||
echo " (using UTF-8)"
|
||||
|
@ -4074,8 +4074,8 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||
RESCOMP="$REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
|
||||
else
|
||||
POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="echo -n \| $REZ"
|
||||
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"
|
||||
fi
|
||||
|
||||
@ -8092,7 +8092,7 @@ echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITH
|
||||
|
||||
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
|
||||
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
|
||||
echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}"
|
||||
echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
|
||||
if test "$wxUSE_UNICODE" = "yes"; then
|
||||
if test "$wxUSE_UNICODE_UTF8" = "yes"; then
|
||||
echo " (using UTF-8)"
|
||||
|
Loading…
Reference in New Issue
Block a user