# HG changeset patch
# User bartv
# Date 1050237180 0
# Node ID 1d4e1e38bd0f4a1d500c8421ee42b01d4c05de44
# Parent  fcf40627d54f0b85a084407ee1515539141d57e0
Merge from trunk - allow per-package host-side software to be built in
a release tree

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-27  Bart Veer  <bartv@ecoscentric.com>
+
+	* configure.in, configure:
+	Look for the host-side sources in tools/src as well as in host, as
+	per the 2.0 release tree.
+	Look for per-package host-side software in any/all versions of a
+	package, not just "current".
+
 2003-02-12  Bart Veer  <bartv@ecoscentric.com>
 
 	* README.host: update Tcl-related instructions
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -834,16 +834,23 @@ echo "configure:825: checking that a sep
     fi
 
 
-SUBDIRS="host"
+		     
+if test -f "${srcdir}/host/configure" ; then
+   SUBDIRS="host"
+elif test -f "${srcdir}/tools/src/configure" ; then
+   SUBDIRS="tools/src"
+else   
+   SUBDIRS=""
+fi   
 
 
 PKGHOSTDIRS=""
 FOUND_CONFIGURES=""
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/*/current/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/*/*/host/configure"
 for configure in ${FOUND_CONFIGURES}; do
     if test -f ${configure}; then
                                 hostdir=`dirname ${configure}`
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl
 dnl ====================================================================
 dnl ####ECOSHOSTGPLCOPYRIGHTBEGIN####
 dnl ----------------------------------------------------------------------------
-dnl Copyright (C) 2002 Bart Veer
+dnl Copyright (C) 2002, 2003 Bart Veer
 dnl Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
 dnl
 dnl This file is part of the eCos host tools.
@@ -85,7 +85,7 @@ dnl   1) if the entire repository is man
 dnl      configure script will search the packages tree for any packages
 dnl      that have host-side software that needs to be built -
 dnl      specifically, that have a file "configure" inside a "host"
-dnl      subdirectory in version "current" of a package.
+dnl      subdirectory in a version of a package.
 dnl
 dnl   2) if instead the repository contains additional packages
 dnl      installed as epk's and managed by an administration tool then
@@ -137,8 +137,17 @@ dnl Nothing actually gets built in this 
 dnl need to worry about compiler flags etc. Instead, the problem is
 dnl figuring out what should actually get built.
 dnl
-dnl  1) the host subdirectory should always get built.
-SUBDIRS="host"
+dnl  1) the host subdirectory should always get built, if it exists.
+dnl     With the 2.0 release system the directory gets moved to
+dnl     tools/src
+		     
+if test -f "${srcdir}/host/configure" ; then
+   SUBDIRS="host"
+elif test -f "${srcdir}/tools/src/configure" ; then
+   SUBDIRS="tools/src"
+else   
+   SUBDIRS=""
+fi   
 
 dnl  2) any package which has a configure script in a
 dnl     current/host subdirectory should also get built.
@@ -157,11 +166,11 @@ dnl     at the Tcl level at run-time, so
 
 PKGHOSTDIRS=""
 FOUND_CONFIGURES=""
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/current/host/configure"
-FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/*/current/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/*/host/configure"
+FOUND_CONFIGURES="${FOUND_CONFIGURES} ${srcdir}/packages/*/*/*/*/*/*/host/configure"
 for configure in ${FOUND_CONFIGURES}; do
     if test -f ${configure}; then
         dnl A configure script has been found in the source tree.