From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ecos-maintainers-return-306-listarch-ecos-maintainers=sources.redhat.com@sources.redhat.com>
Received: (qmail 20620 invoked by alias); 27 Mar 2003 23:46:34 -0000
Mailing-List: contact ecos-maintainers-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:ecos-maintainers-subscribe@sources.redhat.com>
List-Post: <mailto:ecos-maintainers@sources.redhat.com>
List-Help: <mailto:ecos-maintainers-help@sources.redhat.com>, <http://sources.redhat.com/lists.html#faqs>
Sender: ecos-maintainers-owner@sources.redhat.com
Received: (qmail 20570 invoked from network); 27 Mar 2003 23:46:32 -0000
To: ecos-maintainers@sources.redhat.com
Subject: [APPROVE] fix toplevel configure script as per 86597
From: Bart Veer <bartv@ecoscentric.com>
Message-Id: <20030327234631.1E6A1EC6F1@delenn.bartv.net>
Date: Thu, 27 Mar 2003 23:46:00 -0000
X-SW-Source: 2003-03/txt/msg00079.txt.bz2

I believe this patch will fix the problems reported in 86597, and have
committed the changes to the trunk. It is probably a good idea for the
release branch as well, but somebody else should probably test it
first in their world.

Bart

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".

Index: configure.in
===================================================================
RCS file: /cvs/ecos/ecos/configure.in,v
retrieving revision 1.2
diff -u -u -r1.2 configure.in
--- configure.in	11 Aug 2002 21:40:50 -0000	1.2
+++ configure.in	27 Mar 2003 23:33:28 -0000
@@ -85,7 +85,7 @@
 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 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 @@
 
 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.