AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use AC_CHECK_TOOL rather than AC_CHECK_PROG for AR, RANLIB, STRIP, RESCOMP,

Browse Source 
and DLLTOOL.  This automatically searches for tools with a prefix of
"$host_alias-" when cross compiling then falls back to the unprefixed tool name
if that fails.  If the user specifies the tool using the appropriate variable
(e.g. CC, CXX, AR, RANLIB, STRIP, etc.) then it will be checked as is.

Removed the major hack that did something similar to this but simply
ignored user-provided variables and used default tool names.  For example,
CC was locked to $host_alias-gcc when cross compiling even if the user
specified CC on the configure command-line.

This brings wxWidgets in line with other autoconf 2.5x projects.  The only
downside to this approach is that our old method would fail if
$host_alias-toolname was not present whereas the autoconf method will silently
use the host compiler (which is usually _not_ what the user wants).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2005-09-09 22:17:09 +00:00
parent cff614f601
commit 8c80d38463
2 changed files with 368 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

395
configure vendored
View File

File diff suppressed because one or more lines are too long

42
configure.in
View File

@ -252,7 +252,6 @@ case "${host}" in
dnl USE_UNIX must be set and not USE_WIN32
SO_SUFFIX=dll
PROGRAM_EXT=".exe"
RESCOMP=windres
DEFAULT_DEFAULT_wxUSE_MSW=1
DEFAULT_STD_FLAG=no
;;
@ -1325,7 +1324,6 @@ if test "$wxUSE_WINE" = "yes"; then
dnl FIXME: we should do a better job of testing for these
CC=winegcc
CXX=wineg++
RESCOMP=wrc
LDFLAGS_GUI="-mwindows"
fi
@ -1359,24 +1357,6 @@ dnl ---------------------------------------------------------------------------
dnl flush the cache because checking for programs might abort
AC_CACHE_SAVE
dnl cross-compiling support: we're cross compiling if the build system is
dnl different from the target one (assume host and target be always the same)
if test "$build" != "$host" ; then
if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX" = 1; then
CC=$host_alias-gcc
CXX=$host_alias-c++
AR=$host_alias-ar
RANLIB=$host_alias-ranlib
DLLTOOL=$host_alias-dlltool
RESCOMP=$host_alias-windres
STRIP=$host_alias-strip
elif test "x$CC" '!=' "x"; then
echo "You set CC, I assume you know what you are doing."
else
AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.)
fi
fi
dnl C-compiler checks
dnl defines CC with the compiler to use
dnl defines GCC with yes if using gcc
@ -1414,7 +1394,7 @@ AC_PROG_RANLIB
dnl ar command
dnl defines AR with the appropriate command
AC_CHECK_PROG(AR, ar, ar)
AC_CHECK_TOOL(AR, ar)
if test "x$AR" = "x" ; then
AC_MSG_ERROR([ar is needed to build wxWidgets])
fi
@ -1449,8 +1429,20 @@ case "${host}" in
esac
dnl strip command
dnl defines STRIP as strip or nothing if not found
AC_CHECK_PROG(STRIP, strip, strip, true)
dnl defines STRIP as strip or nothing (true) if not found
AC_CHECK_TOOL(STRIP, strip, true)
dnl Win32 tools
if test "$wxUSE_WINE" = "yes"; then
AC_CHECK_TOOL(RESCOMP, wrc)
else
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
AC_CHECK_TOOL(RESCOMP, windres)
AC_CHECK_TOOL(DLLTOOL, dlltool)
;;
esac
fi
dnl does make support "-include" (only GNU make does AFAIK)?
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
@ -6958,10 +6950,6 @@ fi
AC_BAKEFILE([m4_include(autoconf_inc.m4)])
if test "$wxUSE_WINE" = "yes"; then
RESCOMP=wrc
fi
if test "$wxUSE_SHARED" = "yes"; then
dnl We get the shared build linker from bakefile, since it