Change 13782 by jhi@alpha on 2001/12/19 00:09:10
Re-gen Configure based on #13778..13781.
Affected files ...
.... //depot/perl/Configure#374 edit
.... //depot/perl/config_h.SH#237 edit
Differences ...
==== //depot/perl/Configure#374 (xtext) ====
Index: perl/Configure
--- perl/Configure.~1~ Tue Dec 18 17:15:05 2001
+++ perl/Configure Tue Dec 18 17:15:05 2001
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Wed Dec 19 02:24:52 EET 2001 [metaconfig 3.0 PL70]
+# Generated on Wed Dec 19 03:02:32 EET 2001 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -1124,6 +1124,9 @@
if test -f "$xxx"; then
sh="$xxx";
break
+ elif test "X$_exe" != X -a -f "$xxx$_exe"; then
+ sh="$xxx";
+ break
elif test -f "$xxx.exe"; then
sh="$xxx";
break
@@ -2025,6 +2028,9 @@
if test -f \$thisthing; then
echo \$thisthing
exit 0
+ elif test "X$_exe" != X -a -f \$thisthing$_exe; then
+ echo \$thisthing
+ exit 0
elif test -f \$dir/\$thing.exe; then
if test -n "$DJGPP"; then
echo \$dir/\$thing.exe
@@ -2097,7 +2103,7 @@
'') xxx=`./loc $file $file $pth`;;
*) xxx=`./loc $xxx $xxx $pth`;;
esac
- eval $file=$xxx
+ eval $file=$xxx$_exe
eval _$file=$xxx
case "$xxx" in
/*)
@@ -2146,17 +2152,26 @@
esac
done
case "$egrep" in
-egrep)
+*egrep*)
echo "Substituting grep for egrep."
egrep=$grep
;;
esac
case "$ln" in
-ln)
+*ln*)
echo "Substituting cp for ln."
ln=$cp
;;
esac
+case "$make$gmake" in
+*make*)
+ ;;
+*)
+ echo "I can't find make or gmake, and my life depends on it." >&4
+ echo "Go find a public domain implementation or fix your PATH setting!" >&4
+ exit 1
+ ;;
+esac
case "$test" in
test)
echo "Hopefully test is built into your sh."
@@ -4840,6 +4855,10 @@
: determine filename position in cpp output
echo " "
echo "Computing filename position in cpp output for #include directives..." >&4
+case "$osname" in
+vos) testaccess=-e ;;
+*) testaccess=-r ;;
+esac
echo '#include <stdio.h>' > foo.c
$cat >fieldn <<EOF
$startsh
@@ -4849,7 +4868,7 @@
pos=1
set \$cline
while $test \$# -gt 0; do
- if $test -r \`echo \$1 | $tr -d '"'\`; then
+ if $test $testaccess \`echo \$1 | $tr -d '"'\`; then
echo "\$pos"
exit 0
fi
@@ -9336,36 +9355,42 @@
: see if crypt exists
echo " "
-if set crypt val -f d_crypt; eval $csym; $val; then
- echo 'crypt() found.' >&4
- val="$define"
- cryptlib=''
-else
- cryptlib=`./loc Slibcrypt$_a "" $xlibpth`
- if $test -z "$cryptlib"; then
- cryptlib=`./loc Mlibcrypt$_a "" $xlibpth`
+set crypt d_crypt
+eval $inlibc
+case "$d_crypt" in
+$define) cryptlib='' ;;
+*) if set crypt val -f d_crypt; eval $csym; $val; then
+ echo 'crypt() found.' >&4
+ val="$define"
+ cryptlib=''
else
- cryptlib=-lcrypt
+ cryptlib=`./loc Slibcrypt$_a "" $xlibpth`
+ if $test -z "$cryptlib"; then
+ cryptlib=`./loc Mlibcrypt$_a "" $xlibpth`
+ else
+ cryptlib=-lcrypt
+ fi
+ if $test -z "$cryptlib"; then
+ cryptlib=`./loc Llibcrypt$_a "" $xlibpth`
+ else
+ cryptlib=-lcrypt
+ fi
+ if $test -z "$cryptlib"; then
+ cryptlib=`./loc libcrypt$_a "" $libpth`
+ else
+ cryptlib=-lcrypt
+ fi
+ if $test -z "$cryptlib"; then
+ echo 'crypt() NOT found.' >&4
+ val="$undef"
+ else
+ val="$define"
+ fi
fi
- if $test -z "$cryptlib"; then
- cryptlib=`./loc Llibcrypt$_a "" $xlibpth`
- else
- cryptlib=-lcrypt
- fi
- if $test -z "$cryptlib"; then
- cryptlib=`./loc libcrypt$_a "" $libpth`
- else
- cryptlib=-lcrypt
- fi
- if $test -z "$cryptlib"; then
- echo 'crypt() NOT found.' >&4
- val="$undef"
- else
- val="$define"
- fi
-fi
-set d_crypt
-eval $setvar
+ set d_crypt
+ eval $setvar
+ ;;
+esac
: get csh whereabouts
case "$csh" in
==== //depot/perl/config_h.SH#237 (text) ====
Index: perl/config_h.SH
--- perl/config_h.SH.~1~ Tue Dec 18 17:15:05 2001
+++ perl/config_h.SH Tue Dec 18 17:15:05 2001
@@ -112,12 +112,6 @@
#define const
#endif
-/* HAS_CRYPT:
- * This symbol, if defined, indicates that the crypt routine is available
- * to encrypt passwords and the like.
- */
-#$d_crypt HAS_CRYPT /**/
-
/* HAS_CUSERID:
* This symbol, if defined, indicates that the cuserid routine is
* available to get character login names.
@@ -3424,6 +3418,12 @@
#define PERL_XS_APIVERSION "$xs_apiversion"
#define PERL_PM_APIVERSION "$pm_apiversion"
+/* HAS_CRYPT:
+ * This symbol, if defined, indicates that the crypt routine is available
+ * to encrypt passwords and the like.
+ */
+#$d_crypt HAS_CRYPT /**/
+
/* SETUID_SCRIPTS_ARE_SECURE_NOW:
* This symbol, if defined, indicates that the bug that prevents
* setuid scripts from being secure is not present in this kernel.
End of Patch.
