Fix so that "guested" configure scripts work when using -srcdir.
This commit is contained in:
parent
ee17fd3437
commit
424f020272
|
@ -680,16 +680,22 @@ ${progname}" ${arguments} "
|
||||||
POPDIR=${PWD}
|
POPDIR=${PWD}
|
||||||
cd ${configdir}
|
cd ${configdir}
|
||||||
|
|
||||||
### figure out what to do with srcdir
|
### figure out what to do with srcdir & guest configure
|
||||||
case "${srcdir}" in
|
case "${srcdir}" in
|
||||||
".") ;; # do nothing. We're building in place.
|
".") newsrcdir=${srcdir} ;; # no -srcdir option. We're building in place.
|
||||||
/*) srcdiroption="-srcdir=${srcdir}/${configdir}" ;; # absolute path
|
/*) # absolute path
|
||||||
*) srcdiroption="-srcdir=../${srcdir}/${configdir}" ;; # otherwise relative
|
newsrcdir=${srcdir}/${configdir}
|
||||||
|
srcdiroption="-srcdir=${newsrcdir}"
|
||||||
|
;;
|
||||||
|
*) # otherwise relative
|
||||||
|
newsrcdir=../${srcdir}/${configdir}
|
||||||
|
srcdiroption="-srcdir=${newsrcdir}"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
### The recursion line is here.
|
### The recursion line is here.
|
||||||
if [ -f configure ] ; then
|
if [ -f ${newsrcdir}/configure ] ; then
|
||||||
recprog=`pwd`/configure
|
recprog=${newsrcdir}/configure
|
||||||
else
|
else
|
||||||
recprog=${progname}
|
recprog=${progname}
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue