common/autoconf/basics.m4

*** 357,370 ****
    [use this directory as base for tools-dir and sys-root (for cross-compiling)])],
    [
      if test "x$with_sys_root" != x; then
        AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time])
      fi
!     if test "x$with_tools_dir" != x; then
!       AC_MSG_ERROR([Cannot specify both --with-devkit and --with-tools-dir at the same time])
!     fi
!     TOOLS_DIR=$with_devkit/bin
      if test -d "$with_devkit/$host_alias/libc"; then
        SYS_ROOT=$with_devkit/$host_alias/libc
      elif test -d "$with_devkit/$host/sys-root"; then
        SYS_ROOT=$with_devkit/$host/sys-root
      fi
--- 357,367 ----
    [use this directory as base for tools-dir and sys-root (for cross-compiling)])],
    [
      if test "x$with_sys_root" != x; then
        AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time])
      fi
!     TOOLS_DIR=$TOOLS_DIR:$with_devkit/bin
      if test -d "$with_devkit/$host_alias/libc"; then
        SYS_ROOT=$with_devkit/$host_alias/libc
      elif test -d "$with_devkit/$host/sys-root"; then
        SYS_ROOT=$with_devkit/$host/sys-root
      fi