summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure32
1 files changed, 12 insertions, 20 deletions
diff --git a/Configure b/Configure
index d5b354a29d..02d5b9ebf9 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Thu Jan 4 21:51:16 EET 2001 [metaconfig 3.0 PL70]
+# Generated on Thu Jan 4 22:39:08 EET 2001 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by perlbug@perl.org)
cat >c1$$ <<EOF
@@ -146,11 +146,6 @@ true)
;;
esac
-case "$newsh" in
-'') sh_c="sh -c" ;;
-*) sh_c="$newsh -c" ;;
-esac
-
: if needed set CDPATH to a harmless value that is not chatty
: avoid bash 2.02 problems with empty CDPATH.
case "$CDPATH" in
@@ -181,7 +176,6 @@ useposix=''
d_bsd=''
d_eunice=''
d_xenix=''
-sh_c=''
eunicefix=''
Mcc=''
ar=''
@@ -1090,7 +1084,7 @@ EOM
esac
: see if sh knows # comments
-if `$sh_c '#' >/dev/null 2>&1`; then
+if `$sh -c '#' >/dev/null 2>&1`; then
shsharp=true
spitshell=cat
xcat=/bin/cat
@@ -2065,7 +2059,7 @@ test)
echo "Hopefully test is built into your sh."
;;
*)
- if `$sh_c "PATH= test true" >/dev/null 2>&1`; then
+ if `sh -c "PATH= test true" >/dev/null 2>&1`; then
echo "Using the test built into your sh."
echo "Using the test built into your sh."
test=test
@@ -2183,14 +2177,13 @@ case "$lns" in
echo "Checking how to test for symbolic links..." >&4
$lns blurfl sym
if $test "X$issymlink" = X; then
- $sh_c "PATH= test -h sym" >/dev/null 2>&1
+ sh -c "PATH= test -h sym" >/dev/null 2>&1
if test $? = 0; then
issymlink="test -h"
fi
fi
if $test "X$issymlink" = X; then
- $sh_c "$test -h sym" >/dev/null 2>&1
- if test $? = 0; then
+ if $test -h >/dev/null 2>&1; then
issymlink="$test -h"
echo "Your builtin 'test -h' may be broken, I'm using external '$test -h'." >&4
fi
@@ -4153,8 +4146,8 @@ and I got the following output:
EOM
dflt=y
-if $sh_c "$cc -o try $optimize $ccflags $ldflags try.c $libs" >>try.msg 2>&1; then
- if $sh_c './try' >>try.msg 2>&1; then
+if $sh -c "$cc -o try $optimize $ccflags $ldflags try.c $libs" >>try.msg 2>&1; then
+ if $sh -c './try' >>try.msg 2>&1; then
xxx=`./try`
case "$xxx" in
"Ok") dflt=n ;;
@@ -7136,7 +7129,7 @@ echo "Figuring out host name..." >&4
case "$myhostname" in
'') cont=true
echo 'Maybe "hostname" will work...'
- if tans=`$sh_c hostname 2>&1` ; then
+ if tans=`sh -c hostname 2>&1` ; then
myhostname=$tans
phostname=hostname
cont=''
@@ -7159,17 +7152,17 @@ if $test "$cont"; then
fi
if $test "$cont"; then
echo 'No, maybe "uuname -l" will work...'
- if tans=`$sh_c 'uuname -l' 2>&1` ; then
+ if tans=`sh -c 'uuname -l' 2>&1` ; then
myhostname=$tans
phostname='uuname -l'
else
echo 'Strange. Maybe "uname -n" will work...'
- if tans=`$sh_c 'uname -n' 2>&1` ; then
+ if tans=`sh -c 'uname -n' 2>&1` ; then
myhostname=$tans
phostname='uname -n'
else
echo 'Oh well, maybe I can mine it out of whoami.h...'
- if tans=`$sh_c $contains' sysname $usrinc/whoami.h' 2>&1` ; then
+ if tans=`sh -c $contains' sysname $usrinc/whoami.h' 2>&1` ; then
myhostname=`echo "$tans" | $sed 's/^.*"\(.*\)"/\1/'`
phostname="sed -n -e '"'/sysname/s/^.*\"\\(.*\\)\"/\1/{'"' -e p -e q -e '}' <$usrinc/whoami.h"
else
@@ -7270,7 +7263,7 @@ case "$myhostname" in
esac
case "$dflt" in
.) echo "(No help from resolv.conf either -- attempting clever guess)"
- dflt=.`$sh_c domainname 2>/dev/null`
+ dflt=.`sh -c domainname 2>/dev/null`
case "$dflt" in
'') dflt='.';;
.nis.*|.yp.*|.main.*) dflt=`echo $dflt | $sed -e 's/^\.[^.]*//'`;;
@@ -16449,7 +16442,6 @@ selectminbits='$selectminbits'
selecttype='$selecttype'
sendmail='$sendmail'
sh='$sh'
-sh_c='$sh_c'
shar='$shar'
sharpbang='$sharpbang'
shmattype='$shmattype'