jim 96/10/23 10:13:07
Modified: src Configure
src/helpers GuessWhere
Log:
make GuessWhere silent on failure
and use exit-status more cleanly in Configure with GuessWhere
Revision Changes Path
1.31 +12 -7 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -C3 -r1.30 -r1.31
*** Configure 1996/10/23 12:56:31 1.30
--- Configure 1996/10/23 17:13:04 1.31
***************
*** 1,5 ****
#!/bin/sh
! # $Id: Configure,v 1.30 1996/10/23 12:56:31 jim Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5 ----
#!/bin/sh
! # $Id: Configure,v 1.31 1996/10/23 17:13:04 jim Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***************
*** 303,311 ****
# set above. If so, then we honor that; if not, then we set some
# defaults (gcc and -O2)
#
! COMPILER=`./helpers/GuessWhere gcc`
! if [ "$COMPILER" = "not found" ]; then
! COMPILER=`./helpers/GuessWhere cc`
fi
if grep "CC=" Makefile > /dev/null; then
--- 303,314 ----
# set above. If so, then we honor that; if not, then we set some
# defaults (gcc and -O2)
#
! if COMPILER=`./helpers/GuessWhere gcc`; then : ;
! else
! if COMPILER=`./helpers/GuessWhere cc`; then : ;
! else
! COMPILER="no-compiler-found"
! fi
fi
if grep "CC=" Makefile > /dev/null; then
***************
*** 363,370 ****
if [ "$OS" = "Solaris 2" ]; then
LIBS="$LIBS -lresolv"
fi
! if grep "EXTRA_" Makefile | grep "\-lsocks" > /dev/null; then
! :
else
LIBS="$LIBS -L/usr/local/lib -lsocks"
fi
--- 366,372 ----
if [ "$OS" = "Solaris 2" ]; then
LIBS="$LIBS -lresolv"
fi
! if grep "EXTRA_" Makefile | grep "\-lsocks" > /dev/null; then : ;
else
LIBS="$LIBS -L/usr/local/lib -lsocks"
fi
***************
*** 372,378 ****
#
# Look for ranlib
#
! RANLIB=`./helpers/GuessWhere ranlib`
#
# Good enough
--- 374,383 ----
#
# Look for ranlib
#
! if RANLIB=`./helpers/GuessWhere ranlib`; then : ;
! else
! RANLIB="true"
! fi
#
# Good enough
1.2 +0 -1 apache/src/helpers/GuessWhere
Index: GuessWhere
===================================================================
RCS file: /export/home/cvs/apache/src/helpers/GuessWhere,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** GuessWhere 1996/10/23 12:56:34 1.1
--- GuessWhere 1996/10/23 17:13:07 1.2
***************
*** 12,16 ****
exit 0
fi
done
- echo "not found"
exit 1
--- 12,15 ----
