jim 98/04/11 08:46:00
Modified: src/helpers PrintPath PrintPathOS2 TestCompile Log: Submitted by: Jim Jagielski Hmmm... well, it looks like some people would like the capability of having PrintPath look not only in PATH for an executable (makes sense) so I've allowed PrintPath to look somewhere else. With this, TestCompile becomes a bit simpler, and faster when TestCompile fails since it now longer needs to muck around with the whole PATH. Revision Changes Path 1.10 +8 -3 apache-1.3/src/helpers/PrintPath Index: PrintPath =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- PrintPath 1997/01/30 00:07:54 1.9 +++ PrintPath 1998/04/11 15:45:59 1.10 @@ -1,6 +1,7 @@ #!/bin/sh -# Look for $1 somewhere in $PATH -# will print out the full pathname unless +# Look for $1 somewhere in $PATH. As an extra bonus, +# if $AP_PPSEARCHPATH is set, this will look for $i +# in there instead. Will print out the full pathname unless # called with the '-s' option # # We do some funny stuff to check to see @@ -29,7 +30,11 @@ echo="yes" fi -for path in `echo $PATH | +if [ "x$AP_PPSEARCHPATH" = "x" ] ; then + AP_PPSEARCHPATH=$PATH +fi + +for path in `echo $AP_PPSEARCHPATH | sed 's/^:/.:/ s/::/:.:/g s/:$/:./ 1.3 +8 -3 apache-1.3/src/helpers/PrintPathOS2 Index: PrintPathOS2 =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPathOS2,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PrintPathOS2 1997/11/06 21:59:36 1.2 +++ PrintPathOS2 1998/04/11 15:45:59 1.3 @@ -1,6 +1,7 @@ #!/bin/sh -# Look for $1 somewhere in $PATH -# will print out the full pathname unless +# Look for $1 somewhere in $PATH. As an extra bonus, +# if $AP_PPSEARCHPATH is set, this will look for $i +# in there instead. Will print out the full pathname unless # called with the '-s' option # @@ -10,7 +11,11 @@ echo="yes" fi -for path in `echo $PATH | +if [ "x$AP_PPSEARCHPATH" = "x" ] ; then + AP_PPSEARCHPATH=$PATH +fi + +for path in `echo $AP_PPSEARCHPATH | sed 's/^;/.;/ s/;;/;.;/g s/;$/;./ 1.11 +5 -3 apache-1.3/src/helpers/TestCompile Index: TestCompile =================================================================== RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TestCompile 1998/04/11 14:30:33 1.10 +++ TestCompile 1998/04/11 15:45:59 1.11 @@ -125,12 +125,14 @@ # # Use our PrintPath helper script, knowing that we have # 2 versions of it though... Configure should set AP_PRINTPATH -# but if not, just assume we use our "generic" version +# but if not, just assume we use our "generic" version. We +# also use the AP_PPSEARCHPATH "hack" to have PrintPath +# just search this directory. + if [ "x$AP_PRINTPATH" = "x" ] ; then AP_PRINTPATH=PrintPath fi -TESTTARG=`PATH=".:$PATH" ./$AP_PRINTPATH $TARGET` -if [ "x$TESTTARG" = "x./$TARGET" ] ; then +if AP_PPSEARCHPATH=`pwd` ./$AP_PRINTPATH -s $TARGET ; then exstat=0 fi