Fix so that "guested" configure scripts work when using -srcdir.
authorK. Richard Pixley <rich@cygnus>
Fri, 7 Feb 1992 00:33:49 +0000 (00:33 +0000)
committerK. Richard Pixley <rich@cygnus>
Fri, 7 Feb 1992 00:33:49 +0000 (00:33 +0000)
configure

index 1b685fa41cf4c5ed2b65bdb19bc81d8c3ad2c8df..ff75fa2c1d4034da4be543dfe13a84447880ccb2 100755 (executable)
--- a/configure
+++ b/configure
@@ -680,16 +680,22 @@ ${progname}" ${arguments}  "
                                        POPDIR=${PWD}
                                        cd ${configdir} 
 
-### figure out what to do with srcdir
+### figure out what to do with srcdir & guest configure
                                        case "${srcdir}" in
-                                       ".") ;; # do nothing.  We're building in place.
-                                       /*) srcdiroption="-srcdir=${srcdir}/${configdir}" ;; # absolute path
-                                       *) srcdiroption="-srcdir=../${srcdir}/${configdir}" ;; # otherwise relative
+                                       ".") newsrcdir=${srcdir} ;; # no -srcdir option.  We're building in place.
+                                       /*) # absolute path
+                                               newsrcdir=${srcdir}/${configdir}
+                                               srcdiroption="-srcdir=${newsrcdir}"
+                                               ;;
+                                       *) # otherwise relative
+                                               newsrcdir=../${srcdir}/${configdir}
+                                               srcdiroption="-srcdir=${newsrcdir}"
+                                               ;;
                                        esac
 
 ### The recursion line is here.
-                                       if [ -f configure ] ; then
-                                               recprog=`pwd`/configure
+                                       if [ -f ${newsrcdir}/configure ] ; then
+                                               recprog=${newsrcdir}/configure
                                        else
                                                recprog=${progname}
                                        fi