summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorAndy Dougherty <doughera@lafcol.lafayette.edu>1995-06-06 01:41:07 +0000
committerAndy Dougherty <doughera@lafcol.lafayette.edu>1995-06-06 01:41:07 +0000
commit4aa0a1f7324b8447469670a1b2427c3ac2428bae (patch)
treef47ecacdb42503ee8ea8e4984302ab1aaad85431 /Configure
parent005c1a0e007f6f2f3efe461d6a5930a88ccb88fb (diff)
downloadperl-4aa0a1f7324b8447469670a1b2427c3ac2428bae.tar.gz
This is my patch patch.1l for perl5.001.
To apply, change to your perl directory, run the command above, then apply with patch -p1 -N < thispatch. This patch fixes all the Configure & build problems for which I have a solution. After you apply this patch, I would recommend: make distclean # or at the very least rm config.sh sh Configure [whatever options you use] make depend make make test Patch and enjoy, Andy Dougherty doughera@lafcol.lafayette.edu Dept. of Physics Lafayette College, Easton PA 18042 Here are the file-by-file contents: Changes.Conf Updated a bit. Configure Now honors hints on <pwd.h>-related things (for CX/UX, in particular). Now honors previous values of d_stdio_ptr_lval and d_stdio_cnt_lval. DB test programs now conditionally include 'const'. MANIFEST Updated. config_H Updated. config_h.SH Include trailing /**/ on STDIO_..._LVALUE defines. hints/cxux.sh Simplified. Include info about failing test. hints/epix.sh A guess at a dynamic loading fix. hints/next_3.sh Add a few comments. lib/Benchmark.pm Ensure numeric context on number of loop iterations. op.c Spider's padlex and goto &$nonesuch patches. perl.c fputs("\tUnofficial patchlevel 1l.\n",stdout); pp_ctl.c pp_hot.c scope.c Spider's padlex and goto &$nonesuch patches.
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure105
1 files changed, 71 insertions, 34 deletions
diff --git a/Configure b/Configure
index bf08892e04..6148149685 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 Mon Jun 5 12:18:53 EDT 1995 [metaconfig 3.0 PL55]
+# Generated on Tue Jun 6 12:25:20 EDT 1995 [metaconfig 3.0 PL55]
cat >/tmp/c1$$ <<EOF
ARGGGHHHH!!!!!
@@ -5180,54 +5180,75 @@ eval $inlibc
set pipe d_pipe
eval $inlibc
-: see if this is a pwd system
-echo " "
-xxx=`./findhdr pwd.h`
-if $test "$xxx"; then
- i_pwd="$define"
- echo "<pwd.h> found." >&4
+: see if this is a pwd.h system
+set pwd.h i_pwd
+eval $inhdr
+
+case "$i_pwd" in
+$define)
+ xxx=`./findhdr pwd.h`
$cppstdin $cppflags $cppminus < $xxx >$$.h
+
if $contains 'pw_quota' $$.h >/dev/null 2>&1; then
- d_pwquota="$define"
+ val="$define"
else
- d_pwquota="$undef"
+ val="$undef"
fi
+ set d_pwquota
+ eval $setvar
+
if $contains 'pw_age' $$.h >/dev/null 2>&1; then
- d_pwage="$define"
+ val="$define"
else
- d_pwage="$undef"
+ val="$undef"
fi
+ set d_pwage
+ eval $setvar
+
if $contains 'pw_change' $$.h >/dev/null 2>&1; then
- d_pwchange="$define"
+ val="$define"
else
- d_pwchange="$undef"
+ val="$undef"
fi
+ set d_pwchange
+ eval $setvar
+
if $contains 'pw_class' $$.h >/dev/null 2>&1; then
- d_pwclass="$define"
+ val="$define"
else
- d_pwclass="$undef"
+ val="$undef"
fi
+ set d_pwclass
+ eval $setvar
+
if $contains 'pw_expire' $$.h >/dev/null 2>&1; then
- d_pwexpire="$define"
+ val="$define"
else
- d_pwexpire="$undef"
+ val="$undef"
fi
+ set d_pwexpire
+ eval $setvar
+
if $contains 'pw_comment' $$.h >/dev/null 2>&1; then
- d_pwcomment="$define"
+ val="$define"
else
- d_pwcomment="$undef"
+ val="$undef"
fi
+ set d_pwcomment
+ eval $setvar
+
$rm -f $$.h
-else
- i_pwd="$undef"
- d_pwquota="$undef"
- d_pwage="$undef"
- d_pwchange="$undef"
- d_pwclass="$undef"
- d_pwexpire="$undef"
- d_pwcomment="$undef"
- echo "<pwd.h> NOT found." >&4
-fi
+ ;;
+*)
+ val="$undef";
+ set d_pwquota; eval $setvar
+ set d_pwage; eval $setvar
+ set d_pwchange; eval $setvar
+ set d_pwclass; eval $setvar
+ set d_pwexpire; eval $setvar
+ set d_pwcomment; eval $setvar
+ ;;
+esac
: see if readdir and friends exist
set readdir d_readdir
@@ -5615,11 +5636,15 @@ if $contains '_IO_fpos_t' `./findhdr stdio.h` >/dev/null 2>&1 ; then
'') stdio_ptr='((fp)->_IO_read_ptr)'
ptr_lval=$define
;;
+ *) ptr_lval=$d_stdio_ptr_lval
+ ;;
esac
case "$stdio_cnt" in
'') stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
cnt_lval=$undef
;;
+ *) cnt_lval=$d_stdio_cnt_lval
+ ;;
esac
case "$stdio_base" in
'') stdio_base='((fp)->_IO_read_base)';;
@@ -5632,11 +5657,15 @@ else
'') stdio_ptr='((fp)->_ptr)'
ptr_lval=$define
;;
+ *) ptr_lval=$d_stdio_ptr_lval
+ ;;
esac
case "$stdio_cnt" in
'') stdio_cnt='((fp)->_cnt)'
cnt_lval=$define
;;
+ *) cnt_lval=$d_stdio_cnt_lval
+ ;;
esac
case "$stdio_base" in
'') stdio_base='((fp)->_base)';;
@@ -6384,11 +6413,15 @@ define)
: Check the return type needed for hash
echo " "
echo "Checking return type needed for hash for Berkeley DB ..." >&4
- $cat >try.c <<'EOCP'
+ $cat >try.c <<EOCP
+#$d_const HASCONST
+#ifndef HASCONST
+#define const
+#endif
#include <sys/types.h>
#include <db.h>
u_int32_t hash_cb (ptr, size)
-void *ptr;
+const void *ptr;
size_t size;
{
}
@@ -6420,12 +6453,16 @@ define)
: Check the return type needed for prefix
echo " "
echo "Checking return type needed for prefix for Berkeley DB ..." >&4
- cat >try.c <<'EOCP'
+ cat >try.c <<EOCP
+#$d_const HASCONST
+#ifndef HASCONST
+#define const
+#endif
#include <sys/types.h>
#include <db.h>
size_t prefix_cb (key1, key2)
-DBT *key1;
-DBT *key2;
+const DBT *key1;
+const DBT *key2;
{
}
BTREEINFO info;