diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChangeLog | 4 | ||||
| -rwxr-xr-x | scripts/autogen.sh | 40 |
2 files changed, 20 insertions, 24 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 9c768fe5c..692598fff 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2006-09-13 Werner Koch <[email protected]> + + * autogen.sh: Better detection of the cross compiler. + 2006-04-03 Werner Koch <[email protected]> * w32installer.nsi: Install curl and not http keyserver helper. diff --git a/scripts/autogen.sh b/scripts/autogen.sh index c39471eb6..232de1456 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -51,34 +51,26 @@ if test "$1" = "--build-w32"; then fi build=`$tsdir/scripts/config.guess` - # See whether we have the Debian cross compiler package or the - # old mingw32/cpd system - if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then - host=i586-mingw32msvc - crossbindir=/usr/$host/bin - conf_CC="CC=${host}-gcc" - else - host=i386--mingw32 - if ! mingw32 --version >/dev/null; then - echo "We need at least version 0.3 of MingW32/CPD" >&2 - exit 1 - fi - echo "MingW32/CPD is no longer supported" >&2 - exit 1 - # crossbindir=`mingw32 --install-dir`/bin - # # Old autoconf version required us to setup the environment - # # with the proper tool names. - # CC=`mingw32 --get-path gcc` - # CPP=`mingw32 --get-path cpp` - # AR=`mingw32 --get-path ar` - # RANLIB=`mingw32 --get-path ranlib` - # export CC CPP AR RANLIB - # conf_CC="" + # Locate the cross compiler + crossbindir= + for host in i586-mingw32msvc i386-mingw32msvc; do + if ${host}-gcc --version >/dev/null 2>&1 ; then + crossbindir=/usr/${host}/bin + conf_CC="CC=${host}-gcc" + break; + fi + done + if [ -z "$crossbindir" ]; then + echo "Cross compiler kit not installed" >&2 + echo "Under Debian GNU/Linux, you may install it using" >&2 + echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2 + echo "Stop." >&2 + exit 1 fi if [ -f "$tsdir/config.log" ]; then if ! head $tsdir/config.log | grep "$host" >/dev/null; then - echo "Pease run a 'make distclean' first" >&2 + echo "Please run a 'make distclean' first" >&2 exit 1 fi fi |