summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorAndy Dougherty <doughera@lafcol.lafayette.edu>1995-06-22 00:43:21 +0000
committerAndy Dougherty <doughera@lafcol.lafayette.edu>1995-06-22 00:43:21 +0000
commite50aee73b3d4c555c37e4b4a16694765fb16c887 (patch)
tree46b50fff5f53a49b55d0ff3f4e1816e427264375 /Configure
parent4aa0a1f7324b8447469670a1b2427c3ac2428bae (diff)
downloadperl-e50aee73b3d4c555c37e4b4a16694765fb16c887.tar.gz
This is my patch patch.1m for perl5.001.
To apply, change to your perl directory, run the command above, then apply with patch -p1 -N < thispatch. Highlights of this patch include: 1. Fixes for $sitelib, $d_stdio_ptr_lval, and $d_stdio_cnt_lval when config.sh is re-used. 2. Move embed.h, keywords.h, and opcode.h dependencies to a special regen_headers target that is ordinarily not used. This is now analogous to the run_byacc target. As a cosmetic side-effect, I transliterated embed_h.sh into embed.pl so that it can run on non-unix systems as well. 3. Tests for gdbm_{sync,exists,setopt} in GDBM_File (needed for Slackware 2.1). For good measure, I've also thrown in the following patches I pulled off the list, mostly unmodified from the originals. 1. Larry's "unofficial official" fix for the subroutine array context problem. 2. Tim's __DATA__ patch. (I kept forgetting about this one.) 3. Malcom's USE_OP_MASK patch to pave the way for his Safe extension. 4. Spider's suggested renaming of regexec to pregexec and regcomp to pregcomp to avoid conflicts with POSIX symbols on Digital Unix. (I only added a brief explanatory comment to the relevant .c files.) 5. Spider's installperl patch to avoid installing *.orig and and the .exists files. (I changed this a little to include patch's ~ suffix, which is used on systems with short file names (in some versions of patch)). 6. Raphael's "safe_unlink" patch to installperl, in case a copy of perl is currently runniung. 7. xsubpp 1.9. 8. Tim's lib.pm module (with patched corrected spelling of 2nd :-). 9. Tim's Exporter module version patches. 10. Tim's MakeMaker patches for make test when LINKTYPE=static. 11. Randal's pod2html patches. 12. Spider's "picky compiler" patches for x2p/util.[ch] 13. Paul's updated source filtering patches. Patch and enjoy. I hope nothing breaks :-). Andy Dougherty doughera@lafcol.lafayette.edu Dept. of Physics Lafayette College, Easton PA 18042
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure41
1 files changed, 25 insertions, 16 deletions
diff --git a/Configure b/Configure
index 6148149685..53649d5769 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.7 1995/03/21 08:46:15 ram Exp $
#
-# Generated on Tue Jun 6 12:25:20 EDT 1995 [metaconfig 3.0 PL55]
+# Generated on Thu Jun 22 10:38:35 EDT 1995 [metaconfig 3.0 PL55]
cat >/tmp/c1$$ <<EOF
ARGGGHHHH!!!!!
@@ -5478,7 +5478,8 @@ END
fi
echo "and it returns ($shmattype)." >&4
: see if a prototype for shmat is available
- $cppstdin $cppflags $cppminus < $usrinc/sys/shm.h > shmat.c 2>/dev/null
+ xxx=`./findhdr sys/shm.h`
+ $cppstdin $cppflags $cppminus < $xxx > shmat.c 2>/dev/null
if $contains 'shmat.*(' shmat.c >/dev/null 2>&1; then
val="$define"
else
@@ -5523,7 +5524,10 @@ to search by default in addition to $privlib.
If you don't want to use such an additional directory, answer 'none'.
EOM
-dflt=none
+case "$sitelib" in
+'') dflt=none ;;
+*) dflt="$sitelib" ;;
+esac
fn=d~+n
rp='Local directory for additional library files?'
. ./getfile
@@ -5533,27 +5537,32 @@ fi
sitelib="$ans"
sitelibexp="$ansexp"
if $afs; then
- $cat <<EOM
+ case "$sitelib" in
+ '') installsitelib="$sitelibexp"
+ ;;
+ *) $cat <<EOM
Since you are running AFS, I need to distinguish the directory in which
private files reside from the directory in which they are installed (and from
which they are presumably copied to the former directory by occult means).
EOM
- case "$installsitelib" in
- '') dflt=`echo $sitelibexp | sed 's#^/afs/#/afs/.#'`;;
- *) dflt="$installsitelib";;
+ case "$installsitelib" in
+ '') dflt=`echo $sitelibexp | sed 's#^/afs/#/afs/.#'`;;
+ *) dflt="$installsitelib";;
+ esac
+ fn=de~
+ rp='Where will additional local files be installed?'
+ . ./getfile
+ installsitelib="$ans"
+ ;;
esac
- fn=de~
- rp='Where will additional local files be installed?'
- . ./getfile
- installsitelib="$ans"
else
installsitelib="$sitelibexp"
fi
case "$sitelibexp" in
-''|' ') d_sitelib=undef ;;
+'') d_sitelib=undef ;;
*) d_sitelib=define ;;
esac
@@ -5708,8 +5717,8 @@ eval $setvar
: Can _ptr be used as an lvalue. Only makes sense if we
: have a known stdio implementation.
-case "$d_stdstdio" in
-$define) val=$ptr_lval ;;
+case "$d_stdstdio$ptr_lval" in
+$define$define) val=$define ;;
*) val=$undef ;;
esac
set d_stdio_ptr_lval
@@ -5718,8 +5727,8 @@ eval $setvar
: Can _cnt be used as an lvalue. Only makes sense if we
: have a known stdio implementation.
-case "$d_stdstdio" in
-$define) val=$cnt_lval ;;
+case "$d_stdstdio$cnt_lval" in
+$define$define) val=$define ;;
*) val=$undef ;;
esac
set d_stdio_cnt_lval