From 076301d28dee008bd0359525f722aa1ca09b5e1e Mon Sep 17 00:00:00 2001
From: Bill Wendling <wendling@ncsa.uiuc.edu>
Date: Wed, 11 Oct 2000 10:04:05 -0500
Subject: [svn-r2660] Purpose: 	Bug Fix Description: 	The "fix" for search
 paths was wrong. It would try to recompute 	the SEARCH macro at the end.
 Solution: 	Stopped it from doing that if the $SEARCH macro has a value.
 One 	question, will fortran always be built from the top directory?
 Platforms tested: 	Modi4

---
 fortran/configure    | 8 +++++---
 fortran/configure.in | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fortran/configure b/fortran/configure
index b4535c6..242af3a 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -2652,9 +2652,11 @@ fi
  COMMENCE=config/commence
  CONCLUDE=config/conclude
 
- SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
-cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
-SEARCH="$SEARCH_RULE`eval $cmd`"
+if test -z "$SEARCH"; then
+    SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
+   cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
+   SEARCH="$SEARCH_RULE`eval $cmd`"
+fi
 
 if test "X$GMAKE" = "Xyes"; then
     SETX=":"
diff --git a/fortran/configure.in b/fortran/configure.in
index ab66a7c..bf91d91 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -548,9 +548,11 @@ AC_SUBST_FILE(COMMENCE) COMMENCE=config/commence
 AC_SUBST_FILE(CONCLUDE) CONCLUDE=config/conclude
 
 dnl The directory search list
-AC_SUBST(SEARCH) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
-cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
-SEARCH="$SEARCH_RULE`eval $cmd`"
+if test -z "$SEARCH"; then
+   AC_SUBST(SEARCH) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src'
+   cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"'
+   SEARCH="$SEARCH_RULE`eval $cmd`"
+fi
 
 dnl We don't need to say when we're entering directories if we're using
 dnl GNU make becuase make does it for us.
-- 
cgit v0.12