From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonathan Larmour <jlarmour@redhat.co.uk>
To: insight@sourceware.cygnus.com
Subject: RFA: Fix itcl/iwidgets config script search
Date: Thu, 15 Jun 2000 12:45:00 -0000
Message-id: <3949324E.E7268CD@redhat.co.uk>
X-SW-Source: 2000-q2/msg00278.html

I found that when installing a new version of Insight over an old one that
had been built from sources that no longer existed, it failed with the same
error as described in
http://sourceware.cygnus.com/ml/insight/2000-q2/msg00212.html

The reason is that itcl/iwidgets2.0.0/unix/configure.in is picking up the
itclConfig.sh etc. files from exec_prefix first, and using that to
determine the location of mkinstalldirs from e.g. ITCL_SRC_DIR set there.
This is bad as it refers to the old sources.

The best fix is to make itcl/iwidgets2.0.0/unix/configure.in consistent
with tcl, tk, itcl/itcl and itcl/itk by searching in the build tree before
the exec_prefix dir, since what is in the build tree is what is going to be
installed.

Okay to check in? 5.0 branch as well?

Jifl

2000-06-15  Jonathan Larmour  <jlarmour@redhat.co.uk>

	* iwidgets3.0.0/unix/configure.in: Use config scripts from build
	tree before exec_prefix


-- 
Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS  Tel: +44 (1223) 728762
"Plan to be spontaneous tomorrow."  ||  These opinions are all my own fault
Index: configure.in
===================================================================
RCS file: /cvs/src/src/itcl/iwidgets3.0.0/unix/configure.in,v
retrieving revision 1.1.1.1
diff -u -5 -p -r1.1.1.1 configure.in
--- configure.in	2000/02/07 00:19:47	1.1.1.1
+++ configure.in	2000/06/15 19:37:44
@@ -43,11 +43,11 @@ cd ${BUILD_DIR}
 
 AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.0 binaries from DIR],
         itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tcl*/unix`)
 
 TCL_LIB_DIR=""
-for dir in $exec_prefix/lib $itcl_search ; do
+for dir in $itcl_search $exec_prefix/lib ; do
     if test -r $dir/tclConfig.sh; then
         TCL_LIB_DIR=$dir
         break
     fi
 done
@@ -65,11 +65,11 @@ fi
 
 AC_ARG_WITH(tk, [  --with-tk=DIR           use Tk 8.0 binaries from DIR],
         itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tk*/unix`)
 
 TK_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
     if test -r $dir/tkConfig.sh; then
         TK_LIB_DIR=$dir
         break
     fi
 done
@@ -86,11 +86,11 @@ fi
 
 AC_ARG_WITH(itcl, [  --with-itcl=DIR         use Itcl 3.0 binaries from DIR],
         itcl_search=$withval, itcl_search=`cd ${BUILD_DIR}/../../itcl; pwd`)
 
 ITCL_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
     if test -r $dir/itclConfig.sh; then
         ITCL_LIB_DIR=$dir
         break
     fi
 done
@@ -107,11 +107,11 @@ fi
 
 AC_ARG_WITH(itk, [  --with-itk=DIR          use Itk 3.0 binaries from DIR],
         itcl_search=$withval, itcl_search=`cd ${BUILD_DIR}/../../itk; pwd`)
 
 ITK_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
     if test -r $dir/itkConfig.sh; then
         ITK_LIB_DIR=$dir
         break
     fi
 done